 jake
|
cf7be2e5d0
|
Merge pull request 'fix mags and picking up invalid items' (#260) from misc_stuff into master
|
4 years ago |
|
jake
|
4b78a110f0
|
anyhow the rest of the itemmanager
|
4 years ago |
|
jake
|
463d623f16
|
fix tests
|
4 years ago |
|
jake
|
a3cc29b68f
|
use anyhow for itemmanager
|
4 years ago |
|
jake
|
f7c6be48b2
|
don't try and say an item was picked up that the client doesn't know about
|
4 years ago |
|
jake
|
9c91df6d2e
|
fix mags
|
4 years ago |
|
jake
|
a25d400624
|
Merge pull request 'techs' (#264) from techs into master
|
4 years ago |
 andy
|
9b05e60ca6
|
add todo for cheating
|
4 years ago |
|
andy
|
55c393b7a8
|
move the tech level adjustment to prevent underflow for new FOs. let characters use tech disks
|
4 years ago |
|
jake
|
99f5f4eb5f
|
Merge pull request 'professional rusting' (#257) from weapon_shop_ordering into master
|
4 years ago |
|
jake
|
71ca309ab4
|
Merge pull request 'mag a e s t h e t i c s' (#252) from mag_colours into master
|
4 years ago |
|
jake
|
30393edf20
|
Merge pull request 'save options to db' (#256) from save_options_pg into master
|
4 years ago |
|
andy
|
73f0108d68
|
save options to db
|
4 years ago |
|
andy
|
6611f2b3a8
|
professional rusting
|
4 years ago |
|
andy
|
fe1a85caec
|
mag a e s t h e t i c s
|
4 years ago |
|
jake
|
82c4c2a445
|
Merge pull request 'get_the_web_ui_working' (#251) from get_the_web_ui_working into master
|
4 years ago |
|
jake
|
c384b13453
|
actually save new character stuff
|
4 years ago |
|
jake
|
b34deba17f
|
update sqlx
|
4 years ago |
|
jake
|
4954dcb789
|
should probably split this since theres already live data
|
4 years ago |
|
jake
|
ceb632aec8
|
make equippedentity serializeable
|
4 years ago |
|
jake
|
c7a310391f
|
make inv mod pub
|
4 years ago |
|
jake
|
2d5f83fab6
|
make inv item stuff serializable
|
4 years ago |
|
jake
|
9de04ad87b
|
Merge pull request 'item_refactor' (#250) from item_refactor into master
|
4 years ago |
|
jake
|
8fae8d11af
|
fix equipping bought weapon
|
4 years ago |
|
jake
|
6e2fab31f0
|
e q u i p r e f a c t o r
|
4 years ago |
|
jake
|
10458baea0
|
shrink some structures, remove async from functions that didn't need it
|
4 years ago |
|
jake
|
8ebbbb272a
|
update some deps, remove unused ones
|
4 years ago |
|
jake
|
7ae8976c10
|
i t e m r e f a c t o r
|
4 years ago |
|
jake
|
898cb9064d
|
Merge pull request 'misc shit' (#246) from cleaning_up into master
|
4 years ago |
|
jake
|
87fa74ac1a
|
Merge pull request 'bank_meseta' (#247) from bank_meseta into master
|
4 years ago |
|
jake
|
3dd25c3222
|
merge conflict
|
4 years ago |
|
andy
|
7157074419
|
remove comments
|
4 years ago |
|
andy
|
e1360e4958
|
bank doesn't spawn infinite money!
|
4 years ago |
|
jake
|
73c24a5d20
|
cleanup
|
4 years ago |
|
jake
|
8717024694
|
move errors to anyhow to get backtraces
|
4 years ago |
|
jake
|
a3413083b6
|
add auth for interserver connections
|
4 years ago |
|
jake
|
3a095a928d
|
fix item ids not being set correctly
|
4 years ago |
|
jake
|
5e9a94081c
|
remove unwrap
|
4 years ago |
|
jake
|
72141ace2c
|
remove unneeded warnings
|
4 years ago |
|
jake
|
e8fd37e32d
|
save_item -> change_item, impl for postgres
|
4 years ago |
|
jake
|
ce3e58d459
|
remove unwraps in ship on_disconnect
|
4 years ago |
|
jake
|
498cf4ef43
|
remove panic when failing to load a battle param
|
4 years ago |
|
jake
|
83e6c9cf30
|
remove unused files
|
4 years ago |
|
jake
|
29c5f88427
|
Merge pull request 'sorting_items' (#245) from sorting_items into master
|
4 years ago |
|
andy
|
34cf660cbd
|
dont make new inventory
|
4 years ago |
|
andy
|
e08c582f17
|
fix test after rebase
|
4 years ago |
|
andy
|
ead1752978
|
rebase and remove unneeded function
|
4 years ago |
|
andy
|
51240a31e3
|
rename test file
|
4 years ago |
|
andy
|
6d4f5ae8f6
|
enumerate after filtering and add test
|
4 years ago |
|
andy
|
fd1e3697fc
|
sorting test. need to rename the test file
|
4 years ago |
