Commit Graph

190 Commits

Author SHA1 Message Date
Kristofers Solo
052e99f4f0 Merge branch 'game-handle' into singleplayer-mode 2021-11-13 13:05:31 +02:00
Kristofers Solo
ce76a57956 Singleplayer test 2021-11-13 13:05:01 +02:00
Kristofers Solo
3b6cfd7906 Trinity-site fix 2021-11-12 20:10:11 +02:00
Kristofers Solo
a7f278b8c9 Merge branch 'master' into game-handle 2021-11-12 20:04:49 +02:00
Alan Alexander Cerna
439e1dcdb3 Fixed game phase sync 2021-11-12 18:41:38 +02:00
Kristofers-Solo
5231ce8624 fix 2021-11-12 02:41:20 +02:00
Kristofers Solo
0dd3aaf1c8
Update main_menu.tscn 2021-11-12 02:39:25 +02:00
Kristofers Solo
21f737d96f
Update main_menu.tscn 2021-11-12 02:37:07 +02:00
Kristofers Solo
c304de8815
Update trinity_site_level.tscn 2021-11-12 02:36:14 +02:00
Kristofers-Solo
eb09bfbf02 Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-12 02:16:27 +02:00
Moonshrike
beb23adac3 fixed trajectories
\/
2021-11-12 02:15:57 +02:00
Kristofers-Solo
c70586de47 Fixed clouds 2021-11-12 02:14:59 +02:00
Kristofers Solo
8f01d78bbe
Delete icon.png.import 2021-11-12 01:31:45 +02:00
Kristofers Solo
ce22a3e01a Deleted .import files 2021-11-12 01:31:04 +02:00
Kristofers Solo
d1eb2715a0 Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-12 01:20:02 +02:00
Kristofers Solo
b854fd6259 Removed fullscreen toggle 2021-11-12 01:19:46 +02:00
Kristofers Solo
d83176a723
Delete Player-character-theme-gun-05.png.import 2021-11-12 01:15:46 +02:00
Kristofers Solo
e3e1d2c041
Delete tank.svg.import 2021-11-12 01:15:36 +02:00
Kristofers Solo
3c9d2068ed
Delete bullet.png.import 2021-11-12 01:15:20 +02:00
Kristofers Solo
b277f0c9bf Merge branch 'UI' 2021-11-12 01:13:08 +02:00
Kristofers Solo
da9047544d Changed trinity site .png files to .svg 2021-11-12 01:12:34 +02:00
Alan Alexander Cerna
777c5c5ec1 Added fullscreen toggle 2021-11-12 00:09:28 +02:00
Alan Alexander Cerna
d7bab7a6ba [EXPERIMENTAL] 2021-11-11 21:33:36 +02:00
Alan Alexander Cerna
589392a1b8 [Medium] Implement phases 2021-11-11 20:34:53 +02:00
Kristofers Solo
5f38a545a7 Fixed bullets following player 2021-11-11 20:21:36 +02:00
Kristofers Solo
a3b67d7203 Phase sync 2021-11-11 20:10:27 +02:00
Alan Alexander Cerna
e434aa0c59 [Min] Sharing is caring 2021-11-11 19:56:46 +02:00
Alan Alexander Cerna
14b300b915 Fix 2021-11-11 19:14:09 +02:00
Alan Alexander Cerna
c93281adc5 [Minimal] Synchronization adjustments 2021-11-11 19:09:36 +02:00
Alan Alexander Cerna
63621fa52f [Medium] Assessing synchronization 2021-11-11 18:52:11 +02:00
Kristofers Solo
1c500ef828 commit 2021-11-11 18:29:14 +02:00
Kristofers Solo
f9f54a02e7 Updated .gitignore 2021-11-11 17:37:30 +02:00
Kristofers Solo
df6a8cdaa0 Removed code as Kroppec asked 2021-11-11 17:36:23 +02:00
Kristofers Solo
d0a4e15a47 Merge branch 'master' into client-sync 2021-11-11 17:27:53 +02:00
Kristofers Solo
67fbaba25c Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-11 17:03:10 +02:00
Kristofers Solo
0faf5cd754 Gun fix [kinda] 2021-11-11 16:58:45 +02:00
Alan Alexander Cerna
e9de8ba4e9 [Revert] 2021-11-11 16:56:05 +02:00
Alan Alexander Cerna
0eb8c68b6d [Revert] 2021-11-11 16:55:15 +02:00
Alan Alexander Cerna
64808b08ce Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-11 16:48:19 +02:00
Alan Alexander Cerna
404ce3192b [Minimal] Small issue fix 2021-11-11 16:47:42 +02:00
Kristofers Solo
e4da0b81f2 Removed Gun_.gd 2021-11-11 16:12:40 +02:00
Kristofers Solo
da3fb6b9d4 Synced bullets 2021-11-11 16:09:58 +02:00
Kristofers Solo
2722f28b64 Synced bullets 2021-11-11 16:05:08 +02:00
Kristofers Solo
5c5c602235 Merge branch 'master' into client-sync 2021-11-10 21:06:26 +02:00
Alan Alexander Cerna
abdace6d1d Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-10 20:36:50 +02:00
Alan Alexander Cerna
a0b65739b3 [Minimal] Comment out issues 2021-11-10 20:35:30 +02:00
Kristofers Solo
d0e51943f1 Merge branch 'master' into client-sync 2021-11-10 20:34:09 +02:00
Moonshrike
7b7fb04c33 working trajectories are added
yesh
2021-11-10 19:59:01 +02:00
Kristofers Solo
8be8c3f455 Fixed a typo 2021-11-10 15:55:08 +02:00
Kristofers Solo
4dd3c815c2 Merge branch 'master' into client-sync 2021-11-10 15:44:44 +02:00