1031 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
morfin	97f7a202e1	testing	2023-01-07 17:14:48 -05:00
jake	dfd48e1496	Merge pull request 'use_item_jackolantern' (#124) from use_item_jackolantern into master ... Reviewed-on: #124	2022-10-22 17:14:03 -04:00
jake	4f8a75f9d7	cleanup	2022-10-22 14:12:38 -06:00
jake	fbab8fe5e8	cleanup errors	2022-10-22 14:05:38 -06:00
jake	dbf73acb8d	basic item use infra, with jackolanterns	2022-10-22 14:05:26 -06:00
jake	4c2fa8600a	missed some magcells, and apparently they stack	2022-10-22 14:01:04 -06:00
jake	db66019f2c	Merge pull request 'fix in lobby ship select' (#123) from fix_lobby_ship_select into master ... Reviewed-on: #123	2022-10-22 15:26:45 -04:00
jake	2483d2242b	fix character location rooms	2022-10-22 02:15:08 -06:00
jake	2959181873	cleanup	2022-10-20 18:38:08 -06:00
jake	38070c9dfd	simplify the return type of item tasks	2022-10-20 17:41:38 -06:00
jake	40046ae991	move around uses	2022-10-20 17:41:03 -06:00
jake	5c34612afe	oh I should probably await that	2022-10-20 15:06:03 -06:00
jake	0f876d25bb	well that was duplicated I guess	2022-10-20 15:03:46 -06:00
jake	e0e68b9ad7	impromptu db transaction refactor	2022-10-20 14:47:08 -06:00
jake	e6e080004f	fix in lobby ship select	2022-10-19 22:32:30 -06:00
jake	32dddfd9bd	Merge pull request 'holiday rappies (and other events)' (#122) from holidays into master ... Reviewed-on: #122	2022-10-19 22:28:26 -04:00
jake	d671a8ae42	map+flatten->flat_map	2022-10-19 19:14:54 -06:00
jake	6ced59a730	holidays! (with rappies)	2022-10-19 19:10:15 -06:00
jake	8700987986	actually this can be simplified	2022-10-19 17:41:04 -06:00
jake	ed9f951bca	cleanup rare enemy generation	2022-10-19 17:39:44 -06:00
jake	b42deeede1	print out sent packets	2022-10-19 17:26:18 -06:00
jake	6b9a45fb70	this isn't being used	2022-10-19 17:26:04 -06:00
jake	4a38d94dbb	more cleanup	2022-10-19 03:13:16 -06:00
jake	ad694b695e	Merge pull request 'fix the whole single mutex on the server state thing' (#121) from making_shipstate_clone into master ... Reviewed-on: #121	2022-10-18 23:50:44 -04:00
jake	6f0fa05e3b	add client.rs	2022-10-18 19:48:18 -06:00
jake	4dc814d244	forgot to remove local dev libpso	2022-10-18 19:27:40 -06:00
jake	192ff967e6	cleanup this refactored mess	2022-10-18 18:00:33 -06:00
jake	4b1ded6f7d	clean up new mainloop stuff	2022-10-18 16:26:08 -06:00
jake	9843274bd8	fix character server/interserver communication	2022-10-18 16:23:32 -06:00
jake	3a50cd7ba1	fix the standalone binaries	2022-10-18 16:21:45 -06:00
jake	fdce44cdd8	refactor the rest of the fucking code	2022-10-18 04:46:21 -06:00
jake	27931adb5a	clippy found some new problems	2022-09-18 21:05:48 -06:00
jake	58c26301bf	make ClientLocation Clone-able	2022-09-18 21:01:32 -06:00
jake	2d880d8cf0	Merge pull request 'make CharacterLevelTable a global const lookup table cause whynot' (#118) from global_leveltable into master ... Reviewed-on: #118	2022-08-02 22:38:02 -04:00
jake	36261663be	new rust version new clippy lints	2022-08-02 18:37:06 -06:00
jake	91a92870dc	use the correct structure this time	2022-08-02 12:00:49 -06:00
jake	1f5e94ccfb	make CharacterLevelTable a global const lookup table cause whynot	2022-08-02 00:08:55 -06:00
jake	bbc1919309	Merge pull request 'clone entitygateway more' (#117) from clone_gateway_more into master ... Reviewed-on: #117	2022-07-30 23:48:06 -04:00
jake	e5ff75e367	clippy	2022-07-30 20:16:07 -06:00
jake	16a4653360	pass EntityGateway clones rather than letting functions borrow	2022-07-30 15:02:55 -06:00
jake	d6c2e289ff	use async mutexes in inmemorygateway and reimplement inmemorygateway transactions	2022-07-30 14:33:22 -06:00
jake	c87b6e7fad	Merge pull request 'character playtime' (#116) from character_playtime into master ... Reviewed-on: #116	2022-07-28 23:53:19 -04:00
jake	4788f707ed	track character playtime	2022-07-28 20:31:55 -06:00
jake	7219481aa2	Merge pull request 'roominfo' (#112) from roominfo into master ... Reviewed-on: #112	2022-07-25 18:08:45 -04:00
andy	95b0760e6a	Merge branch 'master' into roominfo	2022-07-25 17:19:53 +00:00
andy	ee8c80f42f	rebasing onto the last refactor ever	2022-07-25 17:18:04 +00:00
andy	b80e308cf2	room tab info page 1	2022-07-25 16:43:42 +00:00
jake	0cd92fd4ac	put proper error strings on this struct	2022-07-25 16:42:22 +00:00
jake	286b728441	split actions into actions+tasks	2022-07-25 16:42:22 +00:00
jake	919d509c3a	move bank code out of state	2022-07-25 16:42:22 +00:00