Commit Graph

Select branches

Hide Pull Requests

F3DEX3Cleanup

FixF3DEX3WrongTexOptim

FixMapSelectNames

FixOccOverlays

MultiF3DEX3Versions

NewProfiler

UpdateF3DEX3Version

develop/1.0.0

develop/2.0.0

develop/2.1.0

improved_animation_morphing

main

new_profiler

old_main

rename_gameplay_hacker_keep

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#137

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#150

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#173

#174

#175

#176

#177

#178

#18

#18

#180

#181

#182

#183

#184

#186

#187

#188

#189

#190

#191

#192

#193

#194

#196

#196

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#70

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#94

#95

#96

#97

#98

#99

v1.0.0

v2.0.0

v2.0.1

Mono Color

• 6a45dcba7f Fixed merge conflict Lucas Shaw 2020-03-22 22:57:24 -07:00
• 62e7a8c037 formatting fix Lucas Shaw 2020-03-22 22:55:37 -07:00
• 8c99bdd00f ovl_Bg_Zg OK Lucas Shaw 2020-03-22 22:55:05 -07:00
• 4c3b764461 Almost done Ethan Roseman 2020-03-23 01:31:03 -04:00
• 8cd9a881d0 fire arrow progress fig02 2020-03-22 23:10:37 -04:00
• d879f2acb0 Merge pull request #24 from Roman971/non-matchings fig02 2020-03-22 23:08:37 -04:00
• 6072055c85 fix merge conflics KrimtonZ 2020-03-22 20:57:25 -05:00
• d136468ace Merge branch 'master' into skelanime KrimtonZ 2020-03-22 20:35:10 -05:00
• 2a158f79ce skelanime WIP KrimtonZ 2020-03-22 20:24:00 -05:00
• 923d1063b6 Merge pull request #23 from ethteck/ovl_Bg_Gate_Shutter Roman971 2020-03-23 02:23:07 +01:00
• 1876dc0c5c UNK_PTR->UNK_TYPE Ethan Roseman 2020-03-22 21:05:09 -04:00
• 7c9291c59e Update progress script to default to decomp progress Roman971 2020-03-23 01:49:30 +01:00
• 5f3db569f9 else if Ethan Roseman 2020-03-22 20:39:12 -04:00
• 64b5536ab8 Fix remaining non matchings Roman971 2020-03-23 01:38:25 +01:00
• 9408bc0770 clang-format Ethan Roseman 2020-03-22 19:32:28 -04:00
• 6b84b3e2b2 +x on format.sh, header brace fix Ethan Roseman 2020-03-22 19:28:20 -04:00
• ab976edca4 Merge branch 'master' into ovl_Bg_Gate_Shutter Ethan Roseman 2020-03-22 19:21:39 -04:00
• d85168f0b0 Merge pull request #10 from Roman971/setup-formatter fig02 2020-03-22 19:17:31 -04:00
• 0f7cc04f43 Removed header padding Ethan Roseman 2020-03-22 17:57:28 -04:00
• 80bced5204 Decompiled ovl_Bg_Gate_Shutter Ethan Roseman 2020-03-22 17:56:08 -04:00
• 51290f6126 Partially format header files Roman971 2020-03-22 22:50:11 +01:00
• 8cfe7cce9f Format all src C files Roman971 2020-03-22 22:19:43 +01:00
• 4600faad8b 5 to go Ethan Roseman 2020-03-22 16:40:08 -04:00
• 251aea64ab Add comments and macros to prevent match issues with formatting Roman971 2020-03-18 22:18:25 +01:00
• 0704beba8d Setup formatting with clang-format and clang-tidy Roman971 2020-03-18 22:56:43 +01:00
• b372169893 Merge pull request #22 from Random06457/master Roman971 2020-03-22 20:04:39 +01:00
• 959ac9df26 Merge pull request #7 from glankk/z_en_tk fig02 2020-03-22 14:42:28 -04:00
• 0db4629a63 Update PR #22 Random 2020-03-22 19:32:44 +01:00
• fd7c3c9e56 Responding to PR comments glank 2020-03-22 18:55:05 +01:00
• d7b0ba7c06 Merge branch 'master' into z_en_tk glank 2020-03-22 18:43:40 +01:00
• bd00e0d1da Decompiled z_sample.c Random 2020-03-22 17:37:38 +01:00
• e066751e22 Merge pull request #21 from shawlucas/ovl_Bg_toki_swd fig02 2020-03-21 23:50:26 -04:00
• 2d97f0dd58 Merge branch 'master' of https://github.com/zeldaret/oot shawlucas 2020-03-21 20:39:18 -07:00
• f581128e6b Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_toki_swd shawlucas 2020-03-21 20:38:59 -07:00
• 13e2c84dbf Made suggested changes shawlucas 2020-03-21 20:37:35 -07:00
• a3bac9fbb2 Merge pull request #17 from glankk/code_800FCE80 fig02 2020-03-21 21:46:44 -04:00
• 65213ab140 Merge pull request #19 from Random06457/master fig02 2020-03-21 21:43:21 -04:00
• 8057d95195 Merge pull request #20 from ethteck/ovl_Demo_Geff fig02 2020-03-21 21:42:02 -04:00
• 2c77e70040 Merge branch 'ovl_Bg_toki_swd' of https://github.com/shawlucas/oot into ovl_Bg_toki_swd shawlucas 2020-03-21 18:16:53 -07:00
• 0a706610d2 Merge branch 'master' into ovl_Bg_toki_swd shawlucas 2020-03-21 18:15:41 -07:00
• 2029330e93 Merge branch 'master' of https://github.com/zeldaret/oot shawlucas 2020-03-21 18:14:58 -07:00
• 08b73fe685 fixed merge conflict shawlucas 2020-03-21 18:13:55 -07:00
• fd2dae78a2 added one space to a line shawlucas 2020-03-21 18:11:02 -07:00
• bc6746b77b Merge branch 'master' into ovl_Bg_toki_swd Lucas Shaw 2020-03-21 18:10:07 -07:00
• f1ae94c2f3 Made suggested changes to ovl_Bg_Toki_Swd shawlucas 2020-03-21 18:08:45 -07:00
• 1d79f4b93d Merge pull request #18 from Roman971/regconvert-script Roman971 2020-03-22 00:49:21 +01:00
• f0026cee24 Merge pull request #16 from fig02/en_dog Roman971 2020-03-22 00:46:28 +01:00
• 969c55bc29 Data Ethan Roseman 2020-03-21 19:41:04 -04:00
• 05a6cee5f5 Migrated rodata Ethan Roseman 2020-03-21 19:31:43 -04:00
• 7dbd4de24c Header Ethan Roseman 2020-03-21 19:20:54 -04:00
• c6a7cb2c8e Beginning Ethan Roseman 2020-03-21 19:05:38 -04:00
• 124c93c5a9 Made suggested changes Ethan Roseman 2020-03-21 18:09:59 -04:00
• bb5ce4a656 Finished Ethan Roseman 2020-03-21 17:33:39 -04:00
• 9a04a76296 ovl_bg_toki_swd OK shawlucas 2020-03-21 14:30:05 -07:00
• ec8889dc63 Changes in PR #19 Random 2020-03-21 21:40:18 +01:00
• f374ac8d2b started ovl_bg_toki_swd Lucas Shaw 2020-03-21 11:54:45 -07:00
• 61a32a5820 1 more down, slight documentation Ethan Roseman 2020-03-21 14:27:58 -04:00
• ea882fb46d Decompiled code_800ACE70.c Random 2020-03-21 19:09:05 +01:00
• 5f04911e00 Add script to generate REG macros from GameInfo offsets Roman971 2020-03-21 18:19:49 +01:00
• 8bea82f041 Make variable names uglier and less readable glank 2020-03-21 12:16:23 +01:00
• 882a7ba1f5 Move Path to z64scene.h glank 2020-03-21 12:20:43 +01:00
• fa4c848cad Merge branch 'master' into z_en_tk glank 2020-03-21 12:31:29 +01:00
• 31deeb865b Merge branch 'master' into ovl_Demo_Geff Ethan Roseman 2020-03-21 03:16:37 -04:00
• 3e8c79c670 More Ethan Roseman 2020-03-21 03:16:18 -04:00
• 7bf1c2fb50 Merge branch 'master' into skelanime KrimtonZ 2020-03-20 21:53:46 -05:00
• 96ba073f19 skelanime, wip KrimtonZ 2020-03-20 21:51:12 -05:00
• 0cf75356a5 code_800FCE80 OK glank 2020-03-21 03:09:42 +01:00
• 8e60e7d101 Merge remote-tracking branch 'upstream/master' fig02 2020-03-20 21:53:58 -04:00
• af62b0e7d7 Merge pull request #15 from Random06457/master fig02 2020-03-20 21:45:39 -04:00
• 8c17271ca3 dogIsLost is infact a bool fig02 2020-03-20 20:46:59 -04:00
• dff17518ef pr review changes fig02 2020-03-20 20:42:57 -04:00
• db5f70ad1c skelanime wip KrimtonZ 2020-03-20 16:12:26 -05:00
• 1ed67c4b21 Merge branch 'master' of https://github.com/zeldaret/oot shawlucas 2020-03-20 11:11:08 -07:00
• 3e764f6ed8 Changes in PR #15 Random 2020-03-20 18:13:47 +01:00
• 1fe00fcce1 Changes in PR #15 (2) Random 2020-03-20 17:15:39 +01:00
• bf07193791 Changes in PE #15 Random 2020-03-20 14:22:44 +01:00
• 8779aaa758 Decompiled various small files Random 2020-03-20 12:43:51 +01:00
• ea075560c8 merge bombiwa fig02 2020-03-20 08:25:26 -04:00
• 9c9ad6160b Merge pull request #13 from Thar0/ovl_Obj_Bombiwa fig02 2020-03-20 08:22:53 -04:00
• 225e7e9db9 fix function prototype fig02 2020-03-20 08:21:33 -04:00
• aa603ca229 merge and change scene thing fig02 2020-03-20 08:17:48 -04:00
• f3b509eb68 en_dog OK fig02 2020-03-20 08:04:35 -04:00
• 78c14f7fad More progress Ethan Roseman 2020-03-20 02:20:55 -04:00
• 2a283c18a9 Merge pull request #14 from ethteck/fix-build fig02 2020-03-20 00:58:50 -04:00
• 48fe06b4ee Merge branch 'fix-build' into ovl_Demo_Geff Ethan Roseman 2020-03-20 00:35:24 -04:00
• 1d7a2ff18d Fixing build to successfully stop on failure Ethan Roseman 2020-03-20 00:33:07 -04:00
• a6bad6ab70 Merge pull request #11 from wedarobi/master fig02 2020-03-19 22:13:17 -04:00
• a3ddf65661 Cleanups, add trailing commas to several multi-line arrays/structs Thar0 2020-03-20 01:29:12 +00:00
• ad417f8824 Remove duplicate en_lightbox syms added by merge Thar0 2020-03-20 01:04:19 +00:00
• f263ce0b9c Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Obj_Bombiwa Thar0 2020-03-20 00:52:28 +00:00
• adbcbb6434 Decompile Obj_Bombiwa Thar0 2020-03-20 00:50:20 +00:00
• c0965dcbe6 Merge pull request #5 from mzxrules/z_debug Roman971 2020-03-20 01:44:59 +01:00
• 8a74686890 Changes wed 2020-03-20 11:25:53 +11:00
• 858e937519 tweak defines mzxrules 2020-03-19 20:10:32 -04:00
• 2d00e319fe Merge branch 'master' into ovl_Demo_Geff Ethan Roseman 2020-03-19 20:07:08 -04:00
• db822f7d0f More Ethan Roseman 2020-03-19 20:06:46 -04:00
• 9f434ad733 Merge pull request #12 from Random06457/master Roman971 2020-03-20 01:01:21 +01:00
• 011027bded Changes in PR #12 Random 2020-03-20 00:31:50 +01:00
• 5dc74f3938 Merge pull request #9 from Faschz/ovl_En_Lightbox Roman971 2020-03-20 00:03:32 +01:00
• c931cd5837 Decompiled z_title.c Random 2020-03-19 23:29:33 +01:00