Commit graph

236 commits

Author SHA1 Message Date
Squinty 2c2c3ec719 Implement a Settings menu 2024-04-18 16:53:34 +00:00
anyreso c3582b04e6 Merge branch 'fix/mouse' into 'develop'
🐛 fix camera updates

See merge request open-fpsz/open-fpsz!47
2024-04-18 15:55:07 +00:00
anyreso 251b51f10b 🐛 fix camera updates 2024-04-18 15:55:07 +00:00
Squinty fbe895cd60 Fix: Flag Carriers struggling to climb ropes.
* This was due to a wrong physical layer mask on ShapeCast
2024-04-18 15:43:37 +02:00
anyreso ac79366271 🐛 fix unloaded skybox texture 2024-04-17 16:59:35 -04:00
anyreso 448c066cc4 Merge branch 'feat/env' into 'develop'
 Add simple skybox and base environment

See merge request open-fpsz/open-fpsz!45
2024-04-17 19:51:27 +00:00
anyreso 4eb9442abb Add simple skybox and base environment 2024-04-17 19:51:27 +00:00
Squinty c190e9231c Merge branch 'feat/esc-to-menu' into 'develop'
 Use escape key to get back to main menu

See merge request open-fpsz/open-fpsz!44
2024-04-17 19:21:31 +00:00
Squinty 94fbf5c604 Use escape key to get back to main menu 2024-04-17 19:21:31 +00:00
Squinty 3e28091661 Merge branch 'fix/midair-flag-regrabs' into 'develop'
Fix/midair flag regrabs

See merge request open-fpsz/open-fpsz!43
2024-04-17 16:25:25 +00:00
Squinty 847fca30cb Fix/midair flag regrabs 2024-04-17 16:25:24 +00:00
Squinty 59fb960102 Merge branch 'fix/networking-issues' into 'develop'
🐛 Fix network issues affecting flag and player movement

See merge request open-fpsz/open-fpsz!42
2024-04-17 16:07:25 +00:00
Squinty 503e15b591 🐛 Fix network issues affecting flag and player movement 2024-04-17 16:07:24 +00:00
Squinty 63e39bbe15 Merge branch 'feat/nicknames' into 'develop'
 Working profile names in-game, basic settings save/load system, flag drops on player death

See merge request open-fpsz/open-fpsz!39
2024-04-16 21:39:08 +00:00
Squinty 3640aeb4cf Working profile names in-game, basic settings save/load system, flag drops on player death 2024-04-16 21:39:08 +00:00
Squinty 94b7ee0a53 Merge branch 'feat/flag' into 'develop'
Flag entitty implemented

See merge request open-fpsz/open-fpsz!37
2024-04-15 20:41:19 +00:00
Squinty 9ee9d63916 Flag entitty implemented 2024-04-15 20:41:19 +00:00
anyreso 78488dbc65 💚 disable cicd tests 2024-04-15 15:18:28 -04:00
anyreso c819760e02 ✏️ fix typo 2024-04-15 01:33:25 -04:00
anyreso ba0bd15171 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 fbfe058468 💚 Gitlab CI/CD 2024-04-15 05:26:21 +00:00
anyreso 875b507e62 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 6e26c6a295 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 4319c4650a 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 d56f0c2930 HOTFIX 2024-04-14 23:25:41 +02:00
Squinty f90ee66be1 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 1bdc670b44 🐛 Refactored AreaDamageComponent to be an ExplosiveDamageComponent 2024-04-14 21:20:02 +00:00
anyreso 4db5c28c88 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 3f3a2de207 🐛 Aerial control, small refactoring and dummy target fix 2024-04-14 14:24:30 +00:00
anyreso c76c149302 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 f23f9df671 Fully skinned 3rd person character, aim IK basic setup 2024-04-13 20:18:32 +00:00
anyreso 185b834c67 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 12f189c21a 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 3218c20fc2 Toggle mouse mode 2024-04-13 14:50:16 +00:00
anyreso fa4ef26411 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 22929c0930 Refactoring and added unit testing framework 2024-04-12 22:23:39 +00:00
Squinty 02fff71474 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 ba05e251a0 Minor cleanup: IFF uses editor-set nodes rather than hardcoded paths to the external scene 2024-04-12 16:16:06 +00:00
Squinty c68ce60870 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 59337599d2 Fix damage/health client/server desynchnorization 2024-04-12 16:14:45 +00:00
Squinternator 31ebd861a2 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 6f5a2f402c Basic implementation of IFF indicators showing player names and health bars 2024-04-11 22:13:21 +00:00