Commit Graph

167 Commits

Author SHA1 Message Date
Kristofers Solo
988947d428 Merge branch 'master' of github.com:Kristofers-Solo/Godot 2021-11-18 21:56:31 +02:00
Moonshrike
3e120b55fb changed_look_of_trajectory
__
2021-11-18 20:49:23 +02:00
Kristofers Solo
0d0014feca Removed comment 2021-11-18 20:39:59 +02:00
Kristofers Solo
e5cda86ddb Added working singleplayer 2021-11-18 20:35:58 +02:00
Kristofers Solo
2e7cbe647e Merge branch 'master' into UI 2021-11-18 20:35:14 +02:00
Kristofers Solo
839a12f221 Added something 2021-11-18 20:13:40 +02:00
Kristofers Solo
fb285a744d Merge branch 'master' into UI 2021-11-18 20:06:04 +02:00
Kristofers Solo
c25a45ecfb Added something 2021-11-18 20:04:46 +02:00
Kristofers Solo
d542c495e2 Added something 2021-11-18 20:04:41 +02:00
Alan Alexander Cerna
fbda5ea0f5 [Partial-Completion] Tutorial, loading_screen, player-killed 2021-11-18 20:01:14 +02:00
Alan Alexander Cerna
e5ffc4c41c [Micro] Killed added 2021-11-18 19:54:20 +02:00
Alan Alexander Cerna
51c17f21a7 [Nano] Tutorial-skip-implementation 2021-11-18 19:43:15 +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
fc26a2d903 Added dead player and fixed weapon position on respawn 2021-11-18 19:03:12 +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
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
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
Moonshrike
d944bbf380 deleting bot
when is shoot
2021-11-17 23:34:37 +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
Alan Alexander Cerna
331c7fe2d0 [Minimal] Animation fix 2021-11-17 22:01:51 +02:00
Alan Alexander Cerna
cd6cb9f512 Merge branch 'singleplayer_goal_implementation' 2021-11-17 21:46:19 +02:00
Alan Alexander Cerna
a040a8e433 [Minimal] Finishing touches to the basic 2021-11-17 21:44:06 +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
Alan Alexander Cerna
bf4cc0c9cd [Medium] Partial implementation of TS-BOTs 2021-11-17 21:12:06 +02:00
Moonshrike
52f9227ee9 Merge branch 'fix_t' 2021-11-17 00:01:48 +02:00
Alan Alexander Cerna
7ea66f9b83 [Minimal] Implementation of bots 2021-11-16 18:34:53 +02:00