izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
3,145 Commits 2 Branches 11 Tags
android
Commit Graph
3145 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
engineer124 6d30630d73 Merge branch 'main' into sys_math3d_bss 2023-10-25 12:48:11 +11:00
NussandGitHub 71fae65062 object_test3 (kafei) (#1431) 
* naming

* improvements

* improvements

* ups
 2023-10-24 08:32:07 +11:00
angie 13ae145ce7 format 2023-10-23 10:04:19 -03:00
angie 5902d976dd Merge remote-tracking branch 'upstream/main' into ovl_En_An 2023-10-23 09:46:12 -03:00
Anghelo CarvajalGitHubDerek Hensley
 		1e19cfe869 Anju objects (#1444) 
* bring over the objects from the other branch

* kafeis mask

* use symbols

* dman naming after assets

* stateFlags

* remaining stuff

* anim array bug

* Name everything in DmGm after DmAn

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED

* undef

* format

* idk

* ing

* format

* name animations from an4, thanks emil!

* emptydl

* disbelief

* review

* format

* Update assets/xml/objects/object_mask_kerfay.xml

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
 2023-10-23 16:03:16 +11:00
NussandGitHub a468be77d5 object_owl (#1430) 
* some naming

* naming

* comments

* improvements

* improvements
 2023-10-23 10:31:55 +11:00
WimmerandGitHub 002f5ba6de obj_oyu (#1436) 
* object_oyu

object_oyu.xml / z_bg_goron_oyu.c updated

* Hot Spring Water Update

* updated comments

* GoronGraveyard prefix

* Update object_oyu.xml
 2023-10-22 19:43:57 -03:00
angie 1aba20892b Incorporate SCHEDULE_TIME 2023-10-22 08:55:40 -03:00
Derek HensleyandGitHub 3569ef97ad progress ld fix (#1449) 2023-10-22 08:51:58 -03:00
angie 466b4d6f26 Merge remote-tracking branch 'upstream/main' into ovl_En_An 2023-10-22 08:50:30 -03:00
engineer124 08035011c8 PR Review 2023-10-22 17:27:35 +11:00
engineer124 9d8554e05a Merge branch 'main' into sys_math3d_bss 2023-10-22 17:19:13 +11:00
Anghelo CarvajalandGitHub ec86f10b0f SCHEDULE_TIME (#1438) 
* SCHEDULE_CALC_TIME_ALT

* add s32 cast to avoid f32 -> u16 direct cast

* SCHEDULE_TIME

* remove the alts

* Update explanation about the script
 2023-10-22 16:52:40 +11:00
Derek Hensley e0fc8a614f Bodyparts + other clean up 2023-10-21 13:58:39 -07:00
engineer124 9c2c3f1bb8 cleanup 2023-10-22 03:35:44 +11:00
engineer124 b4626812f6 cleanup and docs 2023-10-22 03:30:02 +11:00
engineer124andGitHub 425238fd5d Match Camera_Battle1 (#1445) 
* match Camera_Battle1

* more cleanup

* more docs from OoT
 2023-10-21 13:17:47 -03:00
engineer124andGitHub cbca59d49e Match Camera_KeepOn1 (#1447) 
* Match Camera_KeepOn1

* small cleanup
 2023-10-21 12:35:23 -03:00
engineer124 fd7a96b9a1 Merge branch 'main' into sys_math3d_bss 2023-10-22 01:42:17 +11:00
engineer124andGitHub 2dc405b6af Match Camera_Normal1 (#1446) 
* improve Camera_Normal1

* decompme

* Match Camera_Normal1, thanks darkeye

* use the pad
 2023-10-20 16:30:18 -03:00
Derek Hensley d209673b1b Some more small clean up 2023-10-20 08:08:24 -07:00
Derek Hensley 69e7c10fd6 Small cleanup 2023-10-20 07:41:56 -07:00
Derek Hensley 55c8ec6b40 Merge remote-tracking branch 'upstream/main' into sys_math3d_bss 2023-10-20 07:35:40 -07:00
Tom Overton 747661a4fc Use generated reloc for Goht + remove Goht's undefined_syms 2023-10-19 12:46:49 -07:00
Derek Hensley fdbbbf98a8 func_80B0D9CC OK 2023-10-19 12:09:01 -07:00