Commit graph

80 commits

Author SHA1 Message Date
Jan
fa04e92ab3 Added menu options for fullscreen and mouse sensitivity 2020-06-20 00:35:42 +02:00
Jan
9e96bca10c Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-19 22:49:28 +02:00
Jan
eebfff2929 Added escape button menu navigation 2020-06-19 22:49:02 +02:00
0f355f1bb2 Handgun model and scene. 2020-06-19 22:46:08 +02:00
Jan
c4608990a6 fixed issues with Level.tscn 2020-06-19 01:41:44 +02:00
15b0a89853 Possibly outdated, but possibly unbroken Level.tscn 2020-06-19 01:36:53 +02:00
03a7f7d7ea Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-19 01:34:53 +02:00
f8294614b7 Handgun scale fixes and missing files. 2020-06-19 01:34:26 +02:00
Jan
5a673ba0af Forgot to add some things 2020-06-19 01:30:53 +02:00
03f16038f8 Added a handgun model. 2020-06-19 01:27:00 +02:00
Jan
1e61fa2e2d merge 2020-06-19 01:22:30 +02:00
Jan
d423da3c1b Added killfloor and respawn 2020-06-19 01:21:17 +02:00
e7295bb377 Added sun and some generic procedural concrete texture to the level. 2020-06-19 01:05:00 +02:00
8db36703d7 Fixed player scale, tidied up the crosshair node names, altered jump and walk speed. 2020-06-19 00:30:39 +02:00
Jan
7e5986c5c5 Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-19 00:11:09 +02:00
Jan
0bf8c83f1e fix debug information being from the wrong player 2020-06-19 00:11:03 +02:00
ef98d6ca5f ColorRect Crosshair 2020-06-19 00:10:21 +02:00
Jan
402ad8c927 Added quick join feature 2020-06-18 22:02:59 +02:00
Jan
3b92b0fd6c Add rudimentary menu 2020-06-18 01:16:46 +02:00
Jan
bf510a7c9e Added 'pausing' and input capturing 2020-06-17 22:38:26 +02:00
Jan
a43524999b Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-17 22:01:15 +02:00
Jan
2f344d1989 Added shooting 2020-06-17 22:01:12 +02:00
fdda03de9a Listed common Server IPs in an export hint 2020-06-17 00:46:15 +02:00
7f1d6228a5 Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-16 23:53:13 +02:00
996becf1e5 Enlarged player camera near clipping distance. Unhid the player Mesh, added server IP. 2020-06-15 23:48:20 +02:00
Jan
afbaac7647 Multiple players now works 2020-06-15 15:24:26 +02:00
8204bf91ba Hide debug label for remote peers 2020-06-14 22:16:42 +02:00
Jan
3eb3aba7eb multiple players 2020-06-14 22:06:45 +02:00
Jan
bf32d86855 Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-14 21:55:22 +02:00
Jan
be5261020e Multiple players 2020-06-14 21:55:10 +02:00
13491e7f0b Fixed weird rotation inertia with mouselook. 2020-06-14 21:54:52 +02:00
efb7dace84 Stopped player sliding off of a slope. 2020-06-14 21:50:07 +02:00
abfad802e1 Fixed level ramps 2020-06-14 21:42:56 +02:00
Jan
d723d74fa7 Changes to player spawning upon connection 2020-06-14 21:40:50 +02:00
f8e0f90507 Added ramps to the level. 2020-06-14 21:38:04 +02:00
Jan
cc628da615 multiple players 2020-06-14 21:34:17 +02:00
88d94918c4 Moved debug label into Player scene 2020-06-14 21:29:36 +02:00
932ea33b0c Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-14 21:24:13 +02:00
Jan
3e946da062 Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-14 21:23:39 +02:00
Jan
5a0c3c14d2 Multiple players 2020-06-14 21:23:34 +02:00
d1b5943677 Fixed player accelerating downwards while standing on the ground. 2020-06-14 21:23:10 +02:00
b536ce2c36 Ground check for jumping 2020-06-14 21:20:49 +02:00
edea49ca89 Air control. 2020-06-14 21:19:37 +02:00
1b00359d81 Walk velocity interpolation. 2020-06-14 21:16:33 +02:00
fcfe733ef7 Made the player mesh invisible. 2020-06-14 21:03:31 +02:00
064bf1a5f5 Debug label in Game.tscn 2020-06-14 21:02:51 +02:00
26cce05399 Merge branch 'master' of https://github.com/unfa/jam-01 2020-06-14 21:02:03 +02:00
855df698fa More Movement logic. 2020-06-14 21:01:48 +02:00
Jan
8b75f4ffa6 Fixed network status debugging 2020-06-14 20:59:37 +02:00
Jan
e7e5f6b348 Debugging connection status 2020-06-14 15:58:05 +02:00