Commit graph

67 commits

Author SHA1 Message Date
anyreso 9806fcb997 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 99128e1ba5 Improved explosion transitions 2024-04-09 16:52:36 +00:00
Squinternator 27051796fd 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 638117c8f5 Various improvements to the demo game mode 2024-04-09 15:15:04 +00:00
Sean McLaughlan c16a71ca74 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 6887210fcf Update health component with reset func to set health back to max 2024-04-08 18:59:50 -07:00
sean.s.mclaughlan dca6954ad6 Add Target scene and script 2024-04-08 18:59:15 -07:00
sean.s.mclaughlan 76863a3b56 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