Tree: 612c089833

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

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '612c089833'

${ noResults }

Commit Graph

784 Commits (612c089833d1669438fbbe30e6494e0e5aa63143)

 

All Branches   

Search

Author	SHA1	Message	Date
jake	612c089833	Merge pull request 'rare_monsters' (#60) from rare_monsters into master continuous-integration/drone/push Build is passing Details Reviewed-on: #60	3 years ago
jake	27fcfcc1cc	Merge branch 'master' into rare_monsters continuous-integration/drone/pr Build is passing Details continuous-integration/drone/push Build is passing Details	3 years ago
jake	26a2ef6492	Merge pull request 'TRADING YEAH LETS GO' (#80) from trading into master continuous-integration/drone/push Build is passing Details Reviewed-on: #80	3 years ago
jake	a6e50555de	appease the clip continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	3 years ago
jake	22f630f562	properly set item_id after a trade serverside continuous-integration/drone/push Build is failing Details continuous-integration/drone/pr Build is failing Details	3 years ago
jake	81916d1f57	TRADING JUST IN TIME TO BARELY MISS XMAS continuous-integration/drone/push Build is failing Details continuous-integration/drone/pr Build is failing Details	3 years ago
jake	ecf1f23c6c	fix tests continuous-integration/drone/push Build is failing Details	3 years ago
jake	9c34baeb26	meseta refactor continuous-integration/drone/push Build is failing Details	3 years ago
jake	72d72801e1	trade meseta continuous-integration/drone/push Build is failing Details	3 years ago
jake	3a10de502a	tell other players you don't have meseta when you drop it continuous-integration/drone/push Build is failing Details	3 years ago
jake	872794e45f	improve error messages continuous-integration/drone/push Build is failing Details	3 years ago
jake	6bd341cd01	check inventory has enough space to accept traded items	3 years ago
jake	6d2753d082	improve error display a bit continuous-integration/drone/push Build is failing Details	3 years ago
jake	3b7dcd0295	remove printlns	3 years ago
jake	71ba3c3c3d	forgot to add this migration continuous-integration/drone/push Build is failing Details	3 years ago
jake	b3b6dad6ad	trades!	3 years ago
jake	5d410f88f3	PartialEq LocalClientId u8	3 years ago
jake	3865caba8d	refcell room id counter	3 years ago
jake	d85ada945e	add some functions to Inventory	3 years ago
jake	070735edbf	ItemDetail::tool	3 years ago
jake	d4fc915164	add debug to characterentity	3 years ago
jake	c90c7c1fd3	update anyhow	3 years ago
jake	8b87bd8d7b	fix mag item data continuous-integration/drone/push Build is failing Details	3 years ago
jake	82ef5ba2ea	RIP ItemLocation continuous-integration/drone/push Build is failing Details fun while it lasted ItemLocation ceased to be the canonical place to store an item's location. replaced with ItemNote which basically covers the actual use case but without the enforcing of a location.	3 years ago
jake	b80f30ef9d	initial actual trading logic continuous-integration/drone/push Build is failing Details	3 years ago
jake	98260308e8	stray spaces	3 years ago
jake	8e82d6c4b4	convert item pickup to new itemtransaction model continuous-integration/drone/push Build is failing Details	3 years ago
jake	d80d0fb01d	add some functions to Inventory	3 years ago
jake	ddff55d09e	add another item pickup test continuous-integration/drone/push Build is failing Details	3 years ago
jake	ac423fa6ba	change trade structure in clientstate	3 years ago
jake	8a29a75397	remove TODO	3 years ago
jake	6ed0d838d2	add gateway function set_character_meseta continuous-integration/drone/push Build is failing Details	3 years ago
jake	296d1cc0ea	InventoryItem::{stacked, mag}	3 years ago
jake	dbb1105741	cleanup	3 years ago
jake	21df9a9340	itemtransaction action takes boxed value continuous-integration/drone/push Build is failing Details	3 years ago
jake	42eb875f8f	split create_item into individual and stacked variants	3 years ago
jake	a2566c8bc7	Merge pull request 'room_join_requirements' (#49) from room_join_requirements into master continuous-integration/drone/push Build is failing Details Reviewed-on: #49 Reviewed-by: jake <jake@sharnoth.com>	3 years ago
jake	b374b63cba	nth(0) -> next()	3 years ago
jake	70a6764360	make these a bit more public for tests	3 years ago
jake	55f82b9fce	trace -> info	3 years ago
jake	143ed7ed78	add ItemTransaction struct as begining of item refactor v3	3 years ago
jake	9b78d7ed80	add some Defaults	3 years ago
jake	91d381a2e2	this fixed a thing probably	3 years ago
jake	0d30df8da6	start of trading	4 years ago
jake	571bab2534	print send buffers	4 years ago
jake	d1995a6d67	Merge pull request 'update bcrypt' (#64) from update_bcrypt into master continuous-integration/drone/push Build is passing Details Reviewed-on: #64	3 years ago
jake	9cfb3dd87b	update bcrypt continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	3 years ago
andy	899527d3e7	basic test continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details	3 years ago
andy	00cff46077	oops forgot to delete this continuous-integration/drone/push Build is passing Details	3 years ago
andy	3faca14883	andy vs. clippy round 4 and some cleanup continuous-integration/drone/push Build is passing Details	3 years ago