1
0
mirror of https://github.com/blawar/ooot.git synced 2024-06-30 16:29:55 +00:00
Commit Graph

1682 Commits

Author SHA1 Message Date
Bryan Kirk
3029e42cd1
Update .gitignore 2022-02-11 11:44:16 -05:00
Blake Warner
1daf897486
Merge pull request #120 from DaMarkov/fix-dampe
Fix Dampe not spawning
2022-02-11 09:19:01 -05:00
DaMarkov
c49a51237f Removed temp variable. 2022-02-11 15:15:21 +01:00
Blake Warner
408add97b7 fix endian issue #116 2022-02-11 09:07:56 -05:00
DaMarkov
9b22c8f830 Removed D_80AD8D24 to fix Dampe. 2022-02-11 14:02:31 +01:00
DaMarkov
d0fbee83d3 Re-enabled 4:3 aspect ratio for the correct scenes. 2022-02-11 11:58:57 +01:00
Blake Warner
25e84c0003 temp disabled prerendered 43 #113 2022-02-11 02:38:27 -05:00
Blake Warner
156722b5f7 fix ground texture in jabu jabus belly #114 2022-02-11 02:15:29 -05:00
Bryan Kirk
06a08e44ea Changed ordering of commands ran in setup.py to fix error message 2022-02-11 01:34:52 -05:00
Blake Warner
386145545e fixed day/night swap in z_select #111 2022-02-11 01:15:12 -05:00
Blake Warner
aaeb80f0cb sound timings working #108 #103 #82 #74 #43 #19 2022-02-11 00:59:26 -05:00
Blake Warner
3ad159855d moved segment marking into ZAPD 2022-02-11 00:00:50 -05:00
DaMarkov
f2e2b8c38a Removed a debug feature used to set skulltula.
This fixes issue #54.
2022-02-11 03:37:23 +01:00
Blake Warner
6dc4511c68 fixed collisions / hookshot #101 reverted ZAPD back to 64-bit 2022-02-10 20:46:50 -05:00
Blake Warner
27ab287584 fixed original undefined bug #81 2022-02-10 18:55:45 -05:00
DaMarkov
d71b6ce228 Also forced 4:3 aspect ratio for the temple of time outdoor scene. 2022-02-11 00:26:02 +01:00
DaMarkov
04beb5cc13
Merge pull request #109 from DaMarkov/background-force43
Force 4:3 for Prerendered Backgrounds
2022-02-10 23:59:03 +01:00
DaMarkov
76c80d00cd GLideN64 points now to the newest version (force aspect ratio 4:3 added). 2022-02-10 22:57:22 +01:00
DaMarkov
a94bf3a917 Added NO_LOAD_PROGRESS_DISPLAY to the preprocessor for GLideN64. 2022-02-10 22:34:10 +01:00
Blake Warner
eb4b640cf2
updated readme 2022-02-10 15:00:53 -05:00
GreenSwede
2c947b344e
F5 opens the debug level select screen (#106)
* F5 opens the debug level select screen

* Update keyboard.cpp
2022-02-10 13:46:46 -05:00
DaMarkov
ac9a9cc541 gfx_force_43() gets called when a new scene is loaded to tell GLideN64 to switch to 4:3 or back. 2022-02-10 19:02:13 +01:00
GreenSwede
bd6863e5de
Fix z_select strings (#105)
self-explanatory
2022-02-10 12:58:35 -05:00
Blake Warner
a2c90287d1
Merge pull request #104 from DaMarkov/beating-heart-fix
Beating Heart Fix
2022-02-10 09:44:26 -05:00
DaMarkov
ef8e89ba9b Rewrote func_800D2CEC to little endian 2022-02-10 15:35:42 +01:00
DaMarkov
ae3479a69d typo 2022-02-10 13:50:10 +01:00
DaMarkov
03b290243a Replaced the way the matrix is generated for the beating heart. 2022-02-10 13:23:18 +01:00
Blake Warner
c66adc3294 fix chest opening glow #36 2022-02-10 00:19:17 -05:00
DaMarkov
4b2ad84a88
Fixed the cursor in the pause menu. (#100)
And got rid of one THGA_Alloc

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-09 19:40:11 -05:00
Blake Warner
9ff2402db8 fixes triforce texture in temple of time #21 2022-02-09 18:21:42 -05:00
Blake Warner
a75f3f5eb2 more asset DLs 2022-02-09 18:20:16 -05:00
Blake Warner
92a90c3986 added some missing DL 2022-02-09 17:18:36 -05:00
DaMarkov
a4134c4412
Reduced the size of the arrays. (#99)
Thanks to mrneo240!
Also fixed another `gItemIcons` -> `gItemIconsCurrent` replacement.

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-09 15:44:55 -05:00
DaMarkov
bc9ef339a8
Rewrote the GrayOutTexture functions. (#98)
Added the array gItemIconsGray that holds all grayed out icons.
Added the array gItemIconsCurrent that points to either the original or grayed out icons.
Gray icons are generate at game start.

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-09 14:48:19 -05:00
Blake Warner
48d8b50ce4 bf 2022-02-09 12:30:30 -05:00
Blake Warner
3b122b510c fixes crash #94 #95 2022-02-09 09:51:35 -05:00
Blake Warner
306ce9158c bf 2022-02-09 08:05:15 -05:00
Blake Warner
5737d035a8 fix backwards compat with setup.py 2022-02-09 00:23:19 -05:00
DaMarkov
380f9aaf25
Fixed the grayed out (disabled) items in the pause menu. (#94)
KaleidoScope_GrayOutTextureRGBA32() expected an RGBA texture.
Rewrote the function for ABGR textures.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-08 22:56:17 -05:00
Blake Warner
49984bf064 GLideN64 update 2022-02-08 22:54:51 -05:00
DaMarkov
ac2b25f6a5
Framebuffer emulation (#92)
* Changed solution file so that GLidenN64 is also included as a project.
Set GLidenN64 as dependency of OOT.

* Added preliminary support for frame buffer emulation (FBE).
Added a text box and code the switch FBE on/off during gameplay.

* Added back a few vi* files from libultra.
Part of the implementation has already moved to ultra_reimplementation.cpp.

* Disabled the post-processing step in PreRender_Calc() to restore the pause menu.

* Moved the enable frame buffer emulation to pc_main, so that it can be deactivated without recompiling GLidenN64.
This will also make the updated GLidenN64 (with FBE) compatible with the old OOT (FBE disabled).

* Renamed func_80095248().

* Moved code from io/vi*.c into ultra_reimplementation.cpp.
And other code cleanup.

* Further cleanup. (idle.c, viconfig.c)

* Removed viconfig.c.
Changed the vi*.c files in libulta/io to the state they are in OOT master.

* Removed function from ultra_reimplementation.cpp that are not necessary.

* Reverted idle.c back to the state it's in master.
Further cleanup.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
Co-authored-by: DaMarkov <damarkov@gmail.com>
2022-02-08 21:09:53 -05:00
Hayden Kowalchuk
8185f70634 fix: link animation LUT added
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-08 20:20:10 -05:00
Hayden Kowalchuk
02a0769fc1 feat: small UB fixes
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-08 20:19:03 -05:00
Hayden Kowalchuk
59c1b2e2c9 fix: use length for ucode related
Signed-off-by: Blake Warner <blake@null3d.com>
2022-02-08 20:18:36 -05:00
DaMarkov
6682f10003
GLideN64 was not shut down correctly. (#91)
Added gfx_shutdown() at the end of main_func()

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-08 14:37:49 -05:00
DaMarkov
c5a0dc295c
GLideN64 in OOT solution (#90)
* Added project files for GLideN64 to vs/.
Added these to OOT.sln so that all projects can be build with a single build command.
Also marked GLideN64 as a dependency for OOT so that a change in GLideN64 causes a compilation of OOT.

* Renamed x86 to Win32 so that the 32 bit configuration becomes the default when opening the solution the first time.

* Updated README.

Co-authored-by: DaMarkov <DaMarkovZED@gmail,com>
2022-02-08 14:18:41 -05:00
Blake Warner
84ee29eff7
Merge pull request #89 from DaMarkov/update-gitignore
Updated .gitignore
2022-02-08 13:01:42 -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
DaMarkov
3d3d736160
Added SDL2 static lib (32 and 64 bit). (#87)
Changed OOT project file to link against the static lib of SDL2.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-08 11:16:25 -05:00
HungryBananaSalad
b39061af8d
Refactor setup_assets.bat into python; Add cleanup before build (#86)
Co-authored-by: HungryBananaSalad <>
2022-02-07 20:29:02 -05:00