1
0
mirror of https://github.com/blawar/ooot.git synced 2024-07-02 09:03:36 +00:00
Commit Graph

28 Commits

Author SHA1 Message Date
Blake Warner
691d542ba8 more high framerate fixes 2022-04-13 17:00:36 -04:00
Amaro Martínez
a659b766d2
Small fixes (#220)
* Add Release folder and some files to .gitignore

* Change working directory to the build one

Used for debugging.
2022-03-25 15:26:54 -04:00
Peter
54e23772c0 toggleable boot items 2022-03-12 20:32:41 +01:00
Blake Warner
97ecd0fc72 fixed bug with bad includes paths 2022-02-18 00:52:18 -05:00
DaMarkov
585f914941 Added missing SDL2 header files.
And changed .gitignore so that this doesn't happen again.
2022-02-17 13:08:30 +01:00
Blake Warner
6d4faff5a8 refactored z_player.h 2022-02-16 00:59:10 -05:00
DaMarkov
0dec26fce0
TAS support and input cleanup (#154)
* Cleaned up the input stuff.

* Put all the input related classes into the namespace `hid` and did some further cleanup.

* TAS support is now working.
Generates `last-run.tas`.

* Added *.tas to .gitignore.

* Put `hid` into namespace `oot`.

* Added a trivial form of compression for TAS files.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-15 17:16:29 -05:00
Bryan Kirk
3029e42cd1
Update .gitignore 2022-02-11 11:44:16 -05:00
DaMarkov
2fca773372 Updated .gitignore.
This now ignores z_kankyo_assets.h, z_message_PAL_assets.h, z_scene_assets.h, z_scene_table_assets.h, z_vr_box_assets.h.
OOT.vcxproj.user (created by Visual Studio).
.log and .sav files generated by OOT.exe.
2022-02-08 18:17:37 +01:00
Torphedo
39a03a96c9 Fix Windows build/extraction 2022-02-03 20:17:41 -05:00
john doe
1b4feced6a port merge 1 2022-01-31 19:05:17 -05:00
EllipticEllipsis
fd512f02e9
link_animetion xml, and ExternalFile config (#1011)
* Automatic XML for link_animetion

* Make sure tutorial images are not gitignored

* OK

* Correct ovl_Boss_Sst RangeEnd

* ExternalFiles

* Remove Segment="128"

* Remove segments from place_title_cards

* format, newlines, remove previous xml
2021-11-07 18:13:44 +01:00
Anghelo Carvajal
45012658d3
Track XML extraction time (#826)
* extracted-assets.json

* delete `.extracted-assets.json` in distclean

* Move `rm .extracted-assets.json` to `assetclean`
2021-05-26 19:40:48 -04:00
Anghelo Carvajal
5062f785fc
Add actorfixer.py ~~and graphovl.py~~; and a few improvements to extract_assets.py (#783)
* Only process touched files and abort the extraction if one file wasn't extracted properly

Signed-off-by: angie <angheloalf95@gmail.com>

* add actorfixer and graphovl

Signed-off-by: angie <angheloalf95@gmail.com>

* Re set execution permisions to diff.py

Signed-off-by: angie <angheloalf95@gmail.com>

* Add graphs/ to gitignore

Signed-off-by: angie <angheloalf95@gmail.com>

* Add looners flag to graphovl

Signed-off-by: angie <angheloalf95@gmail.com>

* Parse macros

Signed-off-by: angie <angheloalf95@gmail.com>

* cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* Add enum parser to graphovl

Signed-off-by: angie <angheloalf95@gmail.com>

* Remove redundant code

Signed-off-by: angie <angheloalf95@gmail.com>

* cleanup

Signed-off-by: angie <angheloalf95@gmail.com>

* Custom colors to graphovl!

* Select multiples styles for graphovl

* Add solarized light style

* Add renames of #796

* Add unaccounted warning flag

* remove graphovl

* git subrepo clone https://github.com/AngheloAlf/graphovl.git tools/graphovl

subrepo:
  subdir:   "tools/graphovl"
  merged:   "577e71592"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "577e71592"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* remove graphovl

* Add `graphovl/` to gitignore
2021-05-22 20:00:10 -04:00
Anghelo Carvajal
ea703138bb
Simplify PNGs rules in the makefile (#814)
* simplify rules

* update `-eh`
2021-05-15 14:14:51 -04:00
Anghelo Carvajal
fa5e785760
Add needed rules for prerenders extraction (#752)
* update makefile

Signed-off-by: Angie <angheloalf95@gmail.com>

* change jfif to jpg

Signed-off-by: angie <angheloalf95@gmail.com>
2021-04-03 00:07:29 +02:00
Nicholas Estelami
b95643b397
Updated Texture Asset Handling (#478)
* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Fixed newline issue with ZAPD

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Auto stash before rebase of "upstream/master"

* A large number of scenes have been decompiled.

* Fixed makefile

* Decompiled around 40 scenes.

* Removed old file

* Finished matching remaining scenes.

* Removed old commented out spec lines

* Decompiled a few object files.

* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.

* Updated texture and object file decomp

* Moved scenes/ into the assets/ folder

* Fixed a few compile errors

* Fixed merge issues.

* Fixed makefile merge error

* Fixed additional merge error

* Fixed several more merge issues

* Commented out gameplay_keep and sk2 extraction, since currently unused.

* Reenabled gameplay_keep extraction since it's used in the spec

* Fixed build error

* Removed test struct

* Fixed makefile error that would happen on fresh builds

* Fixed merge issue

* Removed relative paths

* Multithreading on extraction, spec uses numbers, few changes to XMLs

* Removed redundant code from the extract_assets script

* object_sk2 and object_spot09_obj OK

* object_spot11_obj OK

* object_spot17_obj OK

* Test: One of the gameplay_keep dlists given a proper symbol

* Updated asset symbol names based on new naming scheme

* XMLs use "Offset" instead of "Address" now

* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file

* Updated to use latest build of ZAPD

* Updated ZAPD again

* Updated ZAP to remove assimp dependency

* Jenkins Test: Added .gitkeep file

* Updated ZAP once more

* Updated png file name to comply with new naming scheme.

* Fixed bad include

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2020-12-26 06:39:52 -05:00
notyouraveragehooman
48f2e10bef
fix m2ctx incompatibility on MacOS (#354) 2020-09-02 07:13:21 -04:00
Ethan Roseman
d374d8d026
Various repo improvements (#316)
* Narrowing down ido5-required files, assist.py, permuter settings

* OSX support changes, +x on setup scripts

* ZAP2 Update for OSX

* Remove assist.py

* Removing ido 5 things
2020-08-15 14:08:53 -04:00
i82orbom
34c73dda62
Decompiles z_bg_ingate (#301)
* Decompiles z_bg_ingate

	* BgIngate_SetupAction
	* BgIngate_Init
	* BgIngate_Destroy
	* BgIngate_Update
	* func_80892990
	* func_80892890
	* BgIngate_Draw
Removes unused asm's
Formats z_bg_ingate.c

* Addresses PR comments

* Fixes usage of cutscene id instead of regular scene

* Addresses PR comments
2020-08-04 14:30:46 -04:00
Tharo
27d059b041
Configure Doxygen (#206)
* Configure Doxygen

* Clean up filter_global_asm.py

* Add documentation guide

* Fix small issue with markdown rendering

* Change @bug to lowercase in documenting guide

* Folder restructure, new logo

* Allow embedding LaTeX in doc comments, update Documenting guide

* Resize logo

* Change description to match new repo description, leave version number unspecified
2020-06-28 14:42:16 -04:00
Ethan Roseman
7c2072ee23
Improved mips_to_c context script (#214)
* Improved context script

* .gitignore
2020-06-18 21:12:58 -04:00
Roman971
9bb151006a
Add installation instructions to the README (+ minor improvements) (#100) 2020-04-30 21:47:42 -04:00
Ethan Roseman
f9bdb1d58a
Docker Support for OSX (#91)
* Makefile machinery work

* Updating Jenkinsfile

* Initial setup for OSX repo support

* Adding ido7 to repo

* Makefile reversion

* Iniital Dockerfile

* Docker stuff

* fixbaserom cleanup

* Attempting to fix fixbaserom

* baserom_original -> input

* Revert "baserom_original -> input"

This reverts commit d9199462b67473a74b451d35281c8650739b8866.

* Spiffing up readme for OSX
2020-04-24 20:34:00 -04:00
Jack Walker
3e74c33627 Added 'extract' target to makefile
Created a THANKS.md file for credits.
Updated checksum.md5 for a "vanilla" debug ROM
Added fixbaserom.py which automatically removes the overdump, byte swaps, and patches the ROM header.
2020-03-27 22:30:19 -04:00
mzxrules
dd4f67c3f5 convert z_debug.data 2020-03-18 12:31:36 -04:00
mzxrules
32fe030b42 new repo, OK++ 2020-03-18 10:27:49 -04:00
Jack Walker
087f561f77 First proper commit. 2020-03-17 00:31:30 -04:00