mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,724 Commits 3 Branches 36 Tags 131 MiB
Commit Graph

443 Commits

Author SHA1 Message Date
briaguya 43cde7eccd
Merge pull request #1467 from HarbourMasters/develop-zhora 
zhora -> rando-next (pdb for crash handler)
 2022-09-13 11:37:14 -04:00
Kenix3 a2d4f4766d
Fixes crash handler for jenkins builds. (#1445) 
* Fixes crash handler for jenkins builds.

We must include the pdb in redistributables.

* Properly selects PDB file path for inclusion

Co-authored-by: Christopher Leggett <chris@leggett.dev>
 2022-09-11 23:15:10 -04:00
briaguya 19b8e12933
Merge pull request #1449 from HarbourMasters/develop-zhora 
zhora -> rando-next
 2022-09-09 00:16:36 -04:00
Kenix3 4cda92462a
Lowers severity of resource manager logging. 2022-09-08 20:25:44 -04:00
louist103 4d81c28738
boxes (#1428) 2022-09-08 19:05:16 -04:00
aMannus fe413fd675 Set key colors to be on by default 2022-09-04 23:09:17 +02:00
Garrett Cox 77a5d03019 Hook into file delete and clear notes 2022-09-03 15:46:33 -05:00
Garrett Cox 8be6f6e441 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into item-tracker-notes 2022-09-03 09:19:14 -05:00
Garrett Cox ed8966054c Persist item tracker notes 2022-09-03 09:15:05 -05:00
briaguya 975a854054 Merge branch 'develop-zhora' into z-to-rando-next 2022-09-03 03:47:09 -04:00
Ada b14fb37b81 Update libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp 
Co-authored-by: David Chavez <david@dcvz.io>
 2022-09-03 01:33:24 -04:00
Ada edb5261b07 Fixes ToT Fog 2022-09-03 01:33:24 -04:00
louist103 8118947ab0
Windows crash handler. (#1383) 
* Windows crash handler.

* Fix naming convention.
 2022-09-03 01:15:43 -04:00
David Chavez 0ce0ab1260
Phase 1: Separate ImGui Drawing From LUS (#1310) 
* Update LUS imported paths

* Introduce GameMenuBar

* Fix imports after LUS import paths change

* Move Randomizer

* Replace needs_save

* Migrate Developer Tools

* Migrate Cheats

* Migrate Enhancements

* Separate UIWidgets

* Add missing Hooks.cpp file

* Migrate Settings

* Remove UI methods from LUS

* Cleanup imports and exposed properties

* Cleanup more methods

* Fix project generation

* Fix CI compilation

* Remove resolved TODO
 2022-09-03 00:00:04 -04:00
briaguya 5a009590fc Merge remote-tracking branch 'origin/develop-zhora' into ztorn 2022-09-01 12:06:25 -04:00
louist103 584a4ad818
Linux crash handler (#1209) 
* crash handler linux

* cleanups

* missing underscore

* more cleanups

* cleanups

* 32 bit
 2022-08-31 22:59:38 -04:00
Christopher Leggett b9aee7085e
Adds note to key colors enhancement about this change. 2022-08-29 19:12:19 -04:00
briaguya 4919bddda2 Merge branch 'develop-zhora' into ztorn 2022-08-25 16:08:16 -04:00
aMannus 7de2c584b4 Rando menu tweaks 2022-08-25 11:11:24 +02:00
Kenix3 80863fc7f2 Moves class member functions from headers to compilation units. 2022-08-24 23:06:23 -04:00
briaguya d2fe83edf4
Merge pull request #1295 from HarbourMasters/develop-zhora 
quick zhora -> rando-next
 2022-08-24 19:47:26 -04:00
Baoulettes c0b9171f98
Cosmetics Editor Fixes (#1287) 2022-08-25 01:28:27 +02:00
Christopher Leggett ecd0e3e8bb
Merge branch 'rando-next' of github.com:HarbourMasters/Shipwright into color-coded-keys 2022-08-24 13:03:44 -04:00
aMannus bfc524c6ef Merge fix, tooltip tweak 2022-08-24 15:57:54 +02:00
aMannus 0e288fc55d Merge branch 'rando-next' into rando-rupee-names 2022-08-24 15:51:02 +02:00
Christopher Leggett e3ae302a64
Adds padding to a few checkboxes in rando menu that were missing it 2022-08-24 00:17:47 -04:00
Christopher Leggett 855147b265
Merge branch 'rando-next' into color-coded-keys 2022-08-24 00:17:37 -04:00
Christopher Leggett 6561073c7b
Implements ImGui Checkbox to enable or disable color-coded-keys. 2022-08-24 00:07:16 -04:00
briaguya e7cd2fd649
Merge pull request #1087 from Sarge-117/rando-navi-tips 
Rando navi tips
 2022-08-23 21:53:34 -04:00
briaguya 133cbcd6c8 Merge branch 'develop-zhora' into z-to-rn 2022-08-23 21:05:35 -04:00
Kenix3 0573a1b2ac Adds const to DirtyDirectory std::string 2022-08-23 20:38:22 -04:00
Kenix3 b774252f0c ResourceMgr now decreases priority of load messages to trace. 2022-08-23 20:38:22 -04:00
Kenix3 3792b03a7d Cleans up InputEditor class. 2022-08-23 20:38:22 -04:00
Jake Edvenson 927ffd0b8b
Enhancement: Scarecrow song skip (#1183) 
* Added Skip Scarecrow Song

Added in the option for if the user has the time saver for Scarecrow song enabled and has their Ocarina pulled out in range of Pierre.
Added Skip Scarecrow Song
New enhancement under time-savers that allows the user to only pull out their ocarina to summon Pierre.

* Added Default for Scarecrow summon

The scarecrow summon option now defaults to 0 and can be turned on individually. I haven't included it in any other presets so people don't feel like they're cheating.

* Checks if scarecrow song is in possession

* Fixed positional Scarecrow logic

* Fixed style
 2022-08-23 20:30:06 -04:00
Baoulettes d6ebce068d
fixes only (#1255) 2022-08-23 20:20:56 -04:00
Sarge-117 45873ba71d Add CVar + Cvar check 
Defaults to "1"
 2022-08-23 17:16:19 -07:00
lilDavid 4680641514
Add bombchu drops (#1257) 
* Add bombchu drops

* Force 3D bombchu drops

* Move bombchu drop conditions for better clarity

* Fix grouping on chu drop condition
 2022-08-23 20:14:17 -04:00
aMannus ca08680a12
Add: Ability to disable ImGui checkboxes (#1272) 
* Added ability to disable checkboxes

* Renamed args, added disabledGraphic option

* Moved checkbox out of ImGui source
 2022-08-23 20:13:15 -04:00
David Chavez 70d7d66d0c
Add multiviewport support for SDL (#1275) 2022-08-23 20:12:40 -04:00
th-2021 ed1708508a
add SHIP_HOME (Linux) (#1210) 2022-08-23 22:29:28 +02:00
aMannus 35fefdecb0 Changed CVar name 2022-08-23 09:45:40 +02:00
aMannus d0f8374c4c Changed checkbox to default to on, invert logic 2022-08-23 09:42:32 +02:00
Christopher Leggett e12e1d67c6
Prevents optimizations for debug configuration on Windows. (#1270) 2022-08-23 09:32:49 +02:00
louist103 eed3942b81
Restore Gold skulltula CS from the "0.9" version (#1217) 
* GS CS

* add to defaults
 2022-08-21 22:11:23 -04:00
Kenix3 51e4485966
LUS Cleanup: Merge Window and GlobalCtx2 classes. (#1259) 
* Merges GlobalCtx2 and Window classes.

* Includes condition variable in File.

* add mac specific include

* sstream to get past "implicit instantiation of undefined template" error

* switch/wiiu includes

* that file doesn't exist

* more wii u globalctx2 stuff

Co-authored-by: briaguya <briaguya@alice>
 2022-08-21 21:08:01 -04:00
Christopher Leggett cec1c7dc07
Merge branch 'get-item-rework' into get-item-rework-rando-next 2022-08-19 20:06:39 -04:00
briaguya 0971b9aa78
only toggle menu with controller when controller nav enabled (#1043) 2022-08-19 15:46:11 +02:00
aMannus 1c785560c4 Changed tooltip 2022-08-19 14:49:30 +02:00
aMannus a2243634cd Rand(), option to disable, attempted fix special chars 2022-08-18 11:54:02 +02:00
GaryOderNichts f4c1332159 Fix Wii U stick input 2022-08-17 17:27:33 +02:00