260 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
andy	0a6f8ac95e	key_config -> keyboard_config	2022-05-01 11:08:35 -06:00
andy	8a9c4ceca4	controller -> gamepad for consistency with in-game	2022-05-01 11:08:35 -06:00
andy	a417b08e4e	joystick_config -> controller_config for consistency	2022-05-01 11:08:35 -06:00
andy	f8f5e8bdb5	move defaults from character.rs to settings.rs. rename key_config -> keyboard_config. rename joystick_config -> controller_config. fix packet sizes	2022-05-01 11:08:35 -06:00
andy	4ee5f38d7e	add controller config blob	2022-05-01 11:08:35 -06:00
andy	9d92d65046	keyboard config blob	2022-05-01 11:08:35 -06:00
jake	892d2ed220	Merge pull request 'add manual flag to RequestQuestList to know which quest npc we're talking to' (#18) from questlist into master ... Reviewed-on: #18	2022-02-11 19:02:22 -05:00
andy	178354c24c	add manual flag to RequestQuestList to know which quest npc we're talking to	2022-02-07 03:05:01 +00:00
jake	0bd4396bd1	Merge pull request 'trade request cancel' (#16) from trade_cancel into master ... Reviewed-on: #16	2021-12-27 02:45:24 -05:00
jake	1713c30bc4	trade request cancel	2021-12-27 00:46:15 -07:00
jake	7276b875c4	Merge pull request 'don't feed bytes to the void' (#15) from mobattack_flag into master ... Reviewed-on: #15	2021-12-19 18:19:42 -05:00
andy	bbd3c78329	don't feed bytes to the void	2021-12-17 05:17:47 +00:00
jake	fdd4aa916d	Merge pull request 'remove unknown trade state' (#14) from trade_unknown into master ... Reviewed-on: #14	2021-12-09 02:43:28 -05:00
jake	519344e9c4	remove unknown trade state	2021-12-09 00:41:13 -07:00
jake	564a1ce165	Merge pull request 'properly define TradeRequest' (#13) from traderequest into master ... Reviewed-on: #13	2021-12-02 03:42:54 -05:00
jake	e8ebbb8a4e	properly define TradeRequest	2021-12-02 01:43:35 -07:00
jake	315cfded37	Merge pull request 'fix tradesuccess flag thing' (#12) from tradesuccessful into master ... Reviewed-on: #12	2021-11-23 03:07:27 -05:00
jake	2bf0ec5257	fix tradesuccess flag thing	2021-11-23 01:08:26 -07:00
jake	9d11968ce6	Merge pull request 'tradesuccessful' (#11) from tradesuccessful into master ... Reviewed-on: #11	2021-11-23 02:58:44 -05:00
jake	32088d4762	tradesuccessful	2021-11-23 00:58:39 -07:00
jake	4da1e2f336	Merge pull request 'these features are stabilized now' (#10) from stabilized_features into master ... Reviewed-on: #10	2021-10-13 22:38:16 -04:00
jake	3212017511	these features are stabilized now	2021-10-13 20:37:37 -06:00
jake	8e87a8df3b	Merge pull request 'append null to avoid message artifacts' (#9) from small_dialog into master ... Reviewed-on: #9 Reviewed-by: jake <jake@sharnoth.com>	2021-06-22 22:14:25 -04:00
andy	faab6e8fd6	append null to avoid message artifacts	2021-06-22 23:22:41 +00:00
jake	90c990e632	Merge pull request 'Vec-ing is hard' (#6) from combo_targets into master ... Reviewed-on: #6	2021-06-21 18:36:07 -04:00
andy	a2822b17ae	Vec-ing is hard	2021-06-20 21:04:07 +00:00
jake	ad1dc584ab	Merge pull request 'traps' (#5) from traps into master ... Reviewed-on: #5 Reviewed-by: jake <jake@sharnoth.com>	2021-06-20 11:35:16 -04:00
andy	cd2af79091	why do i need to pull man	2021-06-20 04:29:06 +00:00
andy	43b37e985c	rebase - trap trigger packet	2021-06-20 04:22:01 +00:00
jake	69ddebdc45	Merge pull request 'pbs' (#2) from pbs into master ... Reviewed-on: #2	2021-06-20 00:16:24 -04:00
andy	505ec2188d	add to enum oops	2021-06-20 04:12:34 +00:00
andy	6e6c7c494f	shop_sell (#4) ... oops sold my 95h calibur Reviewed-on: #4 Co-authored-by: andy <andynewjack@protonmail.com> Co-committed-by: andy <andynewjack@protonmail.com>	2021-06-19 23:52:43 -04:00
andy	3f0f4886cb	shiny_mobs (#3) ... Reviewed-on: #3 Co-authored-by: andy <andynewjack@protonmail.com> Co-committed-by: andy <andynewjack@protonmail.com>	2021-06-19 23:51:54 -04:00
andy	e2c54986f7	rebasing still difficult in 2021	2021-06-20 02:24:01 +00:00
andy	2debc015b7	rebased	2021-06-20 01:00:38 +00:00
andy	e959fc3094	pb structs	2021-06-20 00:57:46 +00:00
jake	e698ad993c	Merge pull request 'techs' (#1) from techs into master ... Reviewed-on: #1	2021-06-19 00:25:04 -04:00
andy	65532db884	sloppy spacing	2021-06-17 21:07:49 +00:00
andy	dbfb396643	trap trigger packet	2021-05-30 05:41:53 +00:00
andy	799a9e6880	pb structs	2021-05-24 20:48:25 +00:00
andy	ef69b2064d	make the compiler happy	2021-05-23 21:22:48 +00:00
andy	77f657dbc0	dont forget to check this later	2021-05-23 20:55:22 +00:00
andy	cb219d807d	fix tech packet lengths. now everyone can get s/d yay	2021-05-23 20:54:35 +00:00
andy	2c00b5999a	telepipe owner	2021-05-23 19:16:43 +00:00
andy	68080eff4b	add telepipe struct	2021-05-23 19:10:31 +00:00
andy	a58191833f	random struct updates	2021-05-20 01:38:26 +00:00
andy	e02e3dff29	update tech packet struct, and some random comments	2021-05-15 23:29:06 +00:00
jake	a2ecb14d82	trade packets	2020-12-12 19:55:53 -07:00
jake	40845b7bd8	Merge pull request 'tekking' (#42) from tekking into master	2020-11-30 15:51:34 -05:00
jake	f71f463144	request ship/block list	2020-11-22 09:37:55 -07:00