1392 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Garrett Cox	341ac29fa5	Various tweaks, added button combo and re-added notes	2022-08-20 14:36:38 -05:00
Sarge-117	3adb17c55d	Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips	2022-08-20 11:23:10 -07:00
Sarge-117	ccce87cb89	Change int to u8 ... Jenkins plz	2022-08-20 11:16:46 -07:00
briaguya	9c92139eca	Merge pull request #1265 from leggettc18/frog-hint-fix ... Adds Frog Reward hints from 3dsrando.	2022-08-20 13:52:45 -04:00
Christopher Leggett	4f2f72b941	Adds Frog Reward hints from 3dsrando. ... Fixes the intermittent crash when generating a seed rando-next started having.	2022-08-20 13:07:53 -04:00
Sarge-117	6fc3c8cf77	Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips	2022-08-20 00:13:56 -07:00
Christopher Leggett	2c410a5857	Fixes ice traps again.	2022-08-19 21:42:59 -04:00
Christopher Leggett	cec1c7dc07	Merge branch 'get-item-rework' into get-item-rework-rando-next	2022-08-19 20:06:39 -04:00
Christopher Leggett	a2a8832a35	Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into get-item-rework-rando-next	2022-08-19 20:06:15 -04:00
briaguya	ad8179287e	Fix controller nav on WiiU (#1258) ... Co-authored-by: briaguya <briaguya@alice>	2022-08-20 02:03:28 +02:00
Christopher Leggett	a67c6b9e67	Fixes vanilla ice traps and randomized ice smoke	2022-08-19 19:36:44 -04:00
Christopher Leggett	4e2707aefc	Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework	2022-08-19 18:51:00 -04:00
briaguya	28bbaf6c45	Merge pull request #1249 from briaguya-ai/exclude-all-locations ... add ability to exclude any location	2022-08-19 16:44:24 -04:00
Garrett Cox	02049fb9e1	Another big push, mostly done	2022-08-19 14:38:12 -05:00
briaguya	708c9a00f4	formatting cleanup	2022-08-19 13:18:48 -04:00
briaguya	1c52b58917	remove var leftover from debugging	2022-08-19 13:17:05 -04:00
briaguya	3b951efac2	rename columns, use excluded locations	2022-08-19 12:54:27 -04:00
briaguya	c1455cedea	fix broken seed parsing	2022-08-19 10:56:26 -04:00
briaguya	db7e1bf332	trying to figure stuff out	2022-08-19 10:36:54 -04:00
briaguya	0971b9aa78	only toggle menu with controller when controller nav enabled (#1043)	2022-08-19 15:46:11 +02:00
briaguya	0eee085981	save/load locations to a string cvar	2022-08-19 09:30:17 -04:00
aMannus	1c785560c4	Changed tooltip	2022-08-19 14:49:30 +02:00
aMannus	1ff006fa9e	Fixed newline	2022-08-19 14:45:55 +02:00
aMannus	596d4cd392	More names	2022-08-19 14:45:18 +02:00
aMannus	7639c0f2ed	Moved code to randomizer.cpp, fixes special chars	2022-08-19 14:41:20 +02:00
briaguya	815f5a9101	don't filter on right	2022-08-19 06:38:39 -04:00
briaguya	f818380079	fix performance issues	2022-08-19 06:30:52 -04:00
Garrett Cox	252f5fe68a	Initial work towards cleaning up item tracker	2022-08-19 03:59:06 -05:00
briaguya	7f62d00200	fix double scrollbar issue	2022-08-19 04:53:35 -04:00
Sarge-117	64b7dac91b	Merge remote-tracking branch 'upstream/rando-next' into rando-navi-tips	2022-08-18 22:13:51 -07:00
Christopher Leggett	3db2ce7085	Updates Zora's Sapphire Cutscene to use GetItemEntry	2022-08-18 22:06:28 -04:00
Christopher Leggett	35c2781efb	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next	2022-08-18 21:49:45 -04:00
briaguya	11a8dc85ee	filter on one side, trees on both	2022-08-18 15:50:25 -04:00
briaguya	fb3320c3ed	use macro for rco	2022-08-18 15:15:34 -04:00
briaguya	7fdb194dad	refactor location visibility filtering	2022-08-18 14:11:22 -04:00
qurious-pixel	9bc6aac81e	MacOS OTR (#973)	2022-08-18 19:40:41 +02:00
briaguya	dd9acbbb43	use ordered map to help arrange checks in imgui	2022-08-18 12:19:57 -04:00
briaguya	5ac69e0bd8	start filtering	2022-08-18 08:48:24 -04:00
briaguya	dbb4e3eefc	start on tree view	2022-08-18 08:20:52 -04:00
briaguya	3816ed11a4	add area names, fix kak bazaar	2022-08-18 08:20:35 -04:00
aMannus	e500db810b	Code cleanup + more names	2022-08-18 13:55:59 +02:00
briaguya	a7d4aa8042	add areas to rcos	2022-08-18 07:37:24 -04:00
briaguya	289a6e5a82	start on RC object stuff	2022-08-18 06:15:02 -04:00
aMannus	a2243634cd	Rand(), option to disable, attempted fix special chars	2022-08-18 11:54:02 +02:00
aMannus	3a438d9d5a	Merge pull request #4 from PurpleHato/rando-rupee-baguette ... ADD: Baguette money	2022-08-18 09:53:15 +02:00
briaguya	2e9cb4c426	Merge pull request #1246 from leggettc18/ruto-sapphire-fix ... Replaces Zora's Sapphire with JabuJabu's Dungeon Reward.	2022-08-18 03:52:06 -04:00
Sarge-117	bb6135fd2b	Spacing	2022-08-17 22:07:51 -07:00
Christopher Leggett	7ee281182a	Replaces Zora's Sapphire with JabuJabu's Dungeon Reward. ... Repalces the model for Zora's Sapphire with the Dungeon Reward for JabuJabu's Belly when you find it in the miniboss room.	2022-08-17 21:43:52 -04:00
PurpleHato	a1cc0da6d3	TWEAK: Forgot the array size	2022-08-18 00:39:15 +02:00
PurpleHato	cca32b7a43	ADD: Baguette money	2022-08-18 00:35:54 +02:00