Commit graph

115 commits

Author SHA1 Message Date
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
Squinty 2c2c3ec719 Implement a Settings menu 2024-04-18 16:53:34 +00:00
anyreso c3582b04e6 Merge branch 'fix/mouse' into 'develop'
🐛 fix camera updates

See merge request open-fpsz/open-fpsz!47
2024-04-18 15:55:07 +00:00
anyreso 251b51f10b 🐛 fix camera updates 2024-04-18 15:55:07 +00:00
Squinty fbe895cd60 Fix: Flag Carriers struggling to climb ropes.
* This was due to a wrong physical layer mask on ShapeCast
2024-04-18 15:43:37 +02:00
anyreso ac79366271 🐛 fix unloaded skybox texture 2024-04-17 16:59:35 -04:00
anyreso 448c066cc4 Merge branch 'feat/env' into 'develop'
 Add simple skybox and base environment

See merge request open-fpsz/open-fpsz!45
2024-04-17 19:51:27 +00:00
anyreso 4eb9442abb Add simple skybox and base environment 2024-04-17 19:51:27 +00:00
Squinty c190e9231c Merge branch 'feat/esc-to-menu' into 'develop'
 Use escape key to get back to main menu

See merge request open-fpsz/open-fpsz!44
2024-04-17 19:21:31 +00:00
Squinty 94fbf5c604 Use escape key to get back to main menu 2024-04-17 19:21:31 +00:00
Squinty 3e28091661 Merge branch 'fix/midair-flag-regrabs' into 'develop'
Fix/midair flag regrabs

See merge request open-fpsz/open-fpsz!43
2024-04-17 16:25:25 +00:00
Squinty 847fca30cb Fix/midair flag regrabs 2024-04-17 16:25:24 +00:00
Squinty 59fb960102 Merge branch 'fix/networking-issues' into 'develop'
🐛 Fix network issues affecting flag and player movement

See merge request open-fpsz/open-fpsz!42
2024-04-17 16:07:25 +00:00
Squinty 503e15b591 🐛 Fix network issues affecting flag and player movement 2024-04-17 16:07:24 +00:00
Squinty 63e39bbe15 Merge branch 'feat/nicknames' into 'develop'
 Working profile names in-game, basic settings save/load system, flag drops on player death

See merge request open-fpsz/open-fpsz!39
2024-04-16 21:39:08 +00:00
Squinty 3640aeb4cf Working profile names in-game, basic settings save/load system, flag drops on player death 2024-04-16 21:39:08 +00:00
Squinty 94b7ee0a53 Merge branch 'feat/flag' into 'develop'
Flag entitty implemented

See merge request open-fpsz/open-fpsz!37
2024-04-15 20:41:19 +00:00
Squinty 9ee9d63916 Flag entitty implemented 2024-04-15 20:41:19 +00:00
anyreso 78488dbc65 💚 disable cicd tests 2024-04-15 15:18:28 -04:00
anyreso c819760e02 ✏️ fix typo 2024-04-15 01:33:25 -04:00
anyreso ba0bd15171 Merge branch 'feat/cicd' into 'develop'
💚 Gitlab CI/CD

See merge request open-fpsz/open-fpsz!17
2024-04-15 05:26:21 +00:00
anyreso fbfe058468 💚 Gitlab CI/CD 2024-04-15 05:26:21 +00:00