Commit Graph

104 Commits

Author SHA1 Message Date
Moonshrike
0706f73970 lilbit of progress (only instancin a single line with bullet 2021-11-15 12:25:46 +02:00
Moonshrike
cb1fd92c7c check 2021-11-15 02:01:02 +02:00
Moonshrike
0e5a47b83a Revert "Revert "pushed""
This reverts commit 263490eb418d45297bb56fd31450496c7daefd4c.
2021-11-15 00:54:58 +02:00
Kristofers Solo
dacc55ed48 Fixed bug 'host inverting function' 2021-11-14 22:18:59 +02:00
Kristofers Solo
ba44fd60d1 Fixed bug 'trinity site not loading' 2021-11-14 22:07:11 +02:00
Kristofers Solo
ccf3093fac Fixed some debugger problems 2021-11-14 21:52:55 +02:00
Kristofers Solo
261e63b7f3 Added new bullet texture 2021-11-14 20:48:21 +02:00
Kristofers Solo
438cfab840 Added new bullet texture 2021-11-14 20:24:28 +02:00
Kristofers Solo
a62df3adb4 Merge branch 'UI' 2021-11-14 20:10:04 +02:00
Kristofers Solo
d4b2c25a0a Added game control UI 2021-11-14 20:09:45 +02:00
Alan Alexander Cerna
9c9b5cbc46 [Micro] Bullet svg upload 2021-11-14 16:35:32 +02:00
Alan Alexander Cerna
b8ed648f3f [Minimal] Singleplayer seperation (The destruction of code) 2021-11-14 16:20:34 +02:00
Kristofers Solo
fdc4f4d6e4 Merge branch 'master' into UI 2021-11-14 16:13:59 +02:00
Alan Alexander Cerna
5f1e2d2cb5 [Micro] Phase fix 2021-11-14 16:13:27 +02:00
Kristofers Solo
fb73e1f74e Changed main menu button style 2021-11-14 16:11:10 +02:00
Alan Alexander Cerna
bf88daafe5 [Minimal] Phase registration fix 2021-11-14 15:57:28 +02:00
Alan Alexander Cerna
ff70160e40 [Minimal] GUI file upload 2021-11-14 15:47:09 +02:00
Alan Alexander Cerna
a4d90b8b50 [Minimal] Game-start set 2021-11-14 15:42:04 +02:00
Alan Alexander Cerna
b27f2ffbb5 [Minimal] Adjusted HUD-POS 2021-11-14 15:37:46 +02:00
Alan Alexander Cerna
634866060e Merge branch 'master' of https://github.com/Kristofers-Solo/Godot 2021-11-14 15:30:22 +02:00
Alan Alexander Cerna
b2c053605b [Minimal] Added GUI sprites 2021-11-14 15:30:11 +02:00
Kristofers Solo
9d448ffeec
Update menu_button_overlay.gd 2021-11-14 12:45:57 +02:00
Kristofers Solo
ca55ea4d5e Added menu button 2021-11-14 12:41:11 +02:00
Kristofers Solo
9a157b2284 Added health bar 2021-11-13 15:02:48 +02:00
Kristofers Solo
f7cb616e21 Weapon fix 2021-11-13 13:42:35 +02:00
Kristofers Solo
1795fa87f8 Working singleplayer 2021-11-13 13:17:38 +02:00
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
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