mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-25 09:45:02 +00:00
b95643b397
* 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>
58 lines
705 B
Text
58 lines
705 B
Text
# Cache files
|
|
__pycache__/
|
|
.pyc
|
|
.DS_Store
|
|
|
|
# Text editor remnants
|
|
.vscode/
|
|
.vs/
|
|
.idea/
|
|
CMakeLists.txt
|
|
cmake-build-debug
|
|
venv/
|
|
|
|
# Project-specific ignores
|
|
build/
|
|
expected/
|
|
notes/
|
|
baserom/
|
|
docs/doxygen/
|
|
*.elf
|
|
*.sra
|
|
*.z64
|
|
*.n64
|
|
*.v64
|
|
*.map
|
|
*.dump
|
|
out.txt
|
|
|
|
# Tool artifacts
|
|
tools/mipspro7.2_compiler/
|
|
tools/overlayhelpers/batchdisasm/output/*
|
|
tools/overlayhelpers/batchdisasm/output2/*
|
|
tools/overlayhelpers/batchdisasm/mipsdisasm/*
|
|
tools/disasm/output/*
|
|
tools/asmsplitter/asm/*
|
|
tools/asmsplitter/c/*
|
|
ctx.c
|
|
tools/*dSYM/
|
|
|
|
# Assets
|
|
*.rgba32.png
|
|
*.rgb5a1.png
|
|
*.i4.png
|
|
*.i8.png
|
|
*.ia4.png
|
|
*.ia8.png
|
|
*.ia16.png
|
|
*.ci4.png
|
|
*.ci8.png
|
|
*.mdli
|
|
*.anmi
|
|
*.obj
|
|
*.mtl
|
|
*.fbx
|
|
!*_custom*
|
|
|
|
# Per-user configuration
|
|
.python-version
|