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

• fc5d318ac3 shared banks wow jake 2023-02-05 18:34:04 -07:00
• 8b4eb146ac shared bank db migration jake 2023-02-05 01:54:03 -07:00
• 0bf84db189 bankname -> bankidentifier jake 2023-02-05 01:53:38 -07:00
• ddab0ab6a3 use scapedoll jake 2023-02-04 22:04:09 -07:00
• a63e7fe28c chatcommand base jake 2023-02-03 16:03:33 -07:00
• 818b92b962 Merge pull request 'change tech menu' (#129) from change_tech_menu into master jake 2023-02-03 03:18:02 -05:00
• d16b2418f3 update tech menu #129 jake 2023-02-03 00:15:11 -07:00
• 960e9f367e handle thing that apparently errored beyond my expectations jake 2023-02-02 23:28:55 -07:00
• effc82d782 Merge pull request 'impl grinders, fix mag pbs, fix bank thing, etc' (#128) from use_grinders into master jake 2023-02-02 11:37:55 -05:00
• 45996e9d01 clippy #128 jake 2023-02-02 00:10:15 -07:00
• 77f69a9d23 fix more dumb meseta things jake 2023-02-01 23:30:53 -07:00
• 6399cbbb0e fix mag pbs maybe I dunno jake 2023-02-01 19:21:30 -07:00
• 85d9fc9ce3 a test for bank item_id stuff jake 2023-01-31 20:00:18 -07:00
• 0d3161e1b4 more error context jake 2023-01-31 20:00:03 -07:00
• aac2e429ed tests for item_id parity issues jake 2023-01-31 19:23:20 -07:00
• 9123c4842b start of fixing item_id parity issues jake 2023-01-31 19:22:11 -07:00
• cccf385ee9 recv pkt trace -> info jake 2023-01-31 19:18:18 -07:00
• 52da851d8a stray println jake 2023-01-31 00:13:08 -07:00
• 28c0073dff implement grinders jake 2023-01-31 00:08:56 -07:00
• f27c121539 take ref to weapon modifier jake 2023-01-31 00:06:34 -07:00
• 6a2703ed6c update inmemory gateway to reflect how inventory actually works jake 2023-01-31 00:06:08 -07:00
• f3bfa658cd Merge pull request 'bunch of small fixes' (#127) from make_actually_work into master jake 2023-01-30 22:07:37 -05:00
• 5b8f4fd087 disconnect a client if any error occurs #127 jake 2023-01-30 18:50:05 -07:00
• cc34f512c3 remove duplicates and change unknownitem to unknownobject andy/map-objects andy 2023-01-31 01:46:11 +00:00
• 8f6b562c22 clippy3 jake 2023-01-30 18:19:04 -07:00
• 42ef2ebcbb clippy2 jake 2023-01-30 18:12:43 -07:00
• f3682d0b82 clippy jake 2023-01-30 18:05:36 -07:00
• bdecb9f873 map objects copied from phantasmal world andy 2023-01-30 23:51:20 +00:00
• 6ef5ea6681 set mag owner when creating a char jake 2023-01-30 15:45:34 -07:00
• 1fb0abce09 more info on incorrect tool usage jake 2023-01-30 10:46:42 -07:00
• 7144ede73f more green boxes andy 2023-01-30 18:33:41 +00:00
• 939c511f92 add some atomizers jake 2023-01-30 10:43:12 -07:00
• aa019d4ea9 pick the newest character for a slot when recreating jake 2023-01-29 23:57:17 -07:00
• 8157db4c69 set tech level correctly when reading from postgres jake 2023-01-29 23:56:28 -07:00
• 13c6592438 you can use techs now wow jake 2023-01-29 23:05:42 -07:00
• 7bd385d580 anyhowing continues jake 2023-01-29 22:15:49 -07:00
• f09c73611f fix some user setting entity stuff jake 2023-01-29 22:15:29 -07:00
• d495ec97f2 fix this keyconfig nonsense jake 2023-01-29 20:41:12 -07:00
• 31ebc1af32 actually store meseta bank interaction jake 2023-01-29 17:06:48 -07:00
• fe472eaae2 lvl value in level up pkt is 0-based jake 2023-01-29 16:34:29 -07:00
• 0b641424da don't start with 300 meseta in bank jake 2023-01-29 16:34:11 -07:00
• f5fea8540e fix problem where item drops were not pickup-able jake 2023-01-29 15:57:58 -07:00
• f80e37c438 oh forgot to add these migrations jake 2023-01-29 15:32:09 -07:00
• 58da1f87f6 inital drop test jake 2023-01-29 15:31:49 -07:00
• 220d3e7185 update exp tests with new map builder tech jake 2023-01-29 13:08:07 -07:00
• bbaf39fa0b rename default_map_variants jake 2023-01-29 13:07:41 -07:00
• 33b80d7235 mapbuilder trait -> just a function jake 2023-01-29 12:48:42 -07:00
• b831f9b83b drop table builder jake 2023-01-29 12:35:46 -07:00
• e5f13b6cb7 why did I make this generic over rng anyway its not like I was ever gonna use that jake 2023-01-29 11:51:55 -07:00
• 62387366e4 fix anyhow-inflicted tests jake 2023-01-29 01:00:29 -07:00
• 08efcce6f7 mapbuilder jake 2023-01-29 00:56:56 -07:00
• ab8c5e6688 more anyhow jake 2023-01-29 00:55:39 -07:00
• a2686e2be8 anyhow jake 2023-01-28 20:12:20 -07:00
• 43579f7058 fix postgres stuff to get to a game jake 2023-01-28 00:56:31 -07:00
• 97f7a202e1 testing morfin/test morfin 2023-01-07 17:14:48 -05:00
• f04ae8113f add create team teams jake 2022-10-26 00:37:17 -06:00
• feb09cc13b make interserver stuff able to communicate with clients jake 2022-10-26 00:15:18 -06:00
• fba46dd0d8 send better guildcard number jake 2022-10-25 23:44:48 -06:00
• dfd48e1496 Merge pull request 'use_item_jackolantern' (#124) from use_item_jackolantern into master jake 2022-10-22 17:14:03 -04:00
• 4f8a75f9d7 cleanup #124 jake 2022-10-22 14:12:38 -06:00
• fbab8fe5e8 cleanup errors jake 2022-10-22 14:05:38 -06:00
• dbf73acb8d basic item use infra, with jackolanterns jake 2022-10-22 14:05:26 -06:00
• 4c2fa8600a missed some magcells, and apparently they stack jake 2022-10-22 14:01:04 -06:00
• db66019f2c Merge pull request 'fix in lobby ship select' (#123) from fix_lobby_ship_select into master jake 2022-10-22 15:26:45 -04:00
• 2483d2242b fix character location rooms jake 2022-10-22 02:15:08 -06:00
• 2959181873 cleanup jake 2022-10-20 18:38:04 -06:00
• 38070c9dfd simplify the return type of item tasks jake 2022-10-20 17:41:38 -06:00
• 40046ae991 move around uses jake 2022-10-20 17:41:03 -06:00
• 5c34612afe oh I should probably await that jake 2022-10-20 15:06:03 -06:00
• 0f876d25bb well that was duplicated I guess jake 2022-10-20 15:03:46 -06:00
• e0e68b9ad7 impromptu db transaction refactor jake 2022-10-20 14:47:08 -06:00
• e6e080004f fix in lobby ship select #123 jake 2022-10-19 22:32:30 -06:00
• 32dddfd9bd Merge pull request 'holiday rappies (and other events)' (#122) from holidays into master jake 2022-10-19 22:28:26 -04:00
• d671a8ae42 map+flatten->flat_map #122 jake 2022-10-19 19:14:54 -06:00
• 6ced59a730 holidays! (with rappies) jake 2022-10-19 19:10:15 -06:00
• 8700987986 actually this can be simplified jake 2022-10-19 17:41:04 -06:00
• ed9f951bca cleanup rare enemy generation jake 2022-10-19 17:36:16 -06:00
• b42deeede1 print out sent packets jake 2022-10-19 17:26:18 -06:00
• 6b9a45fb70 this isn't being used jake 2022-10-19 17:26:04 -06:00
• 4a38d94dbb more cleanup jake 2022-10-19 03:13:16 -06:00
• ad694b695e Merge pull request 'fix the whole single mutex on the server state thing' (#121) from making_shipstate_clone into master jake 2022-10-18 23:50:44 -04:00
• 6f0fa05e3b add client.rs #121 jake 2022-10-18 19:48:18 -06:00
• 4dc814d244 forgot to remove local dev libpso jake 2022-10-18 19:27:40 -06:00
• 192ff967e6 cleanup this refactored mess jake 2022-10-18 17:55:47 -06:00
• 4b1ded6f7d clean up new mainloop stuff jake 2022-10-18 16:26:08 -06:00
• 9843274bd8 fix character server/interserver communication jake 2022-10-18 16:23:32 -06:00
• 3a50cd7ba1 fix the standalone binaries jake 2022-10-18 16:21:45 -06:00
• fdce44cdd8 refactor the rest of the fucking code jake 2022-10-18 04:46:21 -06:00
• 27931adb5a clippy found some new problems jake 2022-09-18 21:05:48 -06:00
• 58c26301bf make ClientLocation Clone-able jake 2022-09-18 21:01:32 -06:00
• 2d880d8cf0 Merge pull request 'make CharacterLevelTable a global const lookup table cause whynot' (#118) from global_leveltable into master jake 2022-08-02 22:38:02 -04:00
• 36261663be new rust version new clippy lints #118 jake 2022-08-02 18:37:06 -06:00
• 91a92870dc use the correct structure this time jake 2022-08-02 12:00:49 -06:00
• 1f5e94ccfb make CharacterLevelTable a global const lookup table cause whynot jake 2022-08-02 00:08:55 -06:00
• bbc1919309 Merge pull request 'clone entitygateway more' (#117) from clone_gateway_more into master jake 2022-07-30 23:48:06 -04:00
• e5ff75e367 clippy #117 jake 2022-07-30 20:16:07 -06:00
• 16a4653360 pass EntityGateway clones rather than letting functions borrow jake 2022-07-30 15:02:18 -06:00
• d6c2e289ff use async mutexes in inmemorygateway and reimplement inmemorygateway transactions jake 2022-07-30 14:33:22 -06:00
• c87b6e7fad Merge pull request 'character playtime' (#116) from character_playtime into master jake 2022-07-28 23:53:19 -04:00
• 4788f707ed track character playtime #116 jake 2022-07-28 20:31:55 -06:00