 jake
|
92c34b2d28
|
remove modifiers from weapon and armor
|
4 years ago |
|
jake
|
fb6eaeffd2
|
remove change_item
|
4 years ago |
|
jake
|
c22b23ef03
|
Merge pull request 'interserver stuff and ship/block transfering' (#268) from one_day_i'll_have_useful_branch_names_again into master
|
4 years ago |
|
jake
|
11fecd5bda
|
fix tests that care about rooms
|
4 years ago |
|
jake
|
ae696888e9
|
remove player from lobby before sending to another ship/block
|
4 years ago |
|
jake
|
fe03515871
|
basic multiple login check
|
4 years ago |
|
jake
|
f96ae557fd
|
how did this ever work?
|
4 years ago |
|
jake
|
78ed2101e5
|
I forgot blocks are a thing
|
4 years ago |
|
jake
|
6f5aa5119f
|
login requests users from ship
|
4 years ago |
|
jake
|
5ca852260f
|
only 1 block actually exists
|
4 years ago |
|
jake
|
26be2757c9
|
add use
|
4 years ago |
|
jake
|
ffce662c95
|
transfer ship
|
4 years ago |
|
jake
|
ae7ba9e3fe
|
start on misc interserver things like player counts and ship lists
|
4 years ago |
|
jake
|
6686aee824
|
fix dumb thing
|
4 years ago |
|
jake
|
a3db5b65e2
|
add ability for servers to manually send messages to eachother
|
4 years ago |
|
jake
|
75260c40a0
|
improve error handling in new character
|
4 years ago |
|
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 |
