Commit graph

236 commits

Author SHA1 Message Date
Squinty c440ee72d4 ♻️ Refactor Scoreboard code and improve UI 2024-04-24 20:11:17 +00:00
anyreso dd84c965c9 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 87a2da3c94 🐛 Fix default settings not being applied 2024-04-24 18:54:52 +00:00
anyreso 5097e76b3a Merge branch 'main' into develop 2024-04-24 11:16:51 -04:00
anyreso 98500155db 📝 update CONTRIBUTING.md 2024-04-24 11:16:11 -04:00
Squinty 0cbcb9a6a7 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 9e923ecdd5 🐛 Fix player nicknames and IFFs 2024-04-24 12:27:51 +00:00
Squinty 7a4eabc1ca 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 ae75c64236 Add flag grabbing/carrying scoring logic 2024-04-24 07:45:04 +00:00
anyreso cfd840c2e5 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 81bcd95d42 🍻 Shoot straight and clean up mode management 2024-04-24 07:08:24 +00:00
Squinty 8a15bdbd43 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 eb81b47039 Assign kills and points on kill, not on respawn 2024-04-22 22:07:58 +00:00
Squinty 599130be11 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 1ef147cc28 Scoring and Scoreboard implemented 2024-04-22 20:05:05 +00:00
anyreso a455d31a69 💚 update ci 2024-04-22 11:54:15 -04:00
anyreso 9c24d79a9d 🐛 fix main menu 2024-04-22 11:23:06 -04:00
anyreso 3a7c8aa9c1 💚 update ci 2024-04-22 11:17:01 -04:00
anyreso 87e6f50139 💚 update ci 2024-04-22 10:12:22 -04:00
anyreso 286341c06e 🐛 fix reticle color 2024-04-21 18:37:08 -04:00
anyreso 864abcd865 💚 update addon loading 2024-04-21 14:52:42 -04:00
Squinty 90b5e62835 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 562cdcd087 Add Unit Tests for HealthComponent 2024-04-21 17:50:32 +00:00
anyreso 010bb144cb 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 8c3e49ecbe 🐛 avoid .blend import on engine startup 2024-04-21 11:59:30 -04:00
Squinty 30fb00f3aa Hotfix: respawn uses map defined spawn points 2024-04-21 09:42:52 +02:00
Squinty 824c043540 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 3c2e07eae5 Introduce a map manager 2024-04-21 07:32:52 +00:00
anyreso 66270e65cd 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 1ace657b32 new placeholder gun 2024-04-21 02:01:01 +00:00
anyreso 20dbaa1134 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 e5074e3174 ⚗️ HUD updates 2024-04-20 19:40:23 +00:00
Squinty 80831ac65f 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 2c7ebddf75 Fix: reinstate import metadata 2024-04-19 22:47:28 +00:00
Squinty b1e762a881 HOTFIX: rotated player fixed 2024-04-20 00:28:57 +02:00
Squinty 847aeedf55 Fix mipmaps 2024-04-20 00:22:15 +02:00
Squinty db3a4f42e5 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
Sean Dozeman 77f50d164b New 'desert' map 2024-04-19 22:17:23 +00:00
Squinty 93b68197a5 Merge branch 'feat/physics-smoothing' into 'develop'
Implement movement smoothing on Player entity

See merge request open-fpsz/open-fpsz!53
2024-04-19 22:02:37 +00:00
Squinty 01e25ccedf Implement movement smoothing on Player entity 2024-04-19 22:02:37 +00:00
anyreso 4abe6f8374 Merge branch 'feature/IFF-updates' into 'develop'
 IFF Updates

See merge request open-fpsz/open-fpsz!32
2024-04-19 20:43:56 +00:00
Karan Codes 71ff1e1622 IFF Updates 2024-04-19 20:43:55 +00:00
Squinty d6d2bf7866 Merge branch 'fix/flag-not-jumping-on-explosion' into 'develop'
Fix explosion impulses to apply against the rigidbody's center of mass

See merge request open-fpsz/open-fpsz!51
2024-04-19 14:27:04 +00:00
Squinty 2667830183 Fix explosion impulses to apply against the rigidbody's center of mass 2024-04-19 14:27:04 +00:00
Squinty 699b38aab6 Merge branch 'hotfix/broken-player-scene' into 'develop'
Fix broken Player scene missing Spine IK target

See merge request open-fpsz/open-fpsz!52
2024-04-19 10:43:00 +00:00
Squinty aa4df9adbb Fix broken Player scene missing Spine IK target 2024-04-19 10:43:00 +00:00
Squinty cf7796bf48 Merge branch 'feat/static-typing' into 'develop'
 enforce static typing

See merge request open-fpsz/open-fpsz!48
2024-04-19 06:19:21 +00:00
anyreso 20eb9824cd enforce static typing 2024-04-19 06:19:21 +00:00
Squinty 675974150f Minor method renaming 2024-04-19 00:14:13 +02:00
Squinty 9612f00fe8 Merge branch 'feat/settings-menu' into 'develop'
 Implement a Settings menu

See merge request open-fpsz/open-fpsz!46
2024-04-18 16:53:34 +00:00