Commit graph

182 commits

Author SHA1 Message Date
Squinty
dfa0455327 Add DeathmatchScoringComponent unit tests 2024-04-28 20:30:09 +00:00
anyreso
6289fe527e 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
db2e3e9471 Add Flag entity unit tests 2024-04-28 14:43:03 +00:00
anyreso
0cf558f436 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
5d896e1dd3 🔧 Settings, Maps and Environments management 2024-04-28 06:15:19 +00:00
anyreso
31e6c0910a ✏️ convert space to tabs 2024-04-27 16:24:39 -04:00
anyreso
049cd824a8 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
db124499c8 🧑‍💻 Measure speed ignoring vertical speed 2024-04-27 13:32:08 +00:00
Squinty
b5f8db8a7b 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
b339bf34f0 Extract MatchParticipantComponent from Player entity and fix HealthComponent tests 2024-04-27 13:32:03 +00:00
Squinty
d238c29f76 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
6c32664405 Refactor Multiplayer code 2024-04-26 22:24:34 +00:00
Squinty
72f99eff07 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
3fe0b55f9c Implement friend and foe IFF color change and fix bugs 2024-04-26 21:01:10 +00:00
Squinty
f5e53a7e88 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
24eac3be7b Implement Teams and disallow team damage in Rabbit 2024-04-26 15:49:43 +00:00
anyreso
afedcd49e4 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
e5634d048a Fix mid-air flag regrabs when going fast 2024-04-26 14:09:37 +00:00
Squinty
6999f52d02 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
198998ba22 Add jetpack effect 2024-04-26 02:32:49 -07:00
anyreso
51b6d70c0d 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
9ee72d7dc1 Projectile smoothing 2024-04-25 22:53:37 +00:00
anyreso
bcd857b235 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
8321eec6a3 add a map selector for multiplayer hosting 2024-04-25 21:08:55 +00:00
Squinty
9613e6b651 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
323c5f1c99 Make the Flag entity smooth as silk 2024-04-25 19:18:15 +00:00
Squinty
a18a9ea6f3 HOTFIX: tests pass again 2024-04-25 19:49:39 +02:00
anyreso
036c363071 Merge branch 'main' into develop 2024-04-25 10:47:30 -04:00
anyreso
c9e02540fe 📝 update CONTRIBUTING.md 2024-04-25 10:47:20 -04:00
anyreso
9b509b7101 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
15e4ab18a9 🎨 Cleanup projectile trails logic 2024-04-25 13:48:08 +00:00
Squinty
c772efaa40 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
5e856d8a65 Cleanup: move Scoreboard, it's not a HUD 2024-04-25 07:33:26 +00:00
Squinty
c31ca51645 HOTFIX: Fix exiting multiplayer mode 2024-04-25 08:31:59 +02:00
anyreso
5eae39fcd2 Merge branch 'main' into develop 2024-04-25 00:32:56 -04:00
anyreso
8d8fd34a1b 📝 update CONTRIBUTING.md 2024-04-25 00:30:05 -04:00
anyreso
e89224f56d 📝 update CONTRIBUTING.md 2024-04-25 00:22:24 -04:00
anyreso
078e2f4799 📝 update CONTRIBUTING.md 2024-04-25 00:21:32 -04:00
anyreso
a8293b3869 📝 update CONTRIBUTING.md 2024-04-25 00:19:58 -04:00
anyreso
cf0214a299 📝 update CONTRIBUTING.md 2024-04-25 00:19:41 -04:00
anyreso
d3a2be6316 📝 update CONTRIBUTING.md 2024-04-25 00:04:09 -04:00
anyreso
e23927ffa2 📝 update CONTRIBUTING.md 2024-04-25 00:02:10 -04:00
Squinty
3121f3edcf 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
f9c5a2218e 🐛 Fix crashes when leaving Multiplayer mode 2024-04-24 21:26:14 +00:00
Squinty
e02f52be49 HOTFIX: reset springarm position on respawn 2024-04-24 22:35:01 +02:00
Squinty
071ddb20fb 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
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