Commit graph

72 commits

Author SHA1 Message Date
anyreso 9f4617fb52 add scoreboard tests 2024-04-15 02:13:20 -04:00
anyreso 7cd8bbeadb Merge branch 'develop' into feat/ctf 2024-04-15 01:47:44 -04:00
anyreso 29b445799c ✏️ fix typo 2024-04-15 01:33:25 -04:00
anyreso 90590304ea 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 968d49ed73 💚 Gitlab CI/CD 2024-04-15 05:26:21 +00:00
anyreso b5ded96e3b Merge branch 'develop' into feat/ctf 2024-04-15 00:25:14 -04:00
anyreso cf5d1b27de Merge branch 'main' into develop 2024-04-14 19:47:44 -04:00
anyreso 6a2e6004a8 📝 remove useless import 2024-04-14 19:42:01 -04:00
anyreso c7013fd159 📝 update README 2024-04-14 19:36:15 -04:00
anyreso e222b7a55e Merge branch 'feat/projectile-trail' into 'develop'
 Projectile trail for the spacegun

See merge request open-fpsz/open-fpsz!28
2024-04-14 23:00:21 +00:00
Sean Dozeman a86c1c965d Projectile trail for the spacegun 2024-04-14 23:00:21 +00:00
anyreso f9851ab507 📝 update docs 2024-04-14 18:53:17 -04:00
anyreso fb753ac550 📝 update README 2024-04-14 18:52:57 -04:00
anyreso cdab1433f4 📝 update LICENSE 2024-04-14 18:52:39 -04:00
Squinty 7e5254e3c0 HOTFIX 2024-04-14 23:25:41 +02:00
Squinty 9b22018128 Merge branch 'cleanup/minor-refactorings' into 'develop'
🐛 Refactored AreaDamageComponent to be an ExplosiveDamageComponent

See merge request open-fpsz/open-fpsz!33
2024-04-14 21:20:02 +00:00
Squinty 49a59e8c31 🐛 Refactored AreaDamageComponent to be an ExplosiveDamageComponent 2024-04-14 21:20:02 +00:00
anyreso dc7896a591 Merge branch 'feat/aerial_control' into 'develop'
🐛 Aerial control, small refactoring and dummy target fix

See merge request open-fpsz/open-fpsz!31
2024-04-14 14:24:30 +00:00
anyreso 1c5e168015 🐛 Aerial control, small refactoring and dummy target fix 2024-04-14 14:24:30 +00:00
anyreso e6cd2a79c6 simple scoreboard system 2024-04-13 18:59:32 -04:00
anyreso 3f19e3e033 Merge branch 'feat/fully-skinned-3rd-person-character' into 'develop'
Fully skinned 3rd person character, aim IK basic setup

See merge request open-fpsz/open-fpsz!29
2024-04-13 20:18:32 +00:00
Squinty 497ba59e03 Fully skinned 3rd person character, aim IK basic setup 2024-04-13 20:18:32 +00:00
anyreso b3e7854d88 Merge branch 'main' into develop 2024-04-13 16:11:19 -04:00
anyreso 14f28b1a53 📝 update CONTRIBUTING 2024-04-13 16:11:01 -04:00
anyreso d63e599e59 📝 update README 2024-04-13 16:10:48 -04:00
anyreso 5d94469f1f add .gitignore 2024-04-13 16:10:34 -04:00
anyreso 7685a66169 Merge branch 'fix/window-mouse-capture' into 'develop'
 Toggle mouse mode

See merge request open-fpsz/open-fpsz!27
2024-04-13 14:50:16 +00:00
schorsch_huckleberry a3d9a534d8 Toggle mouse mode 2024-04-13 14:50:16 +00:00
anyreso 182e8c85c9 Merge branch 'feat/tests' into 'develop'
 Refactoring and added unit testing framework

See merge request open-fpsz/open-fpsz!25
2024-04-12 22:23:39 +00:00
anyreso 080ce479da Refactoring and added unit testing framework 2024-04-12 22:23:39 +00:00
Squinty 06346b2d98 Merge branch 'cleanup/iff-attach-point' into 'develop'
Minor cleanup: IFF uses editor-set nodes rather than hardcoded paths to the external scene

See merge request open-fpsz/open-fpsz!23
2024-04-12 16:16:06 +00:00
Squinty dbcbe15bb9 Minor cleanup: IFF uses editor-set nodes rather than hardcoded paths to the external scene 2024-04-12 16:16:06 +00:00
Squinty 7005f1c273 Merge branch 'fix/damage-desynchnorization' into 'develop'
Fix damage/health client/server desynchnorization

See merge request open-fpsz/open-fpsz!24
2024-04-12 16:14:45 +00:00
Squinty 49ffa397e7 Fix damage/health client/server desynchnorization 2024-04-12 16:14:45 +00:00
Squinternator 8221b323aa Merge branch 'feature/iff-indicators' into 'develop'
 Basic implementation of IFF indicators showing player names and health bars

See merge request open-fpsz/open-fpsz!22
2024-04-11 22:13:21 +00:00
Squinternator 7e52ededc0 Basic implementation of IFF indicators showing player names and health bars 2024-04-11 22:13:21 +00:00
Squinternator 424c01bc02 Merge branch 'cleanup/explosions' into 'develop'
🐛 Fix explosion bugs and cleanup logic

See merge request open-fpsz/open-fpsz!21
2024-04-11 17:44:13 +00:00
Squinternator 91f14aea21 🐛 Fix explosion bugs and cleanup logic 2024-04-11 17:44:13 +00:00
Squinternator 7a8f0c91a1 Merge branch 'cleanup/use-death-animation' into 'develop'
 Use death animation rather than tween, saves network packets!

See merge request open-fpsz/open-fpsz!20
2024-04-11 16:51:49 +00:00
Squinternator bf9906a576 Use death animation rather than tween, saves network packets! 2024-04-11 16:51:48 +00:00
Squinternator 2d8bb1a713 Merge branch 'fix/projectile-size-and-collisions' into 'develop'
🐛 Fix projectile size and collisions

See merge request open-fpsz/open-fpsz!19
2024-04-11 12:26:59 +00:00
Squinternator 82d04f89a2 🐛 Fix projectile size and collisions 2024-04-11 12:26:59 +00:00
Squinternator 7714656d21 Merge branch 'feat/first-pass-animations' into 'develop'
 First-pass player animations: idle, shooting

See merge request open-fpsz/open-fpsz!18
2024-04-11 12:23:02 +00:00
Squinternator 53363e0384 First-pass player animations: idle, shooting 2024-04-11 12:23:02 +00:00
Squinternator ae32f6095a Merge branch 'feat/space-gun-reloading' into 'develop'
 Weapon reload mechanics and reticle first-pass

See merge request open-fpsz/open-fpsz!16
2024-04-10 16:03:10 +00:00
Squinternator 8fc00e4bdf Weapon reload mechanics and reticle first-pass 2024-04-10 16:03:09 +00:00
anyreso b3f8c203e5 Merge branch 'main' into develop 2024-04-10 11:38:09 -04:00
anyreso aa19ebd57e 📝 add gitlab templates 2024-04-10 11:35:55 -04:00
anyreso cbe916bd40 📝 add gitlab templates 2024-04-10 11:33:07 -04:00
Squinternator d5096bbb8d 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