933 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
JoshDuMan	234b954473	Bring up to master.	2020-03-24 14:38:55 -04:00
shawlucas	8fa6b94dca	Merge branch 'master' of https://github.com/zeldaret/oot	2020-03-24 11:13:30 -07:00
KrimtonZ	f2c65d615b	fix jenkins build errors, small prototype update	2020-03-24 13:06:15 -05:00
KrimtonZ	ee356fe203	run clang on functions.h	2020-03-24 12:29:59 -05:00
KrimtonZ	db3cfe1b61	use clang, modify z64animation.h and z64dma.h to use open braces on newline	2020-03-24 12:16:13 -05:00
KrimtonZ	2b0b6a6c12	readd merge conflicts	2020-03-24 11:57:01 -05:00
KrimtonZ	8bbac143cd	Merge branch 'master' into skelanime	2020-03-24 11:56:37 -05:00
KrimtonZ	ac4a51bf8f	Rename SkelAnime functions, which in turn modified a bunch of actor functions. Move necessary skelanime function calls to functions.h, remove unnecessary skelanime functions from functions.h, other skelanime cleanup	2020-03-24 11:52:12 -05:00
Ethan Roseman	b3f865dc58	Merge branch 'master' into ovl_En_Ru2_new	2020-03-24 00:30:09 -04:00
Ethan Roseman	2fcc450890	Merge branch 'master' into ovl_Bg_Spot09_Obj	2020-03-24 00:20:17 -04:00
Ethan Roseman	ba31478e23	Spacing	2020-03-24 00:18:33 -04:00
Ethan Roseman	a8b19baf6e	Format	2020-03-24 00:16:35 -04:00
Ethan Roseman	c4bb9bed4c	Done	2020-03-24 00:16:01 -04:00
fig02	4eb7f023f3	Merge pull request #30 from Roman971/format-fixes ... Fix some issues with the formatter	2020-03-23 23:04:32 -04:00
Lucas Shaw	04409a6885	Merge branch 'master' of https://github.com/shawlucas/oot	2020-03-23 19:16:35 -07:00
fig02	5160cc1954	Merge pull request #31 from pixel-stuck/master ... fix final non-matching in fault_drawer.c	2020-03-23 20:21:50 -04:00
dark-samus	4bbbdc39fd	use a better variable name	2020-03-23 20:04:09 -04:00
dark-samus	94e4c2b91f	fix final non-matching in fault_drawer.c	2020-03-23 19:46:07 -04:00
Roman971	3acb30694b	Fix actor init vars brace style under bootstrap comments	2020-03-24 00:35:35 +01:00
Roman971	9a63f1d4d1	Run formatter with changes	2020-03-24 00:35:35 +01:00
Roman971	5b42bda4eb	Fix format.sh to run clang-tidy inside NON_MATCHING functions	2020-03-24 00:35:35 +01:00
fig02	875d962b4c	Merge pull request #29 from Roman971/check-changes ... Run gcc checks with NON_MATCHING and Update progress script	2020-03-23 19:21:21 -04:00
Roman971	bd9dff6b72	Update progress script to account for boot handwritten asm	2020-03-23 23:20:34 +01:00
Roman971	da151300f7	Run gcc checks with NON_MATCHING defined	2020-03-23 23:20:34 +01:00
Roman971	c2b9feb5d3	Merge pull request #27 from ethteck/ovl_Bg_Haka_Megane ... Decompiled ovl_Bg_Haka_Megane	2020-03-23 23:19:57 +01:00
fig02	78a4684e32	Merge pull request #28 from Roman971/z_path.c ... Rename/document some small files and Decompile z_path.c	2020-03-23 18:09:18 -04:00
shawlucas	09afb8d552	Merge branch 'master' of https://github.com/zeldaret/oot	2020-03-23 14:41:50 -07:00
fig02	8e316933d5	Merge pull request #25 from shawlucas/ovl_Bg_Zg ... ovl_Bg_Zg OK	2020-03-23 17:39:32 -04:00
Ethan Roseman	1abc15910f	oopz	2020-03-23 17:38:22 -04:00
Ethan Roseman	82b1555295	PR fix	2020-03-23 17:37:40 -04:00
Ethan Roseman	4ab558d628	Almost done	2020-03-23 17:33:12 -04:00
KrimtonZ	0d93e48035	skelanime WIP, name Matrix_TranslateThanRotateZYX, match Matrix_Translate	2020-03-23 16:31:24 -05:00
Roman971	7fcc79fc4d	Decompile Path_CopyLastPoint	2020-03-23 21:20:30 +01:00
Roman971	e88ea64835	Decompile Path_OrientAndGetDistSq	2020-03-23 21:19:54 +01:00
Roman971	a9d4fec113	Decompile Path_GetByIndex	2020-03-23 21:19:24 +01:00
Roman971	d2729f9d88	Split z_path.c and Rename some small files and functions	2020-03-23 21:18:53 +01:00
shawlucas	7bc9d3863c	Made more suggested changes	2020-03-23 13:00:47 -07:00
shawlucas	032a8de42f	Made suggested changes	2020-03-23 12:59:58 -07:00
Ethan Roseman	ea3f70cd68	Formatting	2020-03-23 15:25:23 -04:00
Ethan Roseman	1042a72fd2	Done	2020-03-23 15:23:50 -04:00
shawlucas	ae0401e310	Merge branch 'master' of https://github.com/zeldaret/oot into ovl_Bg_Zg	2020-03-23 12:10:17 -07:00
shawlucas	3c53052726	updated ovl_bg_zg formatting	2020-03-23 12:10:06 -07:00
Ethan Roseman	c79cbf7d9c	Merge branch 'master' into ovl_Bg_Haka_Megane	2020-03-23 14:43:28 -04:00
fig02	2f3f556bfb	Merge pull request #26 from pixel-stuck/master ... match the final non-matching in boot!	2020-03-23 07:08:23 -04:00
fig02	1ea7fe8165	merge master	2020-03-23 06:57:38 -04:00
dark-samus	7db0ed672a	remove asm for Yaz0_DecompressImpl	2020-03-23 06:54:52 -04:00
fig02	7116cca243	merge master	2020-03-23 06:40:42 -04:00
dark-samus	385f77fb48	match the final non-matching in boot!	2020-03-23 06:37:54 -04:00
Lucas Shaw	a3ba02618b	Added description	2020-03-22 23:40:12 -07:00
Lucas Shaw	6a45dcba7f	Fixed merge conflict	2020-03-22 22:57:24 -07:00