711 Commits

Author SHA1 Message Date
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
6c33c7ec9b dont delete items when unequipping 2020-10-26 23:05:25 -03:00
48abf4533f player can (un)equip things now 2020-10-26 23:05:25 -03:00
a796c4f07b Merge pull request 'postgres' (#229) from postgres into master 2020-10-22 11:58:47 -04:00
40a1fdb236 fix tests 2020-10-22 09:43:45 -06:00
ca38d60ff0 remove debug output 2020-10-22 08:57:07 -06:00
89c91e9397 add more fields to useraccount table 2020-10-22 08:56:37 -06:00
6d82751ed3 notes 2020-10-07 19:37:41 -06:00
a2e4f348d9 add character options flags to postgres 2020-10-07 19:36:45 -06:00
00478912ee remove unused code 2020-10-07 19:24:46 -06:00
358f9f4c7f stray spaces 2020-10-07 19:24:46 -06:00
4caaee880a keep track of item slots without having 74894794793 inventory locations 2020-10-07 19:24:46 -06:00
bfa3a93bd6 don't store fedtomag twice 2020-10-07 19:24:46 -06:00
64092eeddd delete old query 2020-10-07 19:24:46 -06:00
a148d96adc slots need to be updated when an item leaves inventory 2020-10-07 19:24:46 -06:00
6de4b677ef fix setting item location 2020-10-07 19:24:46 -06:00
c067ab444a properly select character items based on the latest location 2020-10-07 19:24:46 -06:00
0f7cbbf096 fix tests again 2020-10-07 19:24:46 -06:00
fd6dc1fe5b fix tests 2020-10-07 19:24:46 -06:00
213d679e99 use postgres in main maybe 2020-10-07 19:24:46 -06:00
8ddbdda0a4 postgres! 2020-10-07 19:24:46 -06:00
4989ecaa7c formatting 2020-10-07 19:24:46 -06:00
412d4b8e81 Technique::from_value 2020-10-07 19:24:46 -06:00
cd1c30c8eb handle error 2020-10-07 19:24:46 -06:00
032b2921f0 fix mag pbs 2020-10-07 19:24:46 -06:00
89f3091099 make save_user_settings async 2020-10-07 19:24:46 -06:00
d8c6dd817e add derives to item structs, make some things public 2020-10-07 19:24:46 -06:00
17a8b288c1 change banned from bool to timestamp 2020-10-07 19:24:46 -06:00
aa08e67f6b Merge pull request 'save_options' (#225) from save_options into master
Reviewed-by: jake <jake@sharnoth.com>
2020-10-07 21:22:59 -04:00
1cdef4cea7 fixing more conflicts?? 2020-10-03 00:12:18 -03:00
046ca492a8 add a test 2020-10-03 00:10:36 -03:00
114ed07adc tests! 2020-10-02 22:41:53 -03:00
db23a9794e options saved to character! 2020-10-02 22:41:53 -03:00
e6dd3326d2 Merge pull request 'full char data packet' (#222) from fullchar into master 2020-10-02 20:58:18 -04:00
62e5a966f6 options saved to character! 2020-10-02 21:24:32 -03:00
4434c42eaa full char data packet 2020-10-01 16:58:16 -06:00
355c3e9c1b Merge pull request 'shops' (#219) from shops into master 2020-09-28 01:13:59 -04:00
cebb6a5f31 handle case where items are removed from shop after buying 2020-09-27 20:30:37 -06:00
d08db622e2 shops! 2020-09-27 18:16:27 -06:00
7028f91187 latest nightly works again 2020-09-27 18:09:03 -06:00
64040d55a2 and another! 2020-09-27 18:05:23 -06:00