Commit Graph

53 Commits

Author SHA1 Message Date
Kristofers Solo
132746d97f fix 2021-11-18 18:05:45 +02:00
Alan Alexander Cerna
be143754be [Medium] Alena f'up. 2021-11-18 17:57:17 +02:00
Alan Alexander Cerna
f246532f7a [Large] Changes to the functionality and design of the tutorial 2021-11-18 17:21:58 +02:00
Alan Alexander Cerna
a1f461427c [Minimal] Merge fixes 2021-11-18 13:48:08 +02:00
Alan Alexander Cerna
1e78e16b8a Merge branch 'master' into loading-screen-implementation 2021-11-18 13:40:51 +02:00
Alan Alexander Cerna
eb75c31c20 [Medium] Introduced target-zones and combined loading screen with tutorial 2021-11-18 13:37:56 +02:00
Kristofers Solo
33a0752596 Merge branch 'UI' 2021-11-18 02:46:56 +02:00
Kristofers Solo
53c4df6c4b Added 'confirm' as 'enter' button 2021-11-18 02:12:32 +02:00
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
Moonshrike
10e37ac1c2 shooting_bot
__
2021-11-17 23:25:39 +02:00
Alan Alexander Cerna
27fe4c951f [Temp] Particle fix 2021-11-17 22:12: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
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
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
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
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
Alan Alexander Cerna
5f1e2d2cb5 [Micro] Phase fix 2021-11-14 16:13:27 +02:00
Alan Alexander Cerna
bf88daafe5 [Minimal] Phase registration fix 2021-11-14 15:57:28 +02:00
Alan Alexander Cerna
a4d90b8b50 [Minimal] Game-start set 2021-11-14 15:42:04 +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
a7f278b8c9 Merge branch 'master' into game-handle 2021-11-12 20:04:49 +02:00
Moonshrike
beb23adac3 fixed trajectories
\/
2021-11-12 02:15:57 +02:00
Alan Alexander Cerna
589392a1b8 [Medium] Implement phases 2021-11-11 20:34:53 +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
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
df6a8cdaa0 Removed code as Kroppec asked 2021-11-11 17:36:23 +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
Moonshrike
7b7fb04c33 working trajectories are added
yesh
2021-11-10 19:59:01 +02:00
Alan Alexander Cerna
60074a2508 [Minimal] Beginning development of game controller 2021-11-10 15:11:51 +02:00