Commit Graph

Select branches

Hide Pull Requests

andy/add-patch-log-dir

andy/clamp-mag-feed

andy/directories

andy/map-objects

andy/update-rust

expsteal

fuckin_andy_making_me_do_this_now

kill_counters

map_objects

master

morfin/test

move_stuff_to_libpso

pbs

presents

sendgc

set_char_exp

teams

techs

traps

unitxt

#103

#104

#105

#107

#109

#112

#113

#116

#117

#118

#121

#122

#123

#124

#127

#128

#129

#130

#132

#134

#135

#139

#140

#141

#142

#143

#144

#34

#42

#43

#44

#45

#47

#49

#60

#64

#65

#80

#84

#86

#90

#91

Mono Color

• 7ae60fafc5 asyncify tests jake 2020-06-02 19:02:06 -06:00
• 8d49c50cc5 async EntityGateway jake 2020-06-02 18:51:18 -06:00
• ddee920080 fix bug where picking up a stack caused 2x that item to be picked up jake 2020-05-30 11:24:15 -06:00
• ed51aa379c Merge pull request 'properly pick up stacks and a ton of tests' (#160) from properly_pick_up_stacks into master jake 2020-05-30 13:01:53 -04:00
• c1c4e7de5d remove extra print jake 2020-05-30 10:38:51 -06:00
• d8e6789427 this is kind of an important file jake 2020-05-30 10:37:15 -06:00
• 78a5e0963b add a bunch of item manager tests jake 2020-05-30 10:30:39 -06:00
• e0f73cf273 max_stack should be usize jake 2020-05-30 10:28:23 -06:00
• 3cb5df4577 message/direct_message return a result jake 2020-05-30 09:27:34 -06:00
• c26bc895da fix picking up stacked items messing up inventory count jake 2020-05-28 19:34:41 -06:00
• 649e79c332 make elseware a library with a separate main jake 2020-05-28 19:29:21 -06:00
• cde9b8ebb6 use btrees for these for easier testing jake 2020-05-27 21:51:24 -06:00
• e657800a22 Merge pull request 'max stack for each tool' (#159) from tool_stacks into master jake 2020-05-30 01:36:01 -04:00
• 4e1f816f24 max stack for each tool Andy Newjack 2020-05-29 16:42:43 -03:00
• 3e736d01f4 Merge pull request 'quests' (#157) from quests into master jake 2020-05-25 12:47:45 -04:00
• 51dc531330 fix warnings jake 2020-05-25 10:03:25 -06:00
• fd221ab6a2 use builder::quest jake 2020-05-24 23:03:53 -06:00
• 1954225d34 less unwraps in quest loading jake 2020-05-24 18:43:39 -06:00
• 2580004e07 cleanup done_bursting jake 2020-05-24 18:42:37 -06:00
• ac07785f59 quest data jake 2020-05-24 16:57:50 -06:00
• 35dd503d14 quests! jake 2020-05-24 15:59:48 -06:00
• 1bd10f4bb8 Merge pull request 'box_drops' (#155) from box_drops into master jake 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 jake 2020-05-23 11:41:54 -04:00
• 94a1893a03 load_character for item_manager to not crash when client leaves a room Andy Newjack 2020-05-23 12:33:28 -03:00
• 3524f38240 dont unwrap Andy Newjack 2020-05-23 01:16:02 -03:00
• 629b53586d hook up box drops, add specific box drops, and item-from-bytes functions Andy Newjack 2020-05-22 18:58:51 -03:00
• dcc5b57b8e box drops working and load correct city file Andy Newjack 2020-05-15 13:37:44 -03:00
• a8892467f6 Merge pull request 'drop partial stacks of items/meseta' (#148) from drop_split_item into master jake 2020-05-15 01:44:42 -04:00
• 25f342b510 drop partial stacks of items/meseta jake 2020-05-14 23:38:18 -06:00
• 678dd879d5 this changed in libpso2 jake 2020-05-14 09:46:59 -06:00
• efba98124c this changed in libpso jake 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 jake 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 jake 2020-05-13 22:32:30 -06:00
• 580a21d9fc Merge pull request 'item structure overhaul' (#143) from item_overhaul2 into master jake 2020-05-06 09:57:17 -04:00
• 25d5658042 don't double count picked up meseta jake 2020-05-06 07:51:29 -06:00
• 1f775661fa meseta! jake 2020-05-06 07:51:03 -06:00
• c3f474e34d remove commented out code jake 2020-05-05 22:16:15 -06:00
• 9a721e0980 item structure overhaul jake 2020-05-05 21:53:04 -06:00
• 51e7ab0c45 Merge pull request 'armour_bytes' (#142) from armour_bytes into master jake 2020-05-04 19:01:36 -04:00
• 9c17377722 drop shields with non-0 stats Andy Newjack 2020-05-04 19:50:47 -03:00
• cb758b3b85 Merge pull request 'cleanup_warnings' (#141) from cleanup_warnings into master jake 2020-05-03 13:46:32 -04:00
• e95270539b forgot to underscore Andy Newjack 2020-05-03 14:30:10 -03:00
• 6ef78b4ed6 drop armour with stats Andy Newjack 2020-05-03 14:26:40 -03:00
• 5393baeca7 remove unused infoboard packet Andy Newjack 2020-05-03 13:54:14 -03:00
• d421b30a88 remove commented things Andy Newjack 2020-05-02 22:17:12 -03:00
• e255b43c10 hella warnings cleanup pt 1. remove unused imports, allow deadcode and unused results Andy Newjack 2020-05-02 22:08:37 -03:00
• 57a44fde16 Merge pull request 'clean_empty_room' (#118) from clean_empty_room into master jake 2020-05-01 17:50:14 -04:00
• 49849e7904 assume get neighbours was successful Andy Newjack 2020-05-01 18:44:59 -03:00
• 7a3f0db3bf try if-let Andy Newjack 2020-04-30 19:30:17 -03:00
• c8a6823b82 remove unwraps Andy Newjack 2020-04-30 01:08:09 -03:00
• 49aee7af26 remove rooms when player disconnects Andy Newjack 2020-04-29 23:57:09 -03:00
• d64528d679 Merge branch 'master' of http://git.sharnoth.com/jake/elseware Andy Newjack 2020-04-29 01:03:16 -03:00
• 2e46567987 Merge pull request 'add room password handling' (#115) from room_password into master jake 2020-04-28 23:59:03 -04:00
• 36ee49d28e remove unwrap Andy Newjack 2020-04-29 00:45:48 -03:00
• 8174da0154 Merge pull request 'changinglobbies' (#116) from changinglobbies into master jake 2020-04-28 23:04:02 -04:00
• 6f83db4441 Merge branch 'master' of http://git.sharnoth.com/jake/elseware Andy Newjack 2020-04-28 19:54:54 -03:00
• 7c6cdd30cc better code mht8355 2020-04-28 01:41:32 -04:00
• 880bfc620a added some error handling mht8355 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 jake 2020-04-28 01:09:37 -04:00
• 68e75a55f0 don't rely on map file data to have monster area jake 2020-04-27 22:53:05 -06:00
• a24381bc66 sends the client a message when selected lobby = current lobby mht8355 2020-04-27 22:58:43 -04:00
• a83aa2d9df and i oop braces Andy Newjack 2020-04-27 22:57:08 -03:00
• 062fed231a change_lobby added for changing lobbies and leaving a room mht8355 2020-04-27 21:22:12 -04:00
• 906a2dcd16 add room password handling Andy Newjack 2020-04-27 21:59:15 -03:00
• d206814394 added change_lobby mht8355 2020-04-27 20:17:35 -04:00
• c28adcd7e5 Merge pull request 'item drops' (#112) from itemdropsforreal into master jake 2020-04-27 09:14:41 -04:00
• 6458fad89f fix tech drop tests jake 2020-04-27 07:07:51 -06:00
• b22ce086f7 guess I needed this PartialEq for the tests jake 2020-04-27 07:07:09 -06:00
• a32a7130f4 cleanup jake 2020-04-27 06:55:37 -06:00
• 02c9cdc276 drop techs jake 2020-04-27 06:55:18 -06:00
• 91c44628ea fix meseta drops jake 2020-04-26 22:51:09 -06:00
• bd195a2ffd remove unwrap jake 2020-04-26 22:23:59 -06:00
• 4a526e7673 basic item drop logic jake 2020-04-26 22:01:05 -06:00
• 663797e55b remove unneeded PartialEq derive jake 2020-04-26 21:58:43 -06:00
• 375c97c95d add MapsError to ShipError jake 2020-04-26 21:57:19 -06:00
• 160fc7f10b pub ItemDrop jake 2020-04-26 21:55:12 -06:00
• 0eb9035bad make TechniqueDisk and Tool Copy jake 2020-04-26 21:54:01 -06:00
• 0e3b305f95 add some vars to MapEnemy, error types to misc map functions, and MapArea -> u8 jake 2020-04-26 21:53:11 -06:00
• d773002eaa rawmapenemy unknown3 -> map_area jake 2020-04-26 21:50:34 -06:00
• dcef56dcac add get_room/get_lobby to ClientLocation jake 2020-04-26 20:39:23 -06:00
• c7c9cd0bec Merge pull request 'use thiserror' (#111) from thiserror into master jake 2020-04-26 00:27:03 -04:00
• 9f4a9a4f2c use thiserror jake 2020-04-25 22:16:40 -06:00
• 008e8ebebc Merge pull request 'refactor_packety_things' (#109) from refactor_packety_things into master jake 2020-04-25 00:27:20 -04:00
• 2886f537ba simplify leaving lobby packet sending jake 2020-04-24 22:22:19 -06:00
• 628ad056b4 functions to create room joining packets jake 2020-04-24 20:38:56 -06:00
• a8b7e4fa4e HashMap<ClientId, ClientState> -> Clients jake 2020-04-22 23:49:49 -06:00
• 728ac715c0 move lobby joining packet creations to their own functions jake 2020-04-22 22:59:01 -06:00
• 07403fe815 move block_selected jake 2020-04-22 07:30:59 -06:00
• 0b04701156 move message packet handlers jake 2020-04-22 07:14:59 -06:00
• 832a53821d move settings jake 2020-04-21 23:45:40 -06:00
• 90d0af87a4 move chat functionality jake 2020-04-21 23:40:44 -06:00
• f38e3357f4 move room packet handlers to own file jake 2020-04-21 23:15:11 -06:00
• 4a01beb9e8 move validate_login jake 2020-04-21 22:18:57 -06:00
• 881b7c8e46 begin moving packet handlers to own module, send_player_to_lobby jake 2020-04-21 21:47:41 -06:00
• b4399c7e7e Merge pull request 'new_char_configs' (#106) from new_char_configs into master jake 2020-04-21 22:42:39 -04:00
• ffd782ccce use skin, not costume, for mag colors Andy Newjack 2020-04-20 01:22:07 -03:00
• d978d671a2 dont build huge things we aren't bob the builder Andy Newjack 2020-04-20 00:42:29 -03:00
• 37b19ef3ad make quick tech menu not all foie Andy Newjack 2020-04-20 00:29:23 -03:00
• ff2ae85299 add mag colors Andy Newjack 2020-04-19 23:37:48 -03:00
• 4fae76928d add default palette and symbol chats Andy Newjack 2020-04-19 23:16:44 -03:00