Commit Graph

219 Commits

Author SHA1 Message Date
Pascal Abresch 7a30e35a40 add physics sync 2022-01-03 18:59:16 +01:00
Pascal Abresch d18bb45eeb add some sanity checks to physics 2022-01-02 21:30:04 +01:00
Pascal Abresch 9d1c8f5555 simplify NewPlayer 2022-01-02 21:29:37 +01:00
Pascal Abresch 36d9bf1406 nwthread: adjust for clientid parsing 2022-01-02 21:28:27 +01:00
Pascal Abresch 3b4b02d88d adjust to new api; sanity check for drawing players 2022-01-02 21:27:14 +01:00
Pascal Abresch 7c1c8ace8d fix movement packets, add join code 2022-01-02 21:26:40 +01:00
Pascal Abresch abad3d5874 update init, draw all players 2022-01-01 09:15:57 +01:00
Pascal Abresch 7c926f214d fixed network 2022-01-01 09:14:54 +01:00
Pascal Abresch 9fec201880 start syncing movement 2022-01-01 09:13:54 +01:00
Pascal Abresch 7f9a3db46a fix player.lua 2022-01-01 09:13:26 +01:00
Pascal Abresch ad6986123a network code 2022-01-01 00:07:42 +01:00
Pascal Abresch a42e0814b7 move player code out; update init for multiplayer 2021-12-31 23:14:22 +01:00
Pascal Abresch 99ab455922 add some more networking code 2021-12-31 23:12:53 +01:00
Pascal Abresch 6a0689f2d6 physics: update for multiplayer 2021-12-31 23:11:31 +01:00
Pascal Abresch af35fd67c9 UI: move buffer inline; camera: update for multiplayer 2021-12-31 23:11:13 +01:00
Pascal Abresch 9d1bbcea3d add mouse to drawing.lua 2021-12-31 21:59:41 +01:00
Pascal Abresch 384e7f82f6 change clientid request 2021-12-31 19:40:50 +01:00
Pascal Abresch f6ab2046f4 Make main thread send network datagrams instead 2021-12-31 19:05:07 +01:00
Pascal Abresch 10b4f13516 improve debug print 2021-12-12 18:34:14 +01:00
Pascal Abresch eee424567a update UI 2021-12-12 13:13:14 +01:00
Pascal Abresch 145a2966d6 Add color to rect, more logging for layout 2021-12-12 13:13:00 +01:00
Pascal Abresch 5190b015d8 fix default texture 2021-12-12 11:47:10 +01:00
Pascal Abresch 4c15ae04ce Fix ui selected item showing up wrongly 2021-11-28 14:08:56 +01:00
Pascal Abresch d9e1a6819e use texture dimensions for their native grid 2021-11-28 12:30:41 +01:00
Pascal Abresch 57cb0c2f4a fix fullscreen shortcut 2021-11-28 12:30:16 +01:00
Pascal Abresch 539a3b4278 move camera keypresses 2021-11-28 09:56:01 +01:00
Pascal Abresch 72fa7dc65c rewrite draw loop a bit 2021-11-28 09:55:25 +01:00
Pascal Abresch 955202205b rework network a bit 2021-11-25 20:07:26 +01:00
Pascal Abresch 9decd0e6a8 reneable network 2021-11-25 20:07:05 +01:00
Pascal Abresch 9db8d57229 Find more textures, prepare for tabview 2021-11-25 20:05:53 +01:00
Pascal Abresch b7a9f80454 add ascii functions to utils 2021-11-25 20:05:11 +01:00
Pascal Abresch cfbe7f057f add layout sim mode, add overlayRect 2021-11-25 20:02:42 +01:00
Pascal Abresch 01e9a572c7 Fix critical vulnerability 2021-11-20 16:33:16 +01:00
Pascal Abresch 78254d5ec0 Add help text 2021-11-15 19:32:46 +01:00
Pascal Abresch 2ac9c3cfd9 Move ui
remove dump function (accidentally checked in)
2021-11-15 19:03:25 +01:00
Pascal Abresch 8d9da31f19 make start flying set speed for falling to 0 2021-11-15 18:40:31 +01:00
Pascal Abresch 567c05d0a6 remove debug print 2021-11-15 18:31:46 +01:00
Pascal Abresch dad4c94cd8 remove debug print; code style fix 2021-11-15 18:31:31 +01:00
Pascal Abresch a1522f023c layout: rework assertions a bit 2021-11-15 18:30:18 +01:00
Pascal Abresch d85fcea6db rework flying mode; remove goto 2021-11-15 18:29:52 +01:00
Pascal Abresch 8bfec2ac09 properly fall back to love2d font 2021-11-15 16:40:52 +01:00
Pascal Abresch bbcf06dd1f add fullscreen shortcut 2021-11-14 21:48:24 +01:00
Pascal Abresch 931a90fdee fix UI keeping button hitareas around 2021-11-14 21:48:02 +01:00
Pascal Abresch a1d0ae3aea Add block selector UI 2021-11-13 20:56:43 +01:00
Pascal Abresch 288f021a83 add more layout functions 2021-11-13 20:56:18 +01:00
Pascal Abresch 162f3aebbd move camera to the left for UI 2021-11-13 20:55:34 +01:00
Pascal Abresch d5c1621e00 add number or nil assertion 2021-11-13 20:55:14 +01:00
Pascal Abresch cbf5909dba Fall back to love2d font when needed 2021-11-13 14:01:14 +01:00
Pascal Abresch 382f9d7fca add ui layout lib 2021-11-11 21:20:37 +01:00
Pascal Abresch 44fcf9ba71 exclude grass for now... 2021-11-11 21:20:15 +01:00
Pascal Abresch e2c1565994 Add bg drawing with shift 2021-11-11 21:20:00 +01:00
Pascal Abresch 1580f84078 enable scale display 2021-11-11 21:19:33 +01:00
Pascal Abresch 30f3b25c0c make scales be powers of 2 always 2021-11-11 21:18:33 +01:00
Pascal Abresch 4fe98ef984 Replace color_lock with color_push 2021-11-11 20:31:19 +01:00
Pascal Abresch af71ca5dee move round to drawing.lua 2021-11-11 20:25:05 +01:00
Pascal Abresch 74ab38a248 add helper functions for network 2021-11-11 20:22:55 +01:00
Pascal Abresch b7e429406a fix some more collisions, maybe 2021-11-11 17:21:45 +01:00
Pascal Abresch fa430e7bda split up keyreleased 2021-11-10 20:44:27 +01:00
Pascal Abresch c296779c5e Cleanup
Remove delet_caret
fix assert_num for nil checks (and change api)
Add COLLISION_PRINT debug mode
remove draw_borders
2021-11-10 19:55:49 +01:00
Pascal Abresch 250eac1e8a inline delete_carret (only had one user) 2021-11-10 19:54:07 +01:00
Pascal Abresch 33e9ab946e Fixed physics, the end(?)
Probably getting a sequel, or several...
2021-11-10 19:20:58 +01:00
Pascal Abresch 0ceaa2bf93 Debug move, woop woop! 2021-11-10 19:20:33 +01:00
Pascal Abresch 08eeead58a fix regression 2021-10-30 21:50:32 +02:00
Pascal Abresch fc52c752db move some textures, delete some 2021-10-30 21:49:20 +02:00
Pascal Abresch 115b107c01 Nicer debug output 2021-10-30 20:45:13 +02:00
Pascal Abresch 59dbca4c23 Add noclip; avatar size fix 2021-10-30 18:40:15 +02:00
Pascal Abresch 574adba350 Dynamic player height 2021-10-30 18:39:21 +02:00
Pascal Abresch e66659916e change default player sprite 2021-03-13 20:47:30 +01:00
Pascal Abresch 8769ad278f fix a crash 2021-03-13 20:45:07 +01:00
Pascal Abresch 0639eefd89 Fix assertion 2021-02-12 20:09:08 +01:00
Pascal Abresch ab23758fae learn to spell 2021-02-12 16:06:35 +01:00
Pascal Abresch eb9d137492 disable some debug code 2021-02-12 16:02:00 +01:00
Pascal Abresch fb816c8a77 I command you, code, to work! 2021-02-12 15:54:53 +01:00
Pascal Abresch 78f131a69e minor physics fix 2021-02-12 15:45:33 +01:00
Pascal Abresch c201705cac physics debugging 2021-02-12 15:24:31 +01:00
Pascal Abresch f9d26f9f41 add debug checks 2021-02-11 18:21:44 +01:00
Pascal Abresch b3434118b3 change player drawing 2021-02-11 18:21:28 +01:00
Pascal Abresch a7719dd9de fix asignment teleporting player 2021-02-11 18:07:58 +01:00
Pascal Abresch 083a1ec3c5 typo 2021-02-11 18:00:27 +01:00
Pascal Abresch 4062844064 fix assertion 2021-02-11 17:58:32 +01:00
Pascal Abresch 02473ca491 further work on pyhsics 2021-02-11 17:49:49 +01:00
Pascal Abresch a763704098 add basic -up down- physics collisions 2021-02-10 21:53:00 +01:00
Pascal Abresch a7cebc5355 ui: add debug info 2021-02-10 21:52:15 +01:00
Pascal Abresch 9b5e63c39a exclude world borders 2021-02-07 14:28:34 +01:00
Pascal Abresch ad0768f539 add r for random shortcut, minor cleanup 2021-02-07 14:28:12 +01:00
Pascal Abresch 6028e0bd13 random drawing 2021-02-07 14:27:30 +01:00
Pascal Abresch 480600e0e2 freeze render when game is minimized 2021-02-07 12:23:06 +01:00
Pascal Abresch ac4dc97c25 init: switch buffers by keys, change camera minimum zoom, add new player 2021-01-01 01:46:02 +01:00
Pascal Abresch 7486d57e22 drawing: simplify code 2021-01-01 01:40:05 +01:00
Pascal Abresch 04e30649e5 camera: increase speed on higher zoom 2021-01-01 01:39:37 +01:00
Pascal Abresch cff84e4965 drawing: remove special casing of no lastpos 2020-12-31 16:29:03 +01:00
Pascal Abresch 095a8e1fee graphics: add scaleing 2020-10-03 15:26:42 +02:00
Pascal Abresch 0da38b24dc add scale 2020-09-29 18:54:18 +02:00
Pascal Abresch 90075f5200 update network code 2020-08-21 08:49:11 +02:00
Pascal Abresch 4fb05039df make drawing respect mouse speed 2020-08-21 08:44:32 +02:00
Pascal Abresch c61d97340f start network; cleanup 2020-08-13 21:14:07 +02:00
Pascal Abresch 243e27c1cf add network client part 2020-08-13 21:13:40 +02:00
Pascal Abresch 52035944e9 update ui 2020-08-13 21:13:20 +02:00
Pascal Abresch db90ac6997 update camera 2020-08-13 21:12:13 +02:00
Pascal Abresch c75777410b update physics 2020-08-13 21:11:18 +02:00
Pascal Abresch 9a1743a740 merge 2020-02-29 00:34:55 +01:00
Pascal Abresch 84e6900e29 fix UI 2020-02-29 00:32:35 +01:00
Pascal Abresch e1ba815f7b add most code for physics, except for the code for physics 2020-02-22 01:03:26 +01:00
Pascal Abresch 828a2b0643 make camera speed a bit more configureable-ish 2020-02-22 01:02:54 +01:00
Pascal Abresch eecffb19ef re-organize some code 2020-02-20 17:46:19 +01:00
Pascal Abresch a2d5eed4f8 shift speed 2020-02-12 10:26:01 +01:00
Pascal Abresch add074ea7c change jump, change bg delete 2020-02-11 16:44:28 +01:00
Pascal Abresch 44c4e616d0 make c set bg color, minor speed change 2020-02-11 06:19:49 +01:00
Pascal Abresch f04356927b initial bg color 2020-02-11 06:09:18 +01:00
Pascal Abresch 59fa9670a5 bg color, slight physics adjustments 2020-02-11 05:26:25 +01:00
Pascal Abresch e448ee2ada simplish physx 2020-02-11 04:19:59 +01:00
Pascal Abresch c4f0ff6a26 fix 2020-02-09 19:17:33 +01:00
Pascal Abresch f116a30623 window resizing fix 2020-02-09 19:09:02 +01:00
Pascal Abresch 70ab6d5a72 increase cam range 2020-02-09 18:48:06 +01:00
Pascal Abresch f6db9d969d camera tracks player 2020-02-09 18:38:58 +01:00
Pascal Abresch fffc67b850 remove stub 2020-02-09 16:56:25 +01:00
Pascal Abresch 342c8b245b make window resizeable 2020-02-09 16:53:45 +01:00
Pascal Abresch 6e5e200e84 add config file 2020-02-09 16:17:51 +01:00
Pascal Abresch fe67abe75b reorganize 2020-02-09 16:11:44 +01:00