Commit Graph

83 Commits

Author SHA1 Message Date
Kristofers Solo
2e7cbe647e Merge branch 'master' into UI 2021-11-18 20:35:14 +02:00
Kristofers Solo
fb285a744d Merge branch 'master' into UI 2021-11-18 20:06:04 +02:00
Kristofers Solo
d542c495e2 Added something 2021-11-18 20:04:41 +02:00
Alan Alexander Cerna
f8b5449a4d [Medium] Small fixes to loading and tutorial 2021-11-18 19:38:14 +02:00
Moonshrike
2ca2428d67 Merge branch 'master' of https://github.com/Kristofers-Solo/Godot 2021-11-18 19:21:57 +02:00
Moonshrike
e29220d878 little changes
trajectory's length increased
line is instanced from the beginning
2021-11-18 19:21:07 +02:00
Alan Alexander Cerna
c8d0643a3a [Medium] Bot fix 2021-11-18 19:03:56 +02:00
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
Kristofers Solo
5785200818 Merge branch 'loading-screen-implementation' 2021-11-18 17:48:14 +02:00
Kristofers Solo
e9ef99178b fix 2021-11-18 17:46:42 +02:00
Kristofers Solo
3453652416 Merge branch 'UI' 2021-11-18 17:41:21 +02:00
Kristofers Solo
5aa61ecd64 fix 2021-11-18 17:41:06 +02:00
Kristofers Solo
00ac810527 Merge branch 'UI' 2021-11-18 17:35:15 +02:00
Kristofers Solo
567ab06336 fix 2021-11-18 17:33:09 +02:00
Alan Alexander Cerna
f246532f7a [Large] Changes to the functionality and design of the tutorial 2021-11-18 17:21:58 +02:00
Kristofers Solo
ad901afab7 fix 2021-11-18 17:11:50 +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
61c213d188 Small main menu fix 2021-11-18 02:50:27 +02:00
Kristofers Solo
33a0752596 Merge branch 'UI' 2021-11-18 02:46:56 +02:00
Kristofers Solo
8a2de895f2 Changed esc menu 2021-11-18 02:42:28 +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
Kristofers Solo
9a31acda87 Changed win/lose screen for multiplayer 2021-11-18 01:55:55 +02:00
Alan Alexander Cerna
a06dd60a09 [Minimal] Added loading scene. 2021-11-18 00:36:20 +02:00
Alan Alexander Cerna
7fcf5b5b56 [Minimal] Bot adjustments 2021-11-17 23:49:32 +02:00
Alan Alexander Cerna
cd6cb9f512 Merge branch 'singleplayer_goal_implementation' 2021-11-17 21:46:19 +02:00
Alan Alexander Cerna
bf4cc0c9cd [Medium] Partial implementation of TS-BOTs 2021-11-17 21:12:06 +02:00
Alan Alexander Cerna
7ea66f9b83 [Minimal] Implementation of bots 2021-11-16 18:34:53 +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
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
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
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
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
d4b2c25a0a Added game control UI 2021-11-14 20:09:45 +02:00
Kristofers Solo
fb73e1f74e Changed main menu button style 2021-11-14 16:11:10 +02:00