388 Commits

Author SHA1 Message Date
ac07785f59 quest data 2020-05-25 08:44:56 -06:00
35dd503d14 quests! 2020-05-25 08:44:50 -06:00
1bd10f4bb8 Merge pull request 'box_drops' (#155) from box_drops into master
Reviewed-by: jake <jake@sharnoth.com>
2020-05-24 18:02:54 -04:00
2e4f54d41c Merge pull request 'load_character for item_manager to not crash when client leaves a room' (#156) from leave_room_crash into master 2020-05-23 11:41:54 -04:00
94a1893a03 load_character for item_manager to not crash when client leaves a room 2020-05-23 12:33:28 -03:00
3524f38240 dont unwrap 2020-05-23 01:16:02 -03:00
629b53586d hook up box drops, add specific box drops, and item-from-bytes functions 2020-05-22 18:58:51 -03:00
dcc5b57b8e box drops working and load correct city file 2020-05-15 13:48:16 -03:00
a8892467f6 Merge pull request 'drop partial stacks of items/meseta' (#148) from drop_split_item into master 2020-05-15 01:44:42 -04:00
25f342b510 drop partial stacks of items/meseta 2020-05-14 23:38:18 -06:00
678dd879d5 this changed in libpso2 2020-05-14 09:46:59 -06:00
efba98124c this changed in libpso 2020-05-14 09:45:05 -06:00
d3ed0ddd8e Merge pull request 'redo items to account for client ignoring the assigned item_id and using its own. also item picking up' (#146) from jp/item_overhaul3 into master 2020-05-14 11:41:22 -04:00
ac28354dd7 redo items to account for client ignoring the assigned item_id and using its own. also item picking up 2020-05-13 22:32:30 -06:00
580a21d9fc Merge pull request 'item structure overhaul' (#143) from item_overhaul2 into master 2020-05-06 09:57:17 -04:00
25d5658042 don't double count picked up meseta 2020-05-06 07:51:29 -06:00
1f775661fa meseta! 2020-05-06 07:51:03 -06:00
c3f474e34d remove commented out code 2020-05-05 22:16:15 -06:00
9a721e0980 item structure overhaul
also, item pickup
2020-05-05 22:13:45 -06:00
51e7ab0c45 Merge pull request 'armour_bytes' (#142) from armour_bytes into master 2020-05-04 19:01:36 -04:00
9c17377722 drop shields with non-0 stats 2020-05-04 19:50:47 -03:00
cb758b3b85 Merge pull request 'cleanup_warnings' (#141) from cleanup_warnings into master 2020-05-03 13:46:32 -04:00
e95270539b forgot to underscore 2020-05-03 14:30:10 -03:00
6ef78b4ed6 drop armour with stats 2020-05-03 14:26:40 -03:00
5393baeca7 remove unused infoboard packet 2020-05-03 13:54:14 -03:00
d421b30a88 remove commented things 2020-05-02 22:17:12 -03:00
e255b43c10 hella warnings cleanup pt 1. remove unused imports, allow deadcode and unused results 2020-05-02 22:08:37 -03:00
57a44fde16 Merge pull request 'clean_empty_room' (#118) from clean_empty_room into master
Reviewed-by: jake <jake@sharnoth.com>
2020-05-01 17:50:14 -04:00
49849e7904 assume get neighbours was successful 2020-05-01 18:44:59 -03:00
7a3f0db3bf try if-let 2020-04-30 19:30:17 -03:00
c8a6823b82 remove unwraps 2020-04-30 01:08:09 -03:00
49aee7af26 remove rooms when player disconnects 2020-04-29 23:57:09 -03:00
d64528d679 Merge branch 'master' of http://git.sharnoth.com/jake/elseware 2020-04-29 01:03:16 -03:00
2e46567987 Merge pull request 'add room password handling' (#115) from room_password into master 2020-04-28 23:59:03 -04:00
36ee49d28e remove unwrap 2020-04-29 00:45:48 -03:00
8174da0154 Merge pull request 'changinglobbies' (#116) from changinglobbies into master 2020-04-28 23:04:02 -04:00
6f83db4441 Merge branch 'master' of http://git.sharnoth.com/jake/elseware 2020-04-28 19:54:54 -03:00
mht8355
7c6cdd30cc better code 2020-04-28 01:41:32 -04:00
mht8355
880bfc620a added some error handling 2020-04-28 01:25:50 -04:00
d1ec1d7359 Merge pull request 'don't rely on map file data to have monster area' (#117) from fix_monster_area_gaps into master 2020-04-28 01:09:37 -04:00
68e75a55f0 don't rely on map file data to have monster area 2020-04-27 22:53:05 -06:00
mht8355
a24381bc66 sends the client a message when selected lobby = current lobby 2020-04-27 22:58:43 -04:00
a83aa2d9df and i oop braces 2020-04-27 22:57:08 -03:00
mht8355
062fed231a change_lobby added for changing lobbies and leaving a room 2020-04-27 21:22:12 -04:00
906a2dcd16 add room password handling 2020-04-27 21:59:15 -03:00
mht8355
d206814394 added change_lobby 2020-04-27 20:17:35 -04:00
c28adcd7e5 Merge pull request 'item drops' (#112) from itemdropsforreal into master 2020-04-27 09:14:41 -04:00
6458fad89f fix tech drop tests 2020-04-27 07:07:51 -06:00
b22ce086f7 guess I needed this PartialEq for the tests 2020-04-27 07:07:09 -06:00
a32a7130f4 cleanup 2020-04-27 06:55:37 -06:00