mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 13:30:47 +00:00
Code Issues Projects Releases Wiki Activity
484 commits 1 branch 0 tags 506 MiB
Commit graph

484 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lucas Shaw
6a45dcba7f Fixed merge conflict 2020-03-22 22:57:24 -07:00
Lucas Shaw
62e7a8c037 formatting fix 2020-03-22 22:55:37 -07:00
Lucas Shaw
8c99bdd00f ovl_Bg_Zg OK 2020-03-22 22:55:05 -07:00
Ethan Roseman
4c3b764461 Almost done 2020-03-23 01:31:03 -04:00
fig02
8cd9a881d0 fire arrow progress 2020-03-22 23:10:37 -04:00
fig02
d879f2acb0
Merge pull request #24 from Roman971/non-matchings 
Fix remaining non matchings and Update progress script
 2020-03-22 23:08:37 -04:00
KrimtonZ
6072055c85 fix merge conflics 2020-03-22 20:57:25 -05:00
KrimtonZ
d136468ace Merge branch 'master' into skelanime 2020-03-22 20:35:10 -05:00
KrimtonZ
2a158f79ce skelanime WIP 2020-03-22 20:24:00 -05:00
Roman971
923d1063b6
Merge pull request #23 from ethteck/ovl_Bg_Gate_Shutter 
Decompiled ovl_Bg_Gate_Shutter
 2020-03-23 02:23:07 +01:00
Ethan Roseman
1876dc0c5c UNK_PTR->UNK_TYPE 2020-03-22 21:05:09 -04:00
Roman971
7c9291c59e Update progress script to default to decomp progress 2020-03-23 01:49:30 +01:00
Ethan Roseman
5f3db569f9 else if 2020-03-22 20:39:12 -04:00
Roman971
64b5536ab8 Fix remaining non matchings 2020-03-23 01:38:31 +01:00
Ethan Roseman
9408bc0770 clang-format 2020-03-22 19:32:28 -04:00
Ethan Roseman
6b84b3e2b2 +x on format.sh, header brace fix 2020-03-22 19:28:20 -04:00
Ethan Roseman
ab976edca4 Merge branch 'master' into ovl_Bg_Gate_Shutter 2020-03-22 19:21:39 -04:00
fig02
d85168f0b0
Merge pull request #10 from Roman971/setup-formatter 
Setup formatter script and format files in src/ and include/
 2020-03-22 19:17:31 -04:00
Ethan Roseman
0f7cc04f43 Removed header padding 2020-03-22 17:57:28 -04:00
Ethan Roseman
80bced5204 Decompiled ovl_Bg_Gate_Shutter 2020-03-22 17:56:08 -04:00
Roman971
51290f6126 Partially format header files 2020-03-22 22:50:15 +01:00
Roman971
8cfe7cce9f Format all src C files 2020-03-22 22:20:03 +01:00
Ethan Roseman
4600faad8b 5 to go 2020-03-22 16:40:08 -04:00
Roman971
251aea64ab Add comments and macros to prevent match issues with formatting 2020-03-22 21:09:54 +01:00
Roman971
0704beba8d Setup formatting with clang-format and clang-tidy 2020-03-22 20:18:10 +01:00
Roman971
b372169893
Merge pull request #22 from Random06457/master 
Decompiled z_sample.c
 2020-03-22 20:04:39 +01:00
fig02
959ac9df26
Merge pull request #7 from glankk/z_en_tk 
Z en tk
 2020-03-22 14:42:28 -04:00
Random
0db4629a63 Update PR #22 
minor fixes
 2020-03-22 19:32:44 +01:00
glank
fd7c3c9e56 Responding to PR comments 2020-03-22 18:55:23 +01:00
glank
d7b0ba7c06 Merge branch 'master' into z_en_tk 2020-03-22 18:43:40 +01:00
Random
bd00e0d1da Decompiled z_sample.c 
`z_sample.c` : 1 non matching left
 2020-03-22 17:37:38 +01:00
fig02
e066751e22
Merge pull request #21 from shawlucas/ovl_Bg_toki_swd 
bg_toki_swd ok
 2020-03-21 23:50:26 -04:00
shawlucas
2d97f0dd58 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-21 20:39:18 -07:00
shawlucas
f581128e6b Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_toki_swd 2020-03-21 20:38:59 -07:00
shawlucas
13e2c84dbf Made suggested changes 2020-03-21 20:37:35 -07:00
fig02
a3bac9fbb2
Merge pull request #17 from glankk/code_800FCE80 
code_800FCE80 OK
 2020-03-21 21:46:44 -04:00
fig02
65213ab140
Merge pull request #19 from Random06457/master 
Decompiled code_800ACE70.c
 2020-03-21 21:43:21 -04:00
fig02
8057d95195
Merge pull request #20 from ethteck/ovl_Demo_Geff 
Decompiled ovl_Demo_Geff
 2020-03-21 21:42:02 -04:00
shawlucas
2c77e70040 Merge branch 'ovl_Bg_toki_swd' of https://github.com/shawlucas/oot into ovl_Bg_toki_swd 2020-03-21 18:16:53 -07:00
shawlucas
0a706610d2 Merge branch 'master' into ovl_Bg_toki_swd 2020-03-21 18:15:41 -07:00
shawlucas
2029330e93 Merge branch 'master' of https://github.com/zeldaret/oot 2020-03-21 18:14:58 -07:00
shawlucas
08b73fe685 fixed merge conflict 2020-03-21 18:14:17 -07:00
shawlucas
fd2dae78a2 added one space to a line 2020-03-21 18:11:02 -07:00
Lucas Shaw
bc6746b77b
Merge branch 'master' into ovl_Bg_toki_swd 2020-03-21 18:10:07 -07:00
shawlucas
f1ae94c2f3 Made suggested changes to ovl_Bg_Toki_Swd 2020-03-21 18:08:45 -07:00
Roman971
1d79f4b93d
Merge pull request #18 from Roman971/regconvert-script 
Add script to generate REG macros from GameInfo offsets
 2020-03-22 00:49:21 +01:00
Roman971
f0026cee24
Merge pull request #16 from fig02/en_dog 
en_dog OK
 2020-03-22 00:46:28 +01:00
Ethan Roseman
969c55bc29 Data 2020-03-21 19:41:04 -04:00
Ethan Roseman
05a6cee5f5 Migrated rodata 2020-03-21 19:31:43 -04:00
Ethan Roseman
7dbd4de24c Header 2020-03-21 19:20:54 -04:00