Commit graph

23 commits

Author SHA1 Message Date
Squinternator 3d64b62e2e Merge branch 'feat/fix-multiplayer' into 'develop'
🐛 Fix multiplayer client respawn logic

See merge request open-fpsz/open-fpsz!15
2024-04-10 15:13:18 +00:00
Squinternator 6be0acd4fc 🐛 Fix multiplayer client respawn logic 2024-04-10 15:13:18 +00:00
Squinternator c97ff2c03a Merge branch 'feat/health-bar' into 'develop'
Display Health Bar on player HUD

See merge request open-fpsz/open-fpsz!13
2024-04-09 21:36:43 +00:00
Squinternator b8728de3a0 Display Health Bar on player HUD 2024-04-09 21:36:43 +00:00
Squinternator 2211d60ba0 Merge branch 'feat/server-joining' into 'develop'
 Implement a UI Modal when waiting to join a server

See merge request open-fpsz/open-fpsz!12
2024-04-09 19:27:11 +00:00
Squinternator 7a7fe469b2 Implement a UI Modal when waiting to join a server 2024-04-09 19:27:10 +00:00
anyreso 3a60f48af5 Merge branch 'feat/explosion-transitions' into 'develop'
 Improved explosion transitions

See merge request open-fpsz/open-fpsz!8
2024-04-09 16:52:36 +00:00
anyreso bc49356299 Improved explosion transitions 2024-04-09 16:52:36 +00:00
Squinternator 47d6aa1986 Merge branch 'feat/various-improvements' into 'develop'
 Various improvements to the demo game mode

See merge request open-fpsz/open-fpsz!7
2024-04-09 15:15:04 +00:00
Squinternator c59d71f284 Various improvements to the demo game mode 2024-04-09 15:15:04 +00:00
Sean McLaughlan 350d33f51c Merge branch 'feat/targetv3' into 'develop'
 Add a dummy target

See merge request open-fpsz/open-fpsz!6
2024-04-09 04:52:11 +00:00
sean.s.mclaughlan c4f64f7065 Update health component with reset func to set health back to max 2024-04-08 18:59:50 -07:00
sean.s.mclaughlan f86f62ca9a Add Target scene and script 2024-04-08 18:59:15 -07:00
sean.s.mclaughlan 4710fc79c5 Add placeholder player model 2024-04-08 18:58:55 -07:00
Squinternator 71b24ce428 Merge branch 'feat/health-component' into 'develop'
 Health and AreaDamage components, death and respawn logic

See merge request open-fpsz/open-fpsz!5
2024-04-08 22:31:16 +00:00
Squinternator ce1cdda7a1 Health and AreaDamage components, death and respawn logic 2024-04-08 22:31:16 +00:00
Squinternator 3d21d9a5aa Merge branch 'cleanup/consolidate-player-capsule' into 'develop'
Consolidate player capsule

See merge request open-fpsz/open-fpsz!4
2024-04-08 19:45:42 +00:00
Squinternator 873d6d024e Consolidate player capsule 2024-04-08 19:45:42 +00:00
Zeneixe 647ff30922 Remove unused asset, it's the result of a merge conflict mishap 2024-04-08 18:23:19 +02:00
Squinternator 4dc522be87 Merge branch 'feat/multiplayer-game-modes' into 'develop'
Add multiplayer game mode over the network

See merge request open-fpsz/open-fpsz!1
2024-04-07 21:03:56 +00:00
Squinternator 35af9ecc2d Add multiplayer game mode over the network 2024-04-07 21:03:56 +00:00
anyreso ecc195e38e add templates 2024-04-07 14:53:44 -04:00
anyreso d02447c7e6 🎉 initial commit 2024-04-07 14:25:59 -04:00