Commit Graph

762 Commits

Author SHA1 Message Date
thecozies
c1675ca363 Merge branch 'master' of github.com:HackerN64/HackerOoT into new_profiler 2023-01-03 13:08:08 -06:00
thecozies
02b71f44cb disable AA define 2023-01-03 13:01:35 -06:00
thecozies
c4fbed4e67 DEFAULT_REFRESH_RATE 2023-01-03 12:52:10 -06:00
thecozies
0d7e534625 Color_RGBA32 2023-01-03 12:43:00 -06:00
thecozies
2f071ddf42 started adding hackersm64 based profiler 2023-01-03 12:14:17 -06:00
Yanis42
6cb2fc8b7f Merge remote-tracking branch 'decomp/master' into decomp_merge 2022-12-17 22:27:38 +01:00
engineer124
934d488420 z_play: Camera Docs and Cleanup (#1460)
* begin docs

* More suggestions

* more docs

* timer to duration

* partial PR review

* init data with player

* consistent comments

* withPlayer to usingPlayer
2022-12-17 16:07:31 -05:00
Yanis42
cf2aeef281 Merge remote-tracking branch 'upstream/master' into decomp_merge 2022-12-17 19:27:39 +01:00
Yanis42
f62b693037 fix compile issue 2022-12-15 00:08:12 +01:00
Yanis42
f2847501e3 Merge pull request #34 from Yanis42/missing_audio_debug_code
Disabled more audio debugger code
2022-12-14 14:37:16 +01:00
Yanis42
c129618d69 Merge remote-tracking branch 'upstream/master' into config_cleanup 2022-12-14 14:02:08 +01:00
Yanis42
33c8843a5e moved mempak to game, enable map select if boot to map select 2022-12-14 11:56:21 +01:00
Yanis42
4e9fce3b30 Merge remote-tracking branch 'upstream/master' into missing_debug_code 2022-12-14 11:50:58 +01:00
Yanis42
5c265b435f Merge remote-tracking branch 'upstream/master' into missing_audio_debug_code 2022-12-14 11:50:34 +01:00
Yanis42
ad33580e5c Merge remote-tracking branch 'upstream/master' into config_cleanup 2022-12-14 11:49:29 +01:00
Yanis42
d72694f1da Merge pull request #33 from ariahiro64/4mb
Jumper Pak GCC compatibility
2022-12-14 11:23:58 +01:00
Yanis42
edbadb2f53 Merge remote-tracking branch 'upstream/master' into config_cleanup 2022-12-13 14:34:53 +01:00
Yanis42
01cd9e8925 defines for speedmeter and debug heap 2022-12-13 14:03:22 +01:00
Yanis42
b0beff87d2 Merge remote-tracking branch 'decomp/master' into decomp_merge 2022-12-13 09:57:27 +01:00
engineer124
aa48c66e10 Introduce Player csMode enum (#1462)
* player csmode enum

* cleanup

* missed one, player2

* spell out enum name

* use CSMODE_MAX for data
2022-12-12 22:22:56 -05:00
Dragorn421
880e7c937c Some cleanup/doc on the item icons (#1263)
* Some cleanup/doc on the item enum and icons

* `gItemIconBigBottlePoeTex` -> `gItemIconBottleBigPoeTex`

* Biggoron sword / giant knife items (?)

* `SPSTONE_` -> `SPIRITUAL_` ?

* `gItemIconBrokenBiggoronSwordTex` -> `gItemIconBrokenGoronsSwordTex`

* `gQuestIcon...MedallionTex` -> `gQuestIconMedallion...Tex`

* `ITEM_MAGIC_` -> `ITEM_MAGIC_JAR_`small/big

* `ITEM_BOW_ARROW_` -> `ITEM_BOW_`

* `MASK_BUNNY` -> `MASK_BUNNY_HOOD`

* Update `GID_` enum from `ITEM_` enum

* ITEM/GID`_ARROW_`small/medium/large -> 5/10/30

* Run formatter

* .

* fix regressions and revert bad ideas

* chicken

* obey the newline police and also prevent the range police from intervening

* fixups

* dimensions -> dimension (singular)

* Note on inconsequential oddities about the `gItemIcons` mapping
2022-12-12 21:45:54 -05:00
Anghelo Carvajal
c420885513 z_actor documentation pass (#1445)
* Actor_Offer* and Actor_SetClosestSecretDistance

* color filter stuff

* KillAll

* format

* comment

* Update src/code/z_actor.c

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* review

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* format

* COLORFILTER_INTENSITY_FLAG

* Remove -

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* yeet COLORFILTER_GET_XLUFLAG

* bug

* frug

* Undo Actor_KillAllFromUnloadedRooms

* update Actor_OfferGetItem comment

* Update Actor_OfferGetItem description

* diving

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2022-12-12 21:23:14 -05:00
Dragorn421
83163f4d4b Fix misc GCC compatibility issues (#1463)
* Fix osGetMemSize being optimized to `return 8MB` by gcc

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: ariahiro64 <45049787+ariahiro64@users.noreply.github.com>

* Workaround f32 to s16 cast for binang being UB if binang doesn't fit s16

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: ariahiro64 <45049787+ariahiro64@users.noreply.github.com>

* osGetMemSize fixup

* include z64math in z64camera

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: ariahiro64 <45049787+ariahiro64@users.noreply.github.com>
2022-12-12 20:55:57 -05:00
Yanis42
c80d587a1d missed some debug code in audio 2022-12-12 23:29:40 +01:00
ariahiro64
57666e94cd Real 4mb fix 2022-12-12 17:20:56 -05:00