Commit Graph

92 Commits

Author SHA1 Message Date
Kristofers Solo
0c37f03d8b fixed trajectories 2021-11-18 21:47:12 +02:00
Kristofers Solo
7e8eb3d74c Merge branch 'master' into kritofers-test 2021-11-18 20:54:31 +02:00
Kristofers Solo
406e6371b8 test 2021-11-18 20:53:57 +02:00
Moonshrike
e38b18bdc8 flippped_trajectory_enabled
yo
2021-11-18 20:40:31 +02:00
Kristofers Solo
0d0014feca Removed comment 2021-11-18 20:39:59 +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
d542c495e2 Added something 2021-11-18 20:04:41 +02:00
Alan Alexander Cerna
e5ffc4c41c [Micro] Killed added 2021-11-18 19:54:20 +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
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
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
527b90b51e Added user input 2021-11-18 01:56:35 +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
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
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
71bbc2afac Completely fixed
Added bullet trajectories
2021-11-15 22:19:45 +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
cb1fd92c7c check 2021-11-15 02:01:02 +02:00
Kristofers Solo
9bcd7acac9 Added working 'esc' button 2021-11-15 01:29:39 +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
Alan Alexander Cerna
b27f2ffbb5 [Minimal] Adjusted HUD-POS 2021-11-14 15:37:46 +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
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