Commit Graph

235 Commits

Author SHA1 Message Date
Kristofers Solo
e5f95e6930 Added 'confirm' as 'enter' button 2021-11-18 02:12:30 +02:00
Kristofers Solo
527b90b51e Added user input 2021-11-18 01:56:35 +02:00
Kristofers Solo
9a31acda87 Changed win/lose screen for multiplayer 2021-11-18 01:55:55 +02:00
Kristofers Solo
742ffd91f0 Removed player sprite dead (for now) 2021-11-17 21:32:18 +02:00
Kristofers Solo
7806253aa8 Merge branch 'shooting-mechanics' 2021-11-17 21:30:44 +02:00
Moonshrike
52f9227ee9 Merge branch 'fix_t' 2021-11-17 00:01:48 +02:00
Kristofers Solo
2bd0c846fc Merge branch 'fix_t' into shooting-mechanics 2021-11-16 13:27:44 +02:00
Moonshrike
0af4721c06 fully working input
needs some adjustments
2021-11-16 13:17:38 +02:00
Kristofers Solo
7714b175eb Merge branch 'fix_t' into shooting-mechanics 2021-11-16 10:34:20 +02:00
Moonshrike
3b81f718c8 funny changes
get acquainted with non-working(for now) user input
2021-11-16 00:12:43 +02:00
Moonshrike
ae31ad670e /info/
/informed/
2021-11-15 23:29:04 +02:00
Moonshrike
71bbc2afac Completely fixed
Added bullet trajectories
2021-11-15 22:19:45 +02:00
Kristofers Solo
a680c990bc Added new trajectories 2021-11-15 19:24:38 +02:00
Kristofers Solo
63a08f7818 Merge branch 'fix_t' into shooting-mechanics 2021-11-15 19:16:29 +02:00
Kristofers Solo
29006271ed Updated trinity site playground 2021-11-15 19:15:15 +02:00
Kristofers Solo
142a93f5e2 Correctly configured 'esc' button 2021-11-15 19:08:38 +02:00
Moonshrike
3c9189aef0 Almost working buttons
instead of bullet flying trajectory changing and hyperbollic line
2021-11-15 12:59:44 +02:00
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
Kristofers Solo
f3a5b899e7 Added 'Lost' screen 2021-11-15 01:56:30 +02:00
Kristofers Solo
9bcd7acac9 Added working 'esc' button 2021-11-15 01:29:39 +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