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
Blake Warner
5d48166b07 fps tweaks 2022-02-18 20:24:29 -05:00
Blake Warner
d9d8ae2fd6 bf 2022-02-18 18:20:06 -05:00
Blake Warner
7fdb2f2217 fixed widescreen items equip animation 2022-02-18 18:17:03 -05:00
Uwabami Wabberz
8c4243c54c
Fix crash when entering the third room in Jabu-Jabu. Thanks to @Zelllll (#164) 2022-02-18 16:26:40 -05:00
Blake Warner
379e64df67 bf debug main exiting 2022-02-18 16:07:15 -05:00
Blake Warner
9a6c098a68 remove old memory alloc code 2022-02-18 12:13:35 -05:00
Blake Warner
937fd3e6e6 vs proj cleanup (retail build works now) 2022-02-18 12:13:27 -05:00
DaMarkov
7c20a4bf14
Changed Color_RGBA8_u32 struct (#163)
* Changed `Color_RGBA8_u32` struct.

* Removed one color class and a replaced it with the correct one.

* Fixed the color issue in GfxPrint

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-18 11:02:08 -05:00
Zelllll
9a6359521c Fix crash on entering the castle garden during the day. 2022-02-18 07:46:33 -05:00
Blake Warner
97ecd0fc72 fixed bug with bad includes paths 2022-02-18 00:52:18 -05:00
Blake Warner
21fa4bacc6 bf 2022-02-18 00:09:37 -05:00
Zelllll
14d5c2c0fa zel's pal 1.0 retail support 2022-02-17 23:47:57 -05:00
Blake Warner
db1c218db6 refactored build system to support multiple roms 2022-02-17 22:03:25 -05:00
DaMarkov
aa63ccd57d Fixed compilation issue. 2022-02-17 15:55:21 +01:00
Blake Warner
f86a00802c
Merge pull request #160 from DaMarkov/rumble3
Add Rumble Support
2022-02-17 09:36:59 -05:00
Blake Warner
9cbff992d2
Merge branch 'master' into rumble3 2022-02-17 09:35:16 -05:00
Blake Warner
dbac66a040 fixed json button mapping loader 2022-02-17 09:12:25 -05:00
DaMarkov
25b04b02ca This commit contains all changes made in the rumble branch. 2022-02-17 14:40:45 +01:00
Blake Warner
e1def7bddd z_bg_spot16_bombstone documentation 2022-02-17 08:10:20 -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
DaMarkov
dee9178aa5 Updated SDL2 include files.
We were using SDL 2.0.20 with the SDL2 header files that came with GLideN64 (some older version of SDL2).
2022-02-17 01:31:06 +01:00
DaMarkov
36c6c419b2 Renamed a few variables. Got rid of one unused variable and an unused function. 2022-02-17 01:24:09 +01:00
DaMarkov
e40e5366db Merge branch 'master' of github.com:blawar/ooot 2022-02-17 00:03:28 +01:00
DaMarkov
582f32ba54 Tiny fix. 2022-02-17 00:03:08 +01:00
Blake Warner
1ab390a646 slight refactor 2022-02-16 17:54:09 -05:00
DaMarkov
5310f5b7d6 Fixed fread / fwrite mix-up. 2022-02-16 23:10:05 +01:00
Blake Warner
564bc4fb51
Merge pull request #157 from ajanhallinta/osSyncPrintf
fix osSyncPrintf crash
2022-02-16 10:53:31 -05:00
ajanhallinta
68607c5ffe comment out osSyncPrintf calls with globalCtx->state.frames parameter 2022-02-16 16:47:14 +02:00
Blake Warner
4440192b4c added more actor resets 2022-02-16 05:07:40 -05:00
Blake Warner
0cfb48dff4 fixed windmill respawning #134 2022-02-16 03:00:06 -05:00
Blake Warner
eca7134d8f fixed saria loading in intro cutscene #118 2022-02-16 02:07:19 -05:00
Blake Warner
2215778c69 added actor reset callback #131 #122 #124 #134 #135 2022-02-16 00:59:13 -05:00
Blake Warner
6d4faff5a8 refactored z_player.h 2022-02-16 00:59:10 -05:00
Blake Warner
50e237f5be small tweak 2022-02-16 00:58:27 -05:00
DaMarkov
cedd0dcd50 Fixed the seed for the RNG to stop TAS from desyncing. 2022-02-16 02:28:38 +01:00
DaMarkov
63e415c816
Added Command Line Arguments (#156)
* 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.

* End of TAS playback results in end of execution.
Added command line arguments:
-tas <filename> Selects the TAS file that should be played back
-no-graphics Disabled graphics. The window is still open though
-fast-forward Disables frame pacing, makes the game run as fast as possible

* Window now doesn't open anymore when -no-graphics is provided.
However, to make GLideN64 not crash a patch is required (PR for GLideN64 incoming).

* Cleanup.

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-15 19:09:11 -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
DaMarkov
418dd1b650
Framerate of the pause menu should be 30fps. (#155)
Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-15 17:16:06 -05:00
Blake Warner
688e2fa2c2 changed global frame to counter 2022-02-14 10:56:17 -05:00
Blake Warner
b855643760 higher frame framework 2022-02-14 10:56:17 -05:00
Blake Warner
8446394ca7 added missing file from last commit 2022-02-14 10:56:17 -05:00
Blake Warner
50d2be115b fix VS slow compiles 2022-02-14 10:56:17 -05:00
Blake Warner
4ce1221e81 fixed audio crash 2022-02-14 10:56:17 -05:00
Blake Warner
33bc628d9a fixed assets extraction scripts for cpp 2022-02-14 10:56:17 -05:00
Uwabami Wabberz
3149ee7e33 Cleaned up options object, added blind owl game setting (#150)
* Cleaned up options object, added blind owl game setting to shut up Kaepora Gaebora

* Unintentionally commented out a static_assert
2022-02-14 10:56:17 -05:00
Blake Warner
ba10617dbe bf 2022-02-14 10:56:17 -05:00
Blake Warner
818c92ce7f update zapd binary 2022-02-14 10:56:17 -05:00
Blake Warner
b9c0619828 cpp conversion 2022-02-14 10:56:16 -05:00
DaMarkov
5d661cff1b
Changed OOT from console to windows app for Release builds. (#151)
Also added a missing include path for libGLideNHQ (Release only).

Co-authored-by: DaMarkov <DaMarkovZED@gmail.com>
2022-02-14 09:26:57 -05:00
Blake Warner
b43781509a fixed rainbow text lut 2022-02-12 11:51:31 -05:00