Squinty
|
5beae31686
|
Merge branch 'feat/flagstand-and-fixes' into 'develop'
Add Flagstand prop and fix walking on non-terrain surfaces
See merge request open-fpsz/open-fpsz!88
|
2024-04-28 22:22:37 +00:00 |
|
Squinty
|
06eeff520d
|
Add Flagstand prop and fix walking on non-terrain surfaces
|
2024-04-28 22:22:36 +00:00 |
|
Squinty
|
5a3c52c26d
|
Merge branch 'enhance/deathmatch-tests' into 'develop'
Add DeathmatchScoringComponent unit tests
See merge request open-fpsz/open-fpsz!87
|
2024-04-28 20:30:09 +00:00 |
|
Squinty
|
45961e81fa
|
Add DeathmatchScoringComponent unit tests
|
2024-04-28 20:30:09 +00:00 |
|
anyreso
|
2f5b207252
|
Merge branch 'enhance/add-more-tests' into 'develop'
✅ Add Flag entity unit tests
See merge request open-fpsz/open-fpsz!85
|
2024-04-28 14:43:03 +00:00 |
|
Squinty
|
204688fb43
|
✅ Add Flag entity unit tests
|
2024-04-28 14:43:03 +00:00 |
|
anyreso
|
e659bc7837
|
Merge branch 'feat/settings' into 'develop'
🔧 Settings, Maps and Environments management
See merge request open-fpsz/open-fpsz!79
|
2024-04-28 06:15:19 +00:00 |
|
anyreso
|
61706c9488
|
🔧 Settings, Maps and Environments management
|
2024-04-28 06:15:19 +00:00 |
|
anyreso
|
a3e216e84c
|
✏️ convert space to tabs
|
2024-04-27 16:24:39 -04:00 |
|
anyreso
|
14b6b9ac28
|
Merge branch 'feat/2d_speed' into 'develop'
🧑💻 Measure speed ignoring vertical speed
See merge request open-fpsz/open-fpsz!80
|
2024-04-27 13:32:08 +00:00 |
|
Ninthly
|
31d71cd322
|
🧑💻 Measure speed ignoring vertical speed
|
2024-04-27 13:32:08 +00:00 |
|
Squinty
|
053de78edb
|
Merge branch 'cleanup/match-participant-component' into 'develop'
Extract MatchParticipantComponent from Player entity and fix HealthComponent tests
See merge request open-fpsz/open-fpsz!83
|
2024-04-27 13:32:03 +00:00 |
|
Squinty
|
cfd0dd73fd
|
Extract MatchParticipantComponent from Player entity and fix HealthComponent tests
|
2024-04-27 13:32:03 +00:00 |
|
Squinty
|
3ce62a6548
|
Merge branch 'cleanup/refactor-multiplayer-code' into 'develop'
Refactor Multiplayer code
See merge request open-fpsz/open-fpsz!81
|
2024-04-26 22:24:34 +00:00 |
|
Squinty
|
4d577d751d
|
Refactor Multiplayer code
|
2024-04-26 22:24:34 +00:00 |
|
Squinty
|
a1314dfea4
|
Merge branch 'feat/friend-and-foe-iffs' into 'develop'
✨ Implement friend and foe IFF color change and fix bugs
See merge request open-fpsz/open-fpsz!78
|
2024-04-26 21:01:10 +00:00 |
|
Squinty
|
4c44dc7b30
|
✨ Implement friend and foe IFF color change and fix bugs
|
2024-04-26 21:01:10 +00:00 |
|
Squinty
|
4cead7d985
|
Merge branch 'feat/teams' into 'develop'
✨ Implement Teams and disallow team damage in Rabbit
See merge request open-fpsz/open-fpsz!77
|
2024-04-26 15:49:43 +00:00 |
|
Squinty
|
ac8bd2d07c
|
✨ Implement Teams and disallow team damage in Rabbit
|
2024-04-26 15:49:43 +00:00 |
|
anyreso
|
1a19e5edfa
|
Merge branch 'fix/flag-regrabs' into 'develop'
Fix mid-air flag regrabs when going fast
See merge request open-fpsz/open-fpsz!75
|
2024-04-26 14:09:37 +00:00 |
|
Squinty
|
a3906c196a
|
Fix mid-air flag regrabs when going fast
|
2024-04-26 14:09:37 +00:00 |
|
Squinty
|
ce709a6794
|
Merge branch 'feat/jetpackfx' into 'develop'
Add jetpack effect
See merge request open-fpsz/open-fpsz!76
|
2024-04-26 11:33:42 +00:00 |
|
sean.s.mclaughlan
|
a0427a9a37
|
Add jetpack effect
|
2024-04-26 02:32:49 -07:00 |
|
anyreso
|
0251dc0a5e
|
Merge branch 'feat/projectile-smoothing' into 'develop'
✨ Projectile smoothing
See merge request open-fpsz/open-fpsz!73
|
2024-04-25 22:53:37 +00:00 |
|
Squinty
|
9a0dd5ef5b
|
✨ Projectile smoothing
|
2024-04-25 22:53:37 +00:00 |
|
anyreso
|
38bfaf32ba
|
Merge branch 'feat/map-selector' into 'develop'
✨ add a map selector for multiplayer hosting
See merge request open-fpsz/open-fpsz!72
|
2024-04-25 21:08:55 +00:00 |
|
anyreso
|
ac6d50857d
|
✨ add a map selector for multiplayer hosting
|
2024-04-25 21:08:55 +00:00 |
|
Squinty
|
3671d29d13
|
Merge branch 'feat/flag-smoothing' into 'develop'
Make the Flag entity smooth as silk
See merge request open-fpsz/open-fpsz!71
|
2024-04-25 19:18:16 +00:00 |
|
Squinty
|
86d90730c8
|
Make the Flag entity smooth as silk
|
2024-04-25 19:18:15 +00:00 |
|
Squinty
|
0977336f8c
|
HOTFIX: tests pass again
|
2024-04-25 19:49:39 +02:00 |
|
anyreso
|
3ef8374b52
|
Merge branch 'main' into develop
|
2024-04-25 10:47:30 -04:00 |
|
anyreso
|
197445acdb
|
📝 update CONTRIBUTING.md
|
2024-04-25 10:47:20 -04:00 |
|
anyreso
|
832f8c470c
|
Merge branch 'cleanup/projectile-trails' into 'develop'
🎨 Cleanup projectile trails logic
See merge request open-fpsz/open-fpsz!69
|
2024-04-25 13:48:09 +00:00 |
|
Squinty
|
ca189643b2
|
🎨 Cleanup projectile trails logic
|
2024-04-25 13:48:08 +00:00 |
|
Squinty
|
85d8548688
|
Merge branch 'cleanup/move-scoreboard' into 'develop'
Cleanup: move Scoreboard, it's not a HUD
See merge request open-fpsz/open-fpsz!68
|
2024-04-25 07:33:26 +00:00 |
|
Squinty
|
3901a17f0e
|
Cleanup: move Scoreboard, it's not a HUD
|
2024-04-25 07:33:26 +00:00 |
|
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 |
|