Commit Graph - 2ship2harkinian-Android - ProxGit

izzy/2ship2harkinian-Android

mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00

Commit Graph

Select branches

Hide Pull Requests

android

develop

android

v1.0.0

v1.0.0.0

v1.0.0.1

v1.0.1

v1.0.2

v1.1.1

v1.1.1P1

v1.1.1P2

v1.1.1P3

v1.1.1P4

75d7cf668c Document object_boss_hakugin (Goht) (#1133) Tom OvertonandGitHub 2022-10-20 17:30:17 -07:00
f7bdec8aaf merge master engineer124 2022-10-18 16:53:13 -04:00
58e89b3769 minigame docs engineer124 2022-10-18 16:47:12 -04:00
1d1b6986af Document object_dnq (Deku Princess) (#1130) Tom OvertonandGitHub 2022-10-18 04:25:59 -07:00
8a714af8d0 Introduce actor_table.h (#985)
Anghelo Carvajal GitHub engineer124 EllipticEllipsis
2022-10-16 20:06:47 -03:00
b570e0c98e object_dno (Deku King) documented (#1126) Tom OvertonandGitHub 2022-10-16 15:14:15 -07:00
737a50c4da merge master engineer124 2022-10-16 16:05:20 -04:00
92d93701a9 ovl_En_Nb OK (#1030)
Anghelo Carvajal GitHub Derek Hensley engineer124 engineer124 EllipticEllipsis
2022-10-16 16:44:03 -03:00
7b572e8c53 Update Jenkinsfile Ethan RosemanandGitHub 2022-10-16 17:20:16 +09:00
62b465b3ea ovl_Bg_Dkjail_Ivy OK (#1014)
Alejandro Asenjo GitHub Anghelo Carvajal EllipticEllipsis
2022-10-16 00:36:25 -03:00
29a7a6714a Rename elf_message to QuestHint (sync with oot) (#1124)
fig02 GitHub engineer124 EllipticEllipsis
2022-10-15 22:04:14 -04:00
bd373940ac z_player_lib: Part 2 (#938)
Anghelo Carvajal GitHub engineer124 Isghj EllipticEllipsis Derek Hensley
2022-10-15 19:12:01 -03:00
638f5062cb Replace Actor_MarkForDeath with Actor_Kill (#1118) Tom OvertonandGitHub 2022-10-14 21:35:55 -07:00
a38f45b268 Document Elegy of Emptiness shell assets in gameplay_keep (#1121) Tom OvertonandGitHub 2022-10-14 19:52:33 -07:00
a4f0d8ea88 Match 3 Functions (z_actor OK, z_mir_ray OK, z_mir_ray3 OK) (#1122) engineer124andGitHub 2022-10-14 21:05:20 -04:00
d7a45b1b34 Merge remote-tracking branch 'upstream/master' into Majora petrie911 2022-10-14 13:29:48 -05:00
0a33e8f154 Merge remote-tracking branch 'upstream/master' into Mine petrie911 2022-10-14 13:29:36 -05:00
b35accc955 ObjY2Shutter OK and documented (#1119)
Tom Overton GitHub ChloeChloe <>
2022-10-14 04:59:13 -07:00
7dfbca5ace Update README.md (#1116) Parker BurnettandGitHub 2022-10-13 14:29:19 -07:00
7204b08498 Rename audio context (#1114) engineer124andGitHub 2022-10-13 16:17:27 -04:00
f3db029936 z_kaleido_collect.c (1 non-matching) and Mostly Documented (Pause Menu Quest Page) (#1108) engineer124andGitHub 2022-10-12 23:39:39 -04:00
868029b213 Import Camera Data (#1097) engineer124andGitHub 2022-10-12 23:26:35 -04:00
8b2048280e Merge branch 'master' into parameter engineer124 2022-10-12 15:08:49 -04:00
8a7a731668 data import petrie911 2022-10-10 11:14:51 -05:00
09cf394d98 ovl_Bg_Kin2_Picture OK and documented, object_kin2_obj documented (#1070)
TrulyNaN GitHub Isghj EllipticEllipsis Derek Hensley EllipticEllipsis Isghj5 mzxrules Maide
2022-10-09 21:34:17 -04:00
62434ea1c4 Merge remote-tracking branch 'upstream/master' into Mine petrie911 2022-10-09 12:44:12 -05:00
ae952f828c Merge remote-tracking branch 'upstream/master' into Majora petrie911 2022-10-09 12:31:02 -05:00
01bcdd939c Merge remote-tracking branch 'upstream/master' into Aliens petrie911 2022-10-09 12:28:47 -05:00
612819cbbc regs, cleanup engineer124 2022-10-08 14:06:57 -04:00
e75b0c51f5 ovl_Bg_Umajump OK (#1050) SonicDcerandGitHub 2022-10-08 14:19:20 -03:00
4c0011659e hgdoor documented (#1110) Parker BurnettandGitHub 2022-10-08 04:57:45 -07:00
d364b80da3 ovl_En_Stone_heishi OK (#1046) SonicDcerandGitHub 2022-10-08 00:53:16 -03:00
b7b4b09e4d match petrie911 2022-10-07 21:49:19 -05:00
d745cccf87 [Doc] Actor En_Bee - Giant Bee (#1089)
krm01 GitHub sonicdcer Derek Hensley EllipticEllipsis
2022-10-07 22:28:29 -04:00
8e6843f04e DmChar08 OK (#1085)
Derek Hensley GitHub louist103 louist103 Anghelo Carvajal
2022-10-06 17:46:58 -07:00
2d64b28e8e pictograph docs engineer124 2022-10-06 15:07:26 -04:00
abd997d27f merge master engineer124 2022-10-05 13:54:29 -04:00
589925ce3e Update permuter_settings.toml (#1107) Parker BurnettandGitHub 2022-10-05 10:38:42 -07:00
f379012742 z_kaleido_map.c OK and Documented (Pause Menu Map Page) + related icon_item statics (dungeon/field/jpn) (#1094) engineer124andGitHub 2022-10-05 01:15:39 -04:00
8848fd8170 En_Knight matching Thar0 2022-10-05 02:09:51 +01:00
f035f12f1c newlines petrie911 2022-10-04 17:26:15 -05:00
9f773d88c0 merge petrie911 2022-10-04 17:20:15 -05:00
ead7e4c594 merge again petrie911 2022-10-04 16:57:36 -05:00
b68c1edbcd Merge remote-tracking branch 'upstream/master' into Mine petrie911 2022-10-04 16:44:18 -05:00
2006a65ba6 z_overlay and z_fbdemo_dlftbls (Transition overlay handling), clean up a lot of u32s used to store pointers (#1073)
petrie911 GitHub petrie911
2022-10-04 15:46:32 -05:00
8cd48db087 Better match for BgKin2Fence_CheckHitMask (#1105)
Tom Overton GitHub EllipticEllipsis
2022-10-04 12:23:13 -07:00
6c414889c9 Fbdemo_circle OK (#1024) Parker BurnettandGitHub 2022-10-04 05:55:20 -07:00
4833c08364 ovl_Oceff_Storm OK (#1010) SonicDcerandGitHub 2022-10-04 01:03:53 -03:00
362a73a017 ovl_En_Bombal OK (#1051) SonicDcerandGitHub 2022-10-04 00:36:12 -03:00
26207594f2 Format Script Update (#904)
Derek Hensley GitHub Roman971 Tharo
2022-10-03 20:06:04 -07:00
0a8d285a02 Merge remote-tracking branch 'origin/master' into z_map_ mzxrules 2022-10-03 16:28:07 -04:00
f85afc978f more docs engineer124 2022-10-03 09:37:48 -04:00
bdb2001b05 time, button, misc docs engineer124 2022-10-02 22:29:01 -04:00
ddbc03fed3 merge master engineer124 2022-10-02 19:56:28 -04:00
3e32379c2b audio_synthesis.c OK and Documented (#1090) engineer124andGitHub 2022-10-02 15:24:10 -04:00
0e2de439dd Dm_Tag (#922) MaideandGitHub 2022-10-02 19:31:55 +01:00
fdfe2842d9 Eff Srchball OK (#1092)
Derek Hensley GitHub EllipticEllipsis
2022-10-02 10:10:31 -07:00
3d5d39e74d Document leftover pause joint tables (#1104) Tom OvertonandGitHub 2022-10-02 09:16:30 -07:00
aa3f1be55e Object Tru Docs (Koume) (#1098) Derek HensleyandGitHub 2022-10-02 09:07:55 -07:00
841da5f138 View & Shrink_Window Docs (#1049) engineer124andGitHub 2022-10-02 10:32:57 -04:00
cd05be7049 some docs engineer124 2022-10-02 09:18:23 -04:00
063d24f491 ovl_En_Door_Etc OK (#994)
chloe!!GitHubChloe <>EllipticEllipsis
2022-10-02 00:07:07 -05:00
84d77d5101 EnMThunder Ok with some docs (#1082)
Derek Hensley GitHub engineer124
2022-10-01 21:00:52 -07:00
c0b227ff17 more docs engineer124 2022-10-01 15:29:45 -04:00
78ec6752b8 update button comments engineer124 2022-10-01 15:12:49 -04:00
049559804a begin vtx docs engineer124 2022-10-01 14:33:12 -04:00
82afae675b Replace player animation names with original names derived from OoT3D/MM3D (#1103) Tom OvertonandGitHub 2022-10-01 09:08:47 -07:00
8e65c29040 z64interface.h, cleanup engineer124 2022-10-01 11:50:19 -04:00
21c3e39d22 merge master, story docs engineer124 2022-10-01 11:20:36 -04:00
c3c08e944c EnWiz (Wizrobe) OK and documented, EnWizFire (Wizrobe Magic) documented, object_wiz documented (#1054) Tom OvertonandGitHub 2022-10-01 08:14:06 -07:00
bbc8aec36a (Mostly) document EnSyatekiDekunuts (Shooting Gallery Deku Scrub) (#1095) Tom OvertonandGitHub 2022-09-30 19:55:05 -07:00
4935ec7ba1 Rename SetupIndex to Layer (#1099) Derek HensleyandGitHub 2022-09-30 19:34:28 -07:00
ab5fd663cc Quake & Distortion Cleanup (#1102) engineer124andGitHub 2022-09-30 22:01:39 -04:00
b080fb3700 z_kaleido_mask.c Ok and Documented (Pause Menu Mask Page) (#1093) engineer124andGitHub 2022-09-30 20:51:49 -04:00
8b4b404a99 deimplementation complete petrie911 2022-09-30 19:35:52 -05:00
15b9f83bd8 Document object_dnj (Deku Butler) (#1100) Tom OvertonandGitHub 2022-09-30 13:17:34 -07:00
42a8bf6876 Document BgCraceMovebg (sliding doors in Deku Shrine) and object_crace_object (#1101) Tom OvertonandGitHub 2022-09-30 12:15:43 -07:00
1be5a7d2c7 ovl_Oceff_Wipe5 OK (#1011) SonicDcerandGitHub 2022-09-30 12:37:01 -03:00
6ff53e448b ovl_Oceff_Wipe OK (#1008) SonicDcerandGitHub 2022-09-30 11:50:59 -03:00
1af942ae12 Audio Sequences: Scene/Ambience/SeqFlags Functions OK (#1033) engineer124andGitHub 2022-09-30 07:49:35 -04:00
2ce9ebdd5d small docs engineer124 2022-09-29 22:25:24 -04:00
3a723efb15 SceneNum -> SceneId (#1036) Derek HensleyandGitHub 2022-09-29 19:22:59 -07:00
dcf8af218e add comment engineer124 2022-09-29 21:32:11 -04:00
08be0b3bd4 EnTg OK and documented, object_mu documented (#1042)
Karen Craig GitHub Derek Hensley Tom Overton
2022-09-29 21:23:59 -04:00
9bf6bedd75 misc docs engineer124 2022-09-29 21:13:54 -04:00
7ed0d14bfe En_Ru: OK (Unused OoT Ruto) (#1035)
Isghj GitHub Isghj8 engineer124 Derek Hensley
2022-09-29 17:29:25 -07:00
615d945bf9 minigame docs engineer124 2022-09-29 15:11:03 -04:00
16ea0c48b3 merge master engineer124 2022-09-29 09:05:14 -04:00
b029ad4a45 comment engineer124 2022-09-29 08:58:29 -04:00
8f2fe9b3c7 z_parameter: Timers (#1031) engineer124andGitHub 2022-09-29 08:57:44 -04:00
1b82352a6b structs complete petrie911 2022-09-29 04:48:27 -05:00
084bafcfcc ovl_En_Nimotsu OK and documented (#1028) StickyThwompandGitHub 2022-09-28 21:57:00 -05:00
cc52da9952 ovl_Obj_Swprize OK (#1021) SonicDcerandGitHub 2022-09-28 22:47:38 -03:00
864f3037a4 merge master engineer124 2022-09-28 19:40:44 -04:00
5e860dd3e7 z_parameter: Hud Visibility (#942) engineer124andGitHub 2022-09-28 18:47:46 -04:00
91d4e29dfa Document object_zos (Evan) (#1091) Tom OvertonandGitHub 2022-09-27 14:48:57 -07:00
aa54982318 EnGrasshopper (Dragonflies) OK and documented, object_grasshopper documented (#1043) Tom OvertonandGitHub 2022-09-27 12:50:02 -07:00
f0311e6ca4 Document EnSyatekiCrow (#1063) Tom OvertonandGitHub 2022-09-27 10:28:39 -07:00
77d8e386a3 Add comments to everything in the scene enum (#1052) Tom OvertonandGitHub 2022-09-27 05:42:15 -07:00
ee82e65c1a z_kaleido_item.c Ok and Documented (Pause Menu Item Page) (#1027)
engineer124 GitHub EllipticEllipsis
2022-09-26 23:37:00 -04:00

... 14 15 16 17 18 ...