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

• e1360e4958 bank doesn't spawn infinite money! andy 2020-11-01 23:14:38 -04:00
• 73c24a5d20 cleanup jake 2020-11-01 18:05:09 -07:00
• 8717024694 move errors to anyhow to get backtraces jake 2020-11-01 09:04:37 -07:00
• a3413083b6 add auth for interserver connections jake 2020-11-01 07:49:04 -07:00
• 3a095a928d fix item ids not being set correctly jake 2020-10-31 23:18:25 -06:00
• 5e9a94081c remove unwrap jake 2020-10-31 19:13:45 -06:00
• 72141ace2c remove unneeded warnings jake 2020-10-31 19:04:42 -06:00
• e8fd37e32d save_item -> change_item, impl for postgres jake 2020-10-31 10:50:14 -06:00
• ce3e58d459 remove unwraps in ship on_disconnect jake 2020-10-30 23:09:01 -06:00
• 498cf4ef43 remove panic when failing to load a battle param jake 2020-10-30 22:58:10 -06:00
• 83e6c9cf30 remove unused files jake 2020-10-30 22:24:05 -06:00
• 29c5f88427 Merge pull request 'sorting_items' (#245) from sorting_items into master jake 2020-11-01 19:41:51 -05:00
• 34cf660cbd dont make new inventory andy 2020-11-01 19:54:50 -04:00
• e08c582f17 fix test after rebase andy 2020-10-31 23:53:06 -03:00
• ead1752978 rebase and remove unneeded function andy 2020-10-31 23:14:15 -03:00
• 51240a31e3 rename test file andy 2020-10-31 23:02:41 -03:00
• 6d4f5ae8f6 enumerate after filtering and add test andy 2020-10-31 22:26:12 -03:00
• fd1e3697fc sorting test. need to rename the test file andy 2020-10-31 14:32:44 -03:00
• 45d9b82598 sort items packets and dont equip multiple items in main it's confusing andy 2020-10-31 01:25:18 -03:00
• 1b9eafeaa9 Merge pull request 'split_bins' (#243) from split_bins into master jake 2020-10-31 00:15:08 -04:00
• 586eb28c49 fix tests jake 2020-10-30 21:43:54 -06:00
• ad612615c7 rebases are hard jake 2020-10-30 21:27:00 -06:00
• b517fb561c fix some things jake 2020-10-30 21:22:26 -06:00
• 164a8a1ad8 disable duplicate account checking since its super bugged jake 2020-10-30 21:20:28 -06:00
• bacf309978 on_connect/on_disconnect return results jake 2020-10-30 21:20:03 -06:00
• 99cc651fd9 add enumiter to item types jake 2020-10-29 22:10:28 -06:00
• 66d25ed155 fix name shadowing jake 2020-10-29 19:40:43 -06:00
• cae89cd2ac get_items_by_character takes character id not character entity jake 2020-10-29 19:34:09 -06:00
• 01fe0931b1 make itementity serializable jake 2020-10-29 19:09:22 -06:00
• c802bceb3c prevent double logins jake 2020-10-27 22:31:54 -06:00
• 05596cec4f change serverstate on_connect and on_disconnect to async jake 2020-10-27 22:27:12 -06:00
• a02cb57825 remove ship from shiplist when it disconnects jake 2020-10-27 06:36:34 -06:00
• b249a3fed5 fix inventory slot and stacked items jake 2020-10-27 06:36:07 -06:00
• a14aee4e29 handle unactivated accounts in the correct spot jake 2020-10-27 06:29:20 -06:00
• b3e0674ca5 fix more tests + fix warnings jake 2020-10-26 00:02:48 -06:00
• 174445c175 properly load techs jake 2020-10-26 00:01:05 -06:00
• 3543cc5b5a logging in login and ship jake 2020-10-25 23:59:50 -06:00
• 578e4c7cf8 properly handle disconnections in interserver connections jake 2020-10-25 23:42:39 -06:00
• e3e5bff300 fix tests jake 2020-10-25 23:38:17 -06:00
• 1ac85b9a5c tell loginserv the ip of charserv jake 2020-10-25 20:20:27 -06:00
• 19e30f34e6 remote postgres dep and fix save_user function jake 2020-10-25 20:19:05 -06:00
• 0db9a73849 check if an account is activated before allowing a login jake 2020-10-24 17:46:38 -06:00
• 2351b31125 entitygateway uses results for its functions now jake 2020-10-24 17:45:59 -06:00
• 69374ea424 use sqlx for migrations jake 2020-10-24 00:18:07 -06:00
• 466195193d load patch config from env vars jake 2020-10-24 00:17:25 -06:00
• 29422eac51 I am dubm jake 2020-10-24 00:16:42 -06:00
• 7a831c35c4 add separate binaries for the server types jake 2020-10-22 13:16:24 -06:00
• a50f1d58a4 Merge pull request 'equip_changes' (#241) from equip_changes into master jake 2020-10-28 20:36:42 -04:00
• a95bcf35c8 andypls andy 2020-10-28 20:15:00 -03:00
• 67e96d33db why did i shuffle this andy 2020-10-28 20:12:42 -03:00
• f3608d99ad add armor_slot to postgres model for unit andy 2020-10-26 23:39:03 -03:00
• f3e7599975 some comments and tests andy 2020-10-26 23:03:51 -03:00
• e256423dfa remove comments and don't be canadian andy 2020-10-23 23:12:11 -03:00
• 790668f6f7 add unit armour slots. equip the unit into the right slot and save correctly andy 2020-10-23 23:09:30 -03:00
• 555171d11d server unequips units now. formatting and cleanup unuseds. fix merge conflict andy 2020-10-21 00:54:23 -03:00
• be29c83bb9 check priest mind against dolphin drop andy 2020-10-14 20:16:31 -03:00
• 6c33c7ec9b dont delete items when unequipping andy 2020-10-06 22:36:02 -03:00
• 48abf4533f player can (un)equip things now andy 2020-10-06 21:35:20 -03:00
• a796c4f07b Merge pull request 'postgres' (#229) from postgres into master jake 2020-10-22 11:58:47 -04:00
• 40a1fdb236 fix tests jake 2020-10-22 09:43:45 -06:00
• ca38d60ff0 remove debug output jake 2020-10-22 08:57:07 -06:00
• 89c91e9397 add more fields to useraccount table jake 2020-10-22 08:56:37 -06:00
• 6d82751ed3 notes jake 2020-10-07 19:37:41 -06:00
• a2e4f348d9 add character options flags to postgres jake 2020-10-07 19:36:36 -06:00
• 00478912ee remove unused code jake 2020-10-06 23:47:48 -06:00
• 358f9f4c7f stray spaces jake 2020-10-06 23:43:55 -06:00
• 4caaee880a keep track of item slots without having 74894794793 inventory locations jake 2020-10-06 23:42:31 -06:00
• bfa3a93bd6 don't store fedtomag twice jake 2020-10-05 18:16:50 -06:00
• 64092eeddd delete old query jake 2020-10-03 22:31:34 -06:00
• a148d96adc slots need to be updated when an item leaves inventory jake 2020-10-03 22:30:31 -06:00
• 6de4b677ef fix setting item location jake 2020-10-03 20:20:11 -06:00
• c067ab444a properly select character items based on the latest location jake 2020-10-03 20:19:57 -06:00
• 0f7cbbf096 fix tests again jake 2020-10-03 20:12:11 -06:00
• fd6dc1fe5b fix tests jake 2020-10-03 20:07:55 -06:00
• 213d679e99 use postgres in main maybe jake 2020-10-03 17:31:02 -06:00
• 8ddbdda0a4 postgres! jake 2020-10-03 17:30:24 -06:00
• 4989ecaa7c formatting jake 2020-10-03 17:28:37 -06:00
• 412d4b8e81 Technique::from_value jake 2020-10-03 17:28:17 -06:00
• cd1c30c8eb handle error jake 2020-10-03 17:27:48 -06:00
• 032b2921f0 fix mag pbs jake 2020-10-03 17:23:56 -06:00
• 89f3091099 make save_user_settings async jake 2020-10-03 17:23:39 -06:00
• d8c6dd817e add derives to item structs, make some things public jake 2020-10-03 17:14:28 -06:00
• 17a8b288c1 change banned from bool to timestamp jake 2020-10-03 17:13:29 -06:00
• aa08e67f6b Merge pull request 'save_options' (#225) from save_options into master jake 2020-10-07 21:22:59 -04:00
• 1cdef4cea7 fixing more conflicts?? andy 2020-10-03 00:12:18 -03:00
• 046ca492a8 add a test andy 2020-10-03 00:10:36 -03:00
• 114ed07adc tests! andy 2020-10-02 22:17:00 -03:00
• db23a9794e options saved to character! andy 2020-10-02 21:24:32 -03:00
• e6dd3326d2 Merge pull request 'full char data packet' (#222) from fullchar into master jake 2020-10-02 20:58:18 -04:00
• 62e5a966f6 options saved to character! andy 2020-10-02 21:24:32 -03:00
• 4434c42eaa full char data packet jake 2020-10-01 16:58:16 -06:00
• 355c3e9c1b Merge pull request 'shops' (#219) from shops into master jake 2020-09-28 01:13:59 -04:00
• cebb6a5f31 handle case where items are removed from shop after buying jake 2020-09-27 20:30:37 -06:00
• d08db622e2 shops! jake 2020-09-27 18:16:27 -06:00
• 7028f91187 latest nightly works again jake 2020-09-27 18:09:03 -06:00
• 64040d55a2 and another! jake 2020-09-27 18:05:23 -06:00
• 32d30d38ec off by one errors sure are nice jake 2020-09-27 17:47:21 -06:00
• e387bfafba looks like the shop item list length still exists jake 2020-09-25 18:16:08 -06:00
• b94dcb62d0 tool shop pricing jake 2020-09-23 21:49:33 -06:00
• 1e18d5729b default to high price rather than zero jake 2020-09-23 21:41:15 -06:00