1879 Commits

Author SHA1 Message Date
Yanis42
335923a30f Merge pull request #81 from Yanis42/define_fix
[Fix] Missing character in the ``SHOW_TIME_INFOS`` ifdef in regs.h
v1.0.0
2024-01-23 13:38:46 +01:00
Yanis42
843bab25f9 fixed typo 2023-12-30 15:13:37 +01:00
Yanis42
7ca18cb3e9 Merge pull request #73 from Yanis42/c_cpp_json
Sync .vscode changes with dev
2023-10-13 19:14:53 +02:00
Yanis42
281fd4dc21 early dev sync 2023-10-13 19:13:37 +02:00
Yanis42
bbb1237cc8 Merge pull request #68 from Yanis42/decomp_merge
Merged decomp/main in HackerOoT
2023-09-28 21:39:31 +02:00
Yanis42
9449a4c071 Merge remote-tracking branch 'decomp/main' into decomp_merge 2023-09-27 17:31:53 +02:00
fig02
c5e4357127 initial action-change-list docs (#1540) 2023-09-27 11:02:21 -04:00
fig02
2cb4ff4fd3 Player Docs: csMode -> csAction (#1547)
* csmode -> cs action

* format
2023-09-26 12:48:41 -04:00
Tharo
092f602638 Fix gamestate overlay table size declaration (#1555) 2023-09-26 08:40:55 -04:00
Derek Hensley
4d7558df0d Speedmeter Small cleanup (#1554)
* Small cleanup

* x
2023-09-25 06:29:15 -04:00
engineer124
873c55faad Improve Matches: Part 4 (#1545)
* more improvements

* small cleanup

* PR Review
2023-09-24 17:51:03 +02:00
Yanis42
cb1c2ffa09 Merge remote-tracking branch 'decomp/main' into decomp_merge 2023-09-23 13:29:15 +02:00
Yanis42
bdd34a34d3 Merge remote-tracking branch 'upstream/main' into decomp_merge 2023-09-23 13:19:14 +02:00
Dragorn421
fefeb369dd Name the main pause state and add placeholder enum for main (sub)states (#1551) 2023-09-22 14:48:09 -04:00
Nuss
4842f62833 wrong path (#1548) 2023-09-22 12:13:26 -04:00
Dragorn421
c73e2ab726 Make macros for age reqs data and access (#1549)
* Make macros for age reqs data and access

* line breaks for readability
2023-09-22 11:50:44 -04:00
Derek Hensley
dc010abf7a Rename master to main (#1536)
* Jenkinsfile master -> main

* Missed some instances of master
2023-09-22 11:40:19 -04:00
Yanis42
be3121f821 Merge pull request #69 from Yanis42/dev_n64logo_mm
Option to use MM's N64 Boot Logo
2023-09-21 15:22:27 +02:00
Yanis42
a6f5c92b3f thing 2023-09-21 15:19:47 +02:00
engineer124
d7f6961918 Improve Matches: Part 3 (#1544)
* improve matchings

* spacing
2023-09-20 12:41:47 -04:00
engineer124
72334df180 improve matching (#1543) 2023-09-20 10:54:44 -04:00
engineer124
a8d670fe5c improve matches (#1542) 2023-09-20 10:41:03 -04:00
Billy
107c0288cc Dekunut Salesman Docs (#1493)
* Dekunut Salesman Docs

* Update src/overlays/actors/ovl_En_Dns/z_en_dns.c

Remove extra param from debug logging

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

* * Full Deku/Potion name usage
* Dialog -> CanBuy
* Revert debug logging symbols
* Proper declaration spacing
* Fix en_shopnuts header doc
* Biz -> Business

* Fix missed deku prefix's

* Synchronize CanBuy sticks and nuts

* Fix enum naming

* Clarified CanBuy success values

* anon review

* fig review

* macro changes

* fix macro usage

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2023-09-19 21:41:42 -04:00
fig02
da3f4718f0 Player docs: Control Stick Input and Movement (#1539)
* document input stuff and movement speed+yaw

* curve -> curved, and other cleanups

* fix + format

* function declaration

* name arguments

* add mode descriptions

* fix typos

* move comment down
2023-09-19 21:37:03 -04:00
Dragorn421
185c9cbf1a Run formatter (#1541) 2023-09-19 15:01:00 -04:00