Commit Graph

253 Commits

Author SHA1 Message Date
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
f844e1a4c0 Merge branch 'shooting-mechanics' 2021-11-08 16:35:52 +02:00
Kristofers Solo
99154d25dd Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-08 16:34:15 +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
Kristofers Solo
f0017c1ec7 Updated .gitignore 2021-11-08 13:27:11 +02:00
Kristofers Solo
57214b6137
Delete kristofers/test directory 2021-11-08 13:26:31 +02:00
Kristofers Solo
7f22550fed Updated .gitignore 2021-11-08 13:24:13 +02:00
Kristofers Solo
62829b9aea Added direction and weapon sync 2021-11-08 13:22:07 +02:00
Kristofers Solo
caa3fa9476 Merge branch 'master' of github.com:KristofersSolo/Godot 2021-11-08 09:58:52 +02:00
Kristofers Solo
17af93f11b Updated .gitignore 2021-11-08 09:58:48 +02:00
Alan Alexander Cerna
5949dd13af [Major] Movement improvement, Player-Character redesign, Image system restructure, Particle implementation, Rotational implementation, Weapon implementation 2021-11-07 21:53:45 +02:00
Alan Alexander Cerna
8e24f533eb [Minimal] Fixed double jump-need issue 2021-11-07 16:32:39 +02:00
Kristofers Solo
3bba732d95 Added fullscreen toggle 2021-11-06 17:49:35 +02:00
Kristofers Solo
f10cc2e091 Changes server display button 2021-11-06 17:44:42 +02:00
Kristofers Solo
bcbf588ed7 Minor changes 2021-11-06 17:43:03 +02:00
Kristofers Solo
1e8ca51d83 Merge branch 'ui' 2021-11-06 16:56:40 +02:00
Kristofers Solo
ee359ad4a8 Added pop-up username screen 2021-11-06 16:56:08 +02:00
Kristofers Solo
9812b07374 Added UI 2021-11-06 16:30:21 +02:00
Kristofers Solo
7e15294443 Updated server browser 2021-11-06 03:12:52 +02:00
Kristofers Solo
540410876e commit 2021-11-06 02:06:46 +02:00
Kristofers Solo
aa7aa21a69 Added server browser UI 2021-11-06 02:05:24 +02:00
Alan Alexander Cerna
b18873a12f [Minimal] Issue solve. 2021-11-06 01:59:39 +02:00
Alan Alexander Cerna
6cca4b2ba2 [Major] Player movement - overhaul - v1 2021-11-06 01:50:23 +02:00
Kristofers Solo
1487db9f11 Added main menu 2021-11-06 00:39:30 +02:00
Alan Alexander Cerna
fec38df6fe -- Phase change
The current merging of branches has achieved a new phase.
2021-11-05 19:39:10 +02:00
Kristofers Solo
7ecc2784dc Merge paul branch 2021-11-05 19:33:57 +02:00
Kristofers Solo
43b48daddd Minor changes 2021-11-05 19:28:15 +02:00
Moonshrike
e5ff616a42 commit 2021-11-05 19:24:22 +02:00
Moonshrike
1bf6b36231 commit 2021-11-05 19:23:12 +02:00
Alan Alexander Cerna
bd3e44cc0f [Medium] Memory free up. 2021-11-05 19:13:54 +02:00
Alan Alexander Cerna
eccbb3950b Merge branch 'Trinity-Site-Implementation' 2021-11-05 18:42:03 +02:00
Kristofers Solo
ecdb2cc83f Removed rotation 2021-11-05 18:34:51 +02:00
Alan Alexander Cerna
69c19716b5 [Micro] Map Trinity-Site basic implementation [Complete] 2021-11-05 18:33:19 +02:00
Kristofers Solo
8d6a4acb8a Updated timeout timer 2021-11-05 15:52:58 +02:00
Kristofers Solo
3dbe7fd5dd Fixed search for servers 2021-11-05 15:36:29 +02:00
Alan Alexander Cerna
ad9be5c85c [Medium] Fixed Trinity-Site clouds *Planned expansion 2021-11-04 15:52:09 +02:00
Alan Alexander Cerna
b03cb11620 [Minimal] Animation fix - Grass node 2021-11-04 14:12:08 +02:00
Alan Alexander Cerna
f4188c04b4 [Medium] Grass implementation 2021-11-04 13:13:32 +02:00
Kristofers Solo
cd669f47f5 Fixed crash on spawning 2021-11-04 12:51:24 +02:00
Kristofers Solo
99f1839589 Updated .gitignore 2021-11-04 12:50:54 +02:00
Kristofers Solo
3884bc9695 Update trinity_site_level.tscn 2021-11-04 12:33:32 +02:00
Alan Alexander Cerna
0c1a727f1e [Medium] Trinity-Site environment update 2021-11-03 00:36:03 +02:00
Kristofers Solo
cae282c49a Added bullet trajectory 2021-11-02 23:38:26 +02:00
Alan Alexander Cerna
ef1a207c69 [Minimal] Trinity-Site level z-index adjustments 2021-11-02 23:17:20 +02:00
Alan Alexander Cerna
1cca37530c [Major] Trinity site implementation 2021-11-02 22:51:20 +02:00
Kristofers Solo
8f31e0c510 Updated network setup 2021-11-02 22:48:15 +02:00
Kristofers Solo
9476a26cb0 Updated main menu 2021-11-02 22:35:36 +02:00