Commit Graph

123 Commits

Author SHA1 Message Date
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
Kristofers Solo
c304de8815
Update trinity_site_level.tscn 2021-11-12 02:36:14 +02:00
Kristofers-Solo
eb09bfbf02 Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-12 02:16:27 +02:00
Moonshrike
beb23adac3 fixed trajectories
\/
2021-11-12 02:15:57 +02:00
Kristofers-Solo
c70586de47 Fixed clouds 2021-11-12 02:14:59 +02:00
Kristofers Solo
ce22a3e01a Deleted .import files 2021-11-12 01:31:04 +02:00
Kristofers Solo
d1eb2715a0 Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-12 01:20:02 +02:00
Kristofers Solo
b854fd6259 Removed fullscreen toggle 2021-11-12 01:19:46 +02:00
Kristofers Solo
d83176a723
Delete Player-character-theme-gun-05.png.import 2021-11-12 01:15:46 +02:00
Kristofers Solo
e3e1d2c041
Delete tank.svg.import 2021-11-12 01:15:36 +02:00
Kristofers Solo
3c9d2068ed
Delete bullet.png.import 2021-11-12 01:15:20 +02:00
Kristofers Solo
b277f0c9bf Merge branch 'UI' 2021-11-12 01:13:08 +02:00
Kristofers Solo
da9047544d Changed trinity site .png files to .svg 2021-11-12 01:12:34 +02:00
Alan Alexander Cerna
777c5c5ec1 Added fullscreen toggle 2021-11-12 00:09:28 +02:00
Alan Alexander Cerna
d7bab7a6ba [EXPERIMENTAL] 2021-11-11 21:33:36 +02:00
Alan Alexander Cerna
589392a1b8 [Medium] Implement phases 2021-11-11 20:34:53 +02:00
Kristofers Solo
5f38a545a7 Fixed bullets following player 2021-11-11 20:21:36 +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
14b300b915 Fix 2021-11-11 19:14:09 +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
Kristofers Solo
0faf5cd754 Gun fix [kinda] 2021-11-11 16:58:45 +02:00
Kristofers Solo
e4da0b81f2 Removed Gun_.gd 2021-11-11 16:12:40 +02:00
Kristofers Solo
da3fb6b9d4 Synced bullets 2021-11-11 16:09:58 +02:00
Kristofers Solo
2722f28b64 Synced bullets 2021-11-11 16:05:08 +02:00
Kristofers Solo
5c5c602235 Merge branch 'master' into client-sync 2021-11-10 21:06:26 +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
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
60074a2508 [Minimal] Beginning development of game controller 2021-11-10 15:11:51 +02:00
Alan Alexander Cerna
8281e1af15 [Minimal] Visual update 2021-11-10 14:52:19 +02:00
Kristofers Solo
e4f0bbd726 Fixed dependencies 2021-11-10 13:05:59 +02:00
Moonshrike
bd6b71eb0c lagging sine bad trip
u'll enjoy it, but I promise, not for a long time, lol
2021-11-10 03:17:59 +02:00
Alan Alexander Cerna
ed0a190679 [Minimal] Up-to-status 2021-11-09 12:30:03 +02:00
Kristofers Solo
2d9765ccf0 Merge branch 'shooting-mechanics' into client-sync 2021-11-09 10:14:08 +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
Moonshrike
78488a2b4d Changing trajectories using numpad(as always)
do not remove fucking Position2D
2021-11-09 02:45:31 +02:00
Kristofers Solo
d04434256c Fixed removing of hitboxes after player death 2021-11-09 02:07:56 +02:00
Alan Alexander Cerna
10d5d393d3 [Medium] Animation fix. 2021-11-09 01:34:28 +02:00
Alan Alexander Cerna
88cecda848 Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-09 01:08:04 +02:00
Alan Alexander Cerna
dbd491a9f2 [Minimal] Undefined 2021-11-09 01:07:39 +02:00
Kristofers Solo
f4b5e60376 Fixed missing elements on 'esc' pressed 2021-11-09 01:01:04 +02:00
Kristofers Solo
08b006460e Merged shooting-mechanics 2021-11-09 00:57:21 +02:00
Kristofers Solo
16ede8b64f Added bullet despawn timer 2021-11-09 00:50:38 +02:00
Kristofers Solo
14d1b73984 Merge branch 'shooting-mechanics' of github.com:KristofersSolo/Godot into shooting-mechanics 2021-11-09 00:47:59 +02:00
Kristofers Solo
c45e9fc300 Added bullet despawn timer 2021-11-09 00:47:46 +02:00
Alan Alexander Cerna
002d67968b [Minimal] Fixed username rotation 2021-11-09 00:30:10 +02:00
Moonshrike
c780a4db78 trajectory_list
traajs
2021-11-09 00:21:39 +02:00
Alan Alexander Cerna
d6a0dc17ef Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-09 00:07:39 +02:00
Alan Alexander Cerna
401a6f053d [Minimal] Fix up 2021-11-09 00:06:27 +02:00
Kristofers Solo
a49780f049 Enabled schooting mechanics 2021-11-09 00:05:56 +02:00
Kristofers Solo
124d76e3b0 Merged from master 2021-11-08 23:26:00 +02:00
Kristofers Solo
0721ed9f90 Fixed? player node 2021-11-08 19:55:07 +02:00
Kristofers Solo
349aee2b4b ikd what changed 2021-11-08 19:50:57 +02:00
Kristofers Solo
c22ab2d44e Fixed multiplayer 2021-11-08 19:47:14 +02:00
Alan Alexander Cerna
11703d5476 [Minimal] Update player_node.tscn 2021-11-08 19:29:59 +02:00
Alan Alexander Cerna
551ea4b3bf [Very small] Changes. 2021-11-08 19:26:08 +02:00
Alan Alexander Cerna
4db21e3929 [Medium] Import of something (Let's hope for the best) 2021-11-08 19:18:36 +02:00
Alan Alexander Cerna
855d5ccc45 Merge branch 'master' of https://github.com/KristofersSolo/Godot 2021-11-08 19:18:00 +02:00
Kristofers Solo
a59fcd1f2b Merged UI to master 2021-11-08 18:56:45 +02:00
Kristofers Solo
f154f74991 Added missing UI 2021-11-08 18:53:37 +02:00
Kristofers Solo
7f3fc869e9 Deleted individual projects 2021-11-08 16:37:54 +02:00
Kristofers Solo
7e6cef10db Merged form Shooting-mechanics branch 2021-11-08 14:23:15 +02:00
Kristofers Solo
023a86f226 Deleted individual projects 2021-11-08 14:11:12 +02:00