Commit Graph

57 Commits

Author SHA1 Message Date
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
Moonshrike
e29220d878 little changes
trajectory's length increased
line is instanced from the beginning
2021-11-18 19:21:07 +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
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
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
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
Alan Alexander Cerna
a06dd60a09 [Minimal] Added loading scene. 2021-11-18 00:36:20 +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
7714b175eb Merge branch 'fix_t' into shooting-mechanics 2021-11-16 10:34:20 +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
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
ccf3093fac Fixed some debugger problems 2021-11-14 21:52:55 +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
Alan Alexander Cerna
bf88daafe5 [Minimal] Phase registration fix 2021-11-14 15:57:28 +02:00
Alan Alexander Cerna
b27f2ffbb5 [Minimal] Adjusted HUD-POS 2021-11-14 15:37:46 +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
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
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
Moonshrike
beb23adac3 fixed trajectories
\/
2021-11-12 02:15:57 +02:00
Kristofers Solo
b854fd6259 Removed fullscreen toggle 2021-11-12 01:19:46 +02:00
Alan Alexander Cerna
777c5c5ec1 Added fullscreen toggle 2021-11-12 00:09:28 +02:00
Alan Alexander Cerna
63621fa52f [Medium] Assessing synchronization 2021-11-11 18:52:11 +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
Alan Alexander Cerna
8281e1af15 [Minimal] Visual update 2021-11-10 14:52:19 +02:00
Kristofers Solo
239cedf2b8 Fixed dependencies 2021-11-09 10:13:47 +02:00
Moonshrike
fc8bed9781 Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-09 02:52:17 +02:00
Kristofers Solo
d04434256c Fixed removing of hitboxes after player death 2021-11-09 02:07:56 +02:00
Alan Alexander Cerna
88cecda848 Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-09 01:08:04 +02:00