601 Commits

Author SHA1 Message Date
72141ace2c remove unneeded warnings 2020-11-01 18:06:00 -07:00
e8fd37e32d save_item -> change_item, impl for postgres 2020-11-01 18:06:00 -07:00
ce3e58d459 remove unwraps in ship on_disconnect 2020-11-01 18:06:00 -07:00
498cf4ef43 remove panic when failing to load a battle param 2020-11-01 18:06:00 -07:00
83e6c9cf30 remove unused files 2020-11-01 18:06:00 -07:00
29c5f88427 Merge pull request 'sorting_items' (#245) from sorting_items into master 2020-11-01 19:41:51 -05:00
34cf660cbd dont make new inventory 2020-11-01 19:54:50 -04:00
e08c582f17 fix test after rebase 2020-10-31 23:53:06 -03:00
ead1752978 rebase and remove unneeded function 2020-10-31 23:14:15 -03:00
51240a31e3 rename test file 2020-10-31 23:11:46 -03:00
6d4f5ae8f6 enumerate after filtering and add test 2020-10-31 23:11:45 -03:00
fd1e3697fc sorting test. need to rename the test file 2020-10-31 23:11:45 -03:00
andy
45d9b82598 sort items packets and dont equip multiple items in main it's confusing 2020-10-31 23:11:45 -03:00
1b9eafeaa9 Merge pull request 'split_bins' (#243) from split_bins into master 2020-10-31 00:15:08 -04:00
586eb28c49 fix tests 2020-10-30 21:43:54 -06:00
ad612615c7 rebases are hard 2020-10-30 21:27:00 -06:00
b517fb561c fix some things 2020-10-30 21:25:29 -06:00
164a8a1ad8 disable duplicate account checking since its super bugged 2020-10-30 21:25:29 -06:00
bacf309978 on_connect/on_disconnect return results 2020-10-30 21:25:29 -06:00
99cc651fd9 add enumiter to item types 2020-10-30 21:25:29 -06:00
66d25ed155 fix name shadowing 2020-10-30 21:25:29 -06:00
cae89cd2ac get_items_by_character takes character id not character entity 2020-10-30 21:25:29 -06:00
01fe0931b1 make itementity serializable 2020-10-30 21:25:29 -06:00
c802bceb3c prevent double logins 2020-10-30 21:25:29 -06:00
05596cec4f change serverstate on_connect and on_disconnect to async 2020-10-30 21:25:29 -06:00
a02cb57825 remove ship from shiplist when it disconnects 2020-10-30 21:25:29 -06:00
b249a3fed5 fix inventory slot and stacked items 2020-10-30 21:25:29 -06:00
a14aee4e29 handle unactivated accounts in the correct spot 2020-10-30 21:25:29 -06:00
b3e0674ca5 fix more tests + fix warnings 2020-10-30 21:25:27 -06:00
174445c175 properly load techs 2020-10-30 21:24:02 -06:00
3543cc5b5a logging in login and ship 2020-10-30 21:24:02 -06:00
578e4c7cf8 properly handle disconnections in interserver connections 2020-10-30 21:24:02 -06:00
e3e5bff300 fix tests 2020-10-30 21:24:02 -06:00
1ac85b9a5c tell loginserv the ip of charserv 2020-10-30 21:24:02 -06:00
19e30f34e6 remote postgres dep and fix save_user function 2020-10-30 21:24:02 -06:00
0db9a73849 check if an account is activated before allowing a login 2020-10-30 21:24:02 -06:00
2351b31125 entitygateway uses results for its functions now 2020-10-30 21:23:59 -06:00
69374ea424 use sqlx for migrations 2020-10-30 21:23:33 -06:00
466195193d load patch config from env vars 2020-10-30 21:23:33 -06:00
29422eac51 I am dubm 2020-10-30 21:23:33 -06:00
7a831c35c4 add separate binaries for the server types 2020-10-30 21:23:33 -06:00
a50f1d58a4 Merge pull request 'equip_changes' (#241) from equip_changes into master
Reviewed-by: jake <jake@sharnoth.com>
2020-10-28 20:36:42 -04:00
a95bcf35c8 andypls 2020-10-28 20:15:00 -03:00
67e96d33db why did i shuffle this 2020-10-28 20:12:42 -03:00
f3608d99ad add armor_slot to postgres model for unit 2020-10-26 23:39:03 -03:00
f3e7599975 some comments and tests 2020-10-26 23:15:04 -03:00
e256423dfa remove comments and don't be canadian 2020-10-26 23:15:04 -03:00
790668f6f7 add unit armour slots. equip the unit into the right slot and save correctly 2020-10-26 23:15:03 -03:00
555171d11d server unequips units now. formatting and cleanup unuseds. fix merge conflict 2020-10-26 23:14:06 -03:00
be29c83bb9 check priest mind against dolphin drop 2020-10-26 23:05:26 -03:00