1194 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christopher Leggett	fc963cf44c	Merge branch 'get-item-rework' into get-item-rework-rando-next	2022-08-20 18:01:23 -04:00
Christopher Leggett	4dff1443a6	Fixes rendering of treasure chest game items.	2022-08-20 18:00:44 -04: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
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
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
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
briaguya	7f62d00200	fix double scrollbar issue	2022-08-19 04:53:35 -04: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
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
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
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
Kenix3	ad3efccb88	Merge pull request #1241 from GaryOderNichts/fix/wiiu-stick-input ... Fix Wii U stick input	2022-08-17 17:54:33 -04:00
Christopher Leggett	a51b844a23	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next	2022-08-17 15:43:42 -04:00
Christopher Leggett	914af77234	Fixes fanfare getItemId overlap	2022-08-17 12:23:39 -04:00
GaryOderNichts	f4c1332159	Fix Wii U stick input	2022-08-17 17:27:33 +02:00
briaguya	ae8c7cb509	add excluded locations set	2022-08-17 11:08:11 -04:00
briaguya	11cc040710	add rcs to itemlocations in 3drando	2022-08-17 10:45:33 -04:00
briaguya	5605542452	start playing with imgui filters	2022-08-17 09:03:27 -04:00
Christopher Leggett	525dcca499	Fixes some Sheik checks I had accidentally set the wrong flag for.	2022-08-17 01:07:28 -04:00
briaguya	c933d521c3	Merge pull request #1223 from leggettc18/rando-next-ganonbkhint-fix ... Fix Ganon's Boss Key hints for Keysanity	2022-08-17 00:09:26 -04:00
briaguya	03151647b1	Merge pull request #1227 from HarbourMasters/develop-zhora ... zhora -> rando-next	2022-08-16 23:59:11 -04:00
Kenix3	72981221ad	Merge pull request #1226 from HarbourMasters/develop-rachael ... rachael -> zhora	2022-08-16 23:40:06 -04:00
Kenix3	6723f4c7c2	Archive.createArchive error now passes in the error to SPDLOG.	2022-08-16 23:30:20 -04:00
Kenix3	f9621dcc17	Cleans up Window class.	2022-08-16 23:30:20 -04:00
Kenix3	10ce3c88fb	Remove TestApp from LUS	2022-08-16 23:30:20 -04:00
Christopher Leggett	b6d6ede520	Fixes color replacement from being saved to the save file. ... This was bad because replacing `%w` with `\x05\x00` was causing the string to prematurely terminate.	2022-08-16 23:04:14 -04:00
Kenix3	ea92a2e123	Makes data in OverlayCommand private.	2022-08-16 22:45:33 -04:00
Kenix3	b43eb2d0bd	Renames Camera Stick to Right Stick	2022-08-16 22:45:33 -04:00
Christopher Leggett	ecaf0fd87a	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into rando-next	2022-08-16 22:12:20 -04:00