openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-04-22 21:05:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
149 commits 11 branches 1 tag 372 MiB
Commit graph

149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Squinty
2bd61aff8d HOTFIX: Fix exiting multiplayer mode 2024-04-25 08:31:59 +02:00
anyreso
58618d6b01 Merge branch 'main' into develop 2024-04-25 00:32:56 -04:00
anyreso
53912d9f54 📝 update CONTRIBUTING.md 2024-04-25 00:30:05 -04:00
anyreso
0e4519ad6f 📝 update CONTRIBUTING.md 2024-04-25 00:22:24 -04:00
anyreso
82572df5c1 📝 update CONTRIBUTING.md 2024-04-25 00:21:32 -04:00
anyreso
9db2583494 📝 update CONTRIBUTING.md 2024-04-25 00:19:58 -04:00
anyreso
cb20d6b87d 📝 update CONTRIBUTING.md 2024-04-25 00:19:41 -04:00
anyreso
0d2c9dddbb 📝 update CONTRIBUTING.md 2024-04-25 00:04:09 -04:00
anyreso
eb627cffd1 📝 update CONTRIBUTING.md 2024-04-25 00:02:10 -04:00
Squinty
0cb8d27500 Merge branch 'bug/fix-crashes' into 'develop' 
🐛 Fix crashes when leaving Multiplayer mode

See merge request open-fpsz/open-fpsz!67
 2024-04-24 21:26:14 +00:00
Squinty
5348b35448 🐛 Fix crashes when leaving Multiplayer mode 2024-04-24 21:26:14 +00:00
Squinty
81acb0bdf1 HOTFIX: reset springarm position on respawn 2024-04-24 22:35:01 +02:00
Squinty
efc92049bd Merge branch 'cleanup/scoreboard' into 'develop' 
♻️ Refactor Scoreboard code and improve UI

See merge request open-fpsz/open-fpsz!64
 2024-04-24 20:11:17 +00:00
Squinty
017ed4d560 ♻️ Refactor Scoreboard code and improve UI 2024-04-24 20:11:17 +00:00
anyreso
0c5d7c1338 Merge branch 'main' into 'develop' 
🐛 Fix default settings not being applied

See merge request open-fpsz/open-fpsz!65
 2024-04-24 18:54:53 +00:00
Ninthly
9a6462fe58 🐛 Fix default settings not being applied 2024-04-24 18:54:52 +00:00
anyreso
cd703fad03 Merge branch 'main' into develop 2024-04-24 11:16:51 -04:00
anyreso
44367e916f 📝 update CONTRIBUTING.md 2024-04-24 11:16:11 -04:00
Squinty
90fc3ef777 Merge branch 'fix/player-nicknames-and-iffs' into 'develop' 
🐛 Fix player nicknames and IFFs

See merge request open-fpsz/open-fpsz!63
 2024-04-24 12:27:51 +00:00
Squinty
4a9e162db7 🐛 Fix player nicknames and IFFs 2024-04-24 12:27:51 +00:00
Squinty
d1bebdac0b Merge branch 'feat/flag-grab-and-carry-score' into 'develop' 
✨ Add flag grabbing/carrying scoring logic

See merge request open-fpsz/open-fpsz!61
 2024-04-24 07:45:04 +00:00
Squinty
61b8845a40 ✨ Add flag grabbing/carrying scoring logic 2024-04-24 07:45:04 +00:00
anyreso
232eb960ab Merge branch 'fix/firing-animation' into 'develop' 
🍻 Shoot straight and clean up mode management

See merge request open-fpsz/open-fpsz!62
 2024-04-24 07:08:25 +00:00
anyreso
8a01f42b79 🍻 Shoot straight and clean up mode management 2024-04-24 07:08:24 +00:00
Squinty
8a4d079d77 Merge branch 'enhance/assign-points-on-kill' into 'develop' 
✨ Assign kills and points on kill, not on respawn

See merge request open-fpsz/open-fpsz!60
 2024-04-22 22:07:58 +00:00
Squinty
c3ce3b96b0 ✨ Assign kills and points on kill, not on respawn 2024-04-22 22:07:58 +00:00
Squinty
baa4d2d5f1 Merge branch 'feat/scoreboard' into 'develop' 
Scoring and Scoreboard implemented

See merge request open-fpsz/open-fpsz!59
 2024-04-22 20:05:06 +00:00
Squinty
0144426aac Scoring and Scoreboard implemented 2024-04-22 20:05:05 +00:00
anyreso
171193e8cd 💚 update ci 2024-04-22 11:54:15 -04:00
anyreso
b8f8fb50b7 🐛 fix main menu 2024-04-22 11:23:06 -04:00
anyreso
931aefb16e 💚 update ci 2024-04-22 11:17:01 -04:00
anyreso
0918074a40 💚 update ci 2024-04-22 10:12:22 -04:00
anyreso
e1cf4145e9 🐛 fix reticle color 2024-04-21 18:37:08 -04:00
anyreso
6a5e336ee6 💚 update addon loading 2024-04-21 14:52:42 -04:00
Squinty
cbca78bb5d Merge branch 'enhance/health-component-tests' into 'develop' 
Add Unit Tests for HealthComponent

See merge request open-fpsz/open-fpsz!57
 2024-04-21 17:50:33 +00:00
Squinty
aa2bbfda19 Add Unit Tests for HealthComponent 2024-04-21 17:50:32 +00:00
anyreso
c9d4a50412 Merge branch 'fix/blend' into 'develop' 
🐛 avoid `.blend` import on engine startup

See merge request open-fpsz/open-fpsz!58
 2024-04-21 16:18:56 +00:00
anyreso
0d9983a3f8 🐛 avoid .blend import on engine startup 2024-04-21 11:59:30 -04:00
Squinty
67eacd9e04 Hotfix: respawn uses map defined spawn points 2024-04-21 09:42:52 +02:00
Squinty
d9cff62ec0 Merge branch 'feat/map-manager' into 'develop' 
✨ Introduce a map manager

See merge request open-fpsz/open-fpsz!55
 2024-04-21 07:32:52 +00:00
Squinty
ae58fb2d7e ✨ Introduce a map manager 2024-04-21 07:32:52 +00:00
anyreso
5c4cc1a6ce Merge branch 'feat/weapon' into 'develop' 
✨ new placeholder gun

See merge request open-fpsz/open-fpsz!56
 2024-04-21 02:01:01 +00:00
anyreso
b11764689b ✨ new placeholder gun 2024-04-21 02:01:01 +00:00
anyreso
80cf77e532 Merge branch 'feat/UI-HUD-init-overhaul-v1' into 'develop' 
⚗️ HUD updates

See merge request open-fpsz/open-fpsz!35
 2024-04-20 19:40:24 +00:00
schorsch_huckleberry
f1dcad8c30 ⚗️ HUD updates 2024-04-20 19:40:23 +00:00
Squinty
7dbb72a1ff Merge branch 'fix/reinstate-import-metadata' into 'develop' 
Fix: reinstate import metadata

See merge request open-fpsz/open-fpsz!54
 2024-04-19 22:47:28 +00:00
Squinty
0de95d8eee Fix: reinstate import metadata 2024-04-19 22:47:28 +00:00
Squinty
b7802e08aa HOTFIX: rotated player fixed 2024-04-20 00:28:57 +02:00
Squinty
1e853a759c Fix mipmaps 2024-04-20 00:22:15 +02:00
Squinty
18c2442666 Merge branch 'feat/new-map' into 'develop' 
✨New 'desert' map

See merge request open-fpsz/open-fpsz!49
 2024-04-19 22:17:23 +00:00