nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
Files
d58968d196d3a375be79c5f47852647daf9ebf67
Shiip-of-Hakinian-Espanol/soh/include
History
Christopher Leggett d58968d196 Merge branch 'develop' into merge-develop 
# Conflicts:
#	soh/soh/Enhancements/custom-message/CustomMessageTypes.h
#	soh/soh/Enhancements/debugger/debugSaveEditor.h
#	soh/soh/Enhancements/item-tables/ItemTableTypes.h
#	soh/soh/Enhancements/mods.cpp
#	soh/soh/Enhancements/randomizer/3drando/entrance.cpp
#	soh/soh/Enhancements/randomizer/3drando/item_location.cpp
#	soh/soh/Enhancements/randomizer/3drando/keys.hpp
#	soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
#	soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
#	soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
#	soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
#	soh/soh/Enhancements/randomizer/3drando/menu.cpp
#	soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
#	soh/soh/Enhancements/randomizer/3drando/settings.cpp
#	soh/soh/Enhancements/randomizer/3drando/settings.hpp
#	soh/soh/Enhancements/randomizer/randomizer.cpp
#	soh/soh/Enhancements/randomizer/randomizerTypes.h
#	soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
#	soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
#	soh/soh/Enhancements/randomizer/randomizer_entrance.c
#	soh/soh/OTRGlobals.cpp
#	soh/src/code/z_sram.c
#	soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
2023-12-10 12:49:15 -05:00
..
boost_custom/container_hash
Add manual seed input for rando generation (#2057)
2023-01-25 18:33:27 -05:00
libc
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
tables
Entrance Docs (#3332)
2023-11-19 14:29:56 -05:00
align_asset_macro.h
Simplify Asset Headers (#2474)
2023-03-02 15:37:47 +01:00
alignment.h
[docs] Upstream updates 1 (#1955)
2022-11-30 00:28:57 +01:00
alloca.h
Linux/GCC Support (#28)
2022-05-11 13:18:24 -04:00
command_macros_base.h
Big-endian support (#909)
2022-07-27 23:50:56 +02:00
fp.h
Dynamic Actor IDs (#1729)
2023-06-01 21:39:50 -04:00
functions.h
Entrance Docs (#3332)
2023-11-19 14:29:56 -05:00
global.h
Dynamic Actor IDs (#1729)
2023-06-01 21:39:50 -04:00
ichain.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
macro.inc
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
macros.h
Age Requirement Docs (#3277)
2023-10-20 18:40:10 -05:00
message_data_fmt.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
message_data_static.h
Randomizer v2 (#1065)
2022-09-21 00:50:22 -04:00
message_data_textbox_types.h
Randomizer v2 (#1065)
2022-09-21 00:50:22 -04:00
regs.h
Transition docs (#3322)
2023-11-19 02:38:07 -05:00
segment_symbols.h
Linux crash handler (#1209)
2022-08-31 22:59:38 -04:00
sequence.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
sfx.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
unk.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
variables.h
Entrance Docs (#3332)
2023-11-19 14:29:56 -05:00
vt.h
Disable BEL char by default when terminal attached (#2306)
2023-01-17 15:18:13 -05:00
z64.h
Entrance Docs (#3332)
2023-11-19 14:29:56 -05:00
z64actor_enum.h
Rando Definition Deduplication (#3284)
2023-10-19 18:48:25 -05:00
z64actor.h
Rando Definition Deduplication (#3284)
2023-10-19 18:48:25 -05:00
z64animation.h
Removed hardcoded skeleton types in actor draw code. (#2979)
2023-09-26 08:45:10 -05:00
z64audio.h
Makes sequenceMap and seqLoadStatus a dynamic size (#2610)
2023-03-12 15:55:25 -04:00
z64bgcheck.h
Use PlayState instead of GlobalContext (#1927)
2022-11-06 09:24:34 +01:00
z64camera.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64collision_check.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
z64cutscene_commands.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
z64cutscene.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64dma.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64effect.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64elf_message.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64environment.h
Transition docs (#3322)
2023-11-19 02:38:07 -05:00
z64interface.h
DPad items
2022-06-22 23:13:32 -04:00
z64item.h
Player Equip Docs (#3282)
2023-10-30 10:56:36 -05:00
z64light.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64map_mark.h
refactor: use LUS 1.0 RC
2023-01-17 00:33:56 -05:00
z64math.h
Move Game Saving to Separate Thread (#2820)
2023-05-05 17:20:34 -04:00
z64object.h
git subrepo clone https://github.com/HarbourMasters/soh.git
2022-03-22 02:51:23 +01:00
z64player.h
Bring over some player documentation from decomp (#3380)
2023-11-26 11:54:54 -05:00
z64save.h
Merge branch 'develop' into merge-develop
2023-12-10 12:49:15 -05:00
z64scene_enum.h
Rando Definition Deduplication (#3284)
2023-10-19 18:48:25 -05:00
z64scene.h
Merge branch 'develop' into merge-develop
2023-12-10 12:49:15 -05:00
z64skin.h
Use PlayState instead of GlobalContext (#1927)
2022-11-06 09:24:34 +01:00
z64transition.h
Transition docs (#3322)
2023-11-19 02:38:07 -05:00