2451 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dragorn421	42bd606865	Merge remote-tracking branch 'upstream/main' into meta_new_assets_2025	2025-02-28 17:53:06 +01:00
cadmic	3d1af54628	Revert "Always use LF line endings, even on Windows (#2489)" (#2492) ... This reverts commit 2b30c61a26.	2025-02-27 20:52:49 -05:00
mzxrules	cf1a39c26f	Reduce dependencies on global.h (10) (#2490) ... * reduce z64.h size * fix z_cheap_proc.inc.c * ,bss * remove temp delcaration	2025-02-26 17:18:30 -05:00
cadmic	2b30c61a26	Always use LF line endings, even on Windows (#2489)	2025-02-25 23:09:54 -05:00
Dragorn421	e6a9ad9620	Fixup includes (#2483)	2025-02-24 21:18:24 -05:00
mzxrules	2e4c42719b	Reduce dependencies on global.h (9) (#2488) ... * split game states * split all GameState headers * match fig names * deduplicate headers from bad merge * split z64actor.h into z64actor_profile.h, z_actor_dlftbls.h * fix compile error * .bss	2025-02-24 20:55:55 -05:00
Dragorn421	70fde8ac3b	Macroify MML opcodes (#2485) ... * add defines for sequence opcodes * name aseq_cmd_id defines from the corresponding macro names * ASEQ_CMD_ID_ -> ASEQ_OPC_ * remove previous opcode defines * ASEQ_OPC_LAYER_STEP3_ -> ASEQ_OPC_LAYER_ * sync with MM and fixups * format * ASEQ_OPC_ -> ASEQ_OP_ * ASEQ_OP_CTRLFLOW_ -> ASEQ_OP_ * tab-align * ASEQ_OP_SEQUENCE_ -> ASEQ_OP_SEQ_ * ASEQ_OP_CHANNEL_ -> ASEQ_OP_CHAN_ * define MML_VERSION in the Makefile for seqplayer.c	2025-02-23 06:43:15 -05:00
Dragorn421	fa67355f8f	.bss	2025-02-22 21:28:15 +01:00
Dragorn421	637f862a89	Merge branch 'main' into meta_new_assets_2025	2025-02-22 21:27:38 +01:00
fig02	5ddb3e68b6	Clean out z64.h (#2484) ... * Clean out z64.h * fix version include * overlay.h * pr suggestion * try fixing main.c * add back forward declare * fix bss * header guard * prefix	2025-02-22 14:01:09 -05:00
Dragorn421	d18a0c69ae	.bss	2025-02-20 19:18:16 +01:00
Dragorn421	b59c190521	Merge branch 'main' into meta_new_assets_2025	2025-02-20 14:40:46 +01:00
fig02	2e4d7a1101	Create headers for Game States (#2482) ... * make headers for gamestates * fixes * fixes 2 * bss	2025-02-20 07:50:13 -05:00
Dragorn421	aec15115ed	.bss	2025-02-20 11:29:07 +01:00
fig02	4cfb5f05a0	Use "entry" terminology in map select (#2479) ... * use entry terminology in map select * missed one	2025-02-19 19:59:21 -05:00
Dragorn421	e79f3e344c	Merge branch 'main' into meta_new_assets_2025	2025-02-19 14:02:25 +01:00
mzxrules	981af4b6af	Reduce overlay dependencies on global.h (8) (#2478) ... * move variables into z64environment.h * z_room.h * z64sram.h, z64ss_sram.h, z64font.h, kanread.h * z64lifemeter.h, z64debug.h, debug_arena.h * buffers.h * remove z_bgcheck global * gamealloc.h * suggestions * .bdd	2025-02-19 05:54:39 -05:00
Dragorn421	5861158d64	fix optional rich usage	2025-02-18 21:38:25 +01:00
Dragorn421	e5cc601482	import rich, except ImportError s	2025-02-18 21:31:51 +01:00
Dragorn421	c39fb7f1b8	multiprocessing.get_context("fork")	2025-02-18 21:31:29 +01:00
Dragorn421	9614a08708	use enum names in SCENE_CMD_SKYBOX_SETTINGS	2025-02-18 17:50:50 +01:00
Dragorn421	c3cc5d324a	make interrupting less jank by making child processes ignore sigint	2025-02-18 17:30:00 +01:00
Dragorn421	9765bd2561	with -j, update last_extracts.json as each job completes rather than only if all complete	2025-02-18 17:27:38 +01:00
Dragorn421	9d8ddddedd	move -j at the end of calling extraction script	2025-02-18 17:15:10 +01:00
Dragorn421	ccb20a00b3	fix n64texconv python bindings memory management	2025-02-18 17:10:47 +01:00
Dragorn421	ddec1a317c	allow -j N	2025-02-18 14:28:54 +01:00
Dragorn421	b06e4f4095	bss	2025-02-18 12:16:29 +01:00
Dragorn421	efd480b82f	add docs on how images are handled	2025-02-18 11:48:40 +01:00
Dragorn421	61ed5b84c2	simplify palettes with single user (ci images with a non-shared palette)	2025-02-18 11:24:33 +01:00
Dragorn421	4ac3852503	dont try to build zapd (rmd)	2025-02-18 11:23:41 +01:00
Dragorn421	4ea01b24ae	CC0 license (and some import cleanup)	2025-02-18 10:07:20 +01:00
Dragorn421	ba29f9c2c6	remove rule to generate dmadata_table.py	2025-02-18 09:57:28 +01:00
Dragorn421	d2624056d9	format	2025-02-18 09:48:46 +01:00
Dragorn421	26c9e8688e	rm ZAPD	2025-02-18 09:26:15 +01:00
Dragorn421	29b5985f79	rm tools/assets/bin2c	2025-02-18 09:25:34 +01:00
Dragorn421	72c566a7fa	C build_from_png	2025-02-18 09:21:48 +01:00
Dragorn421	f1987ded85	Merge branch 'main' into meta_new_assets_2025	2025-02-18 08:29:50 +01:00
Tharo	3d61fb85ef	Add n64texconv and bin2c tools to convert extracted .png and .bin to C arrays during build (#2477) ... * n64texconv and bin2c * mv tools/n64texconv tools/assets/ * fix * more light fixes * Silence -Wshadow for libimagequant * Add reference counting gc for palette objects in python bindings * Fix missing alignment in n64texconv_*_to_c functions Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Check palette size in n64texconv_image_from_png * accept memoryview as well as bytes for binary data * minimal doc on n64texconv_quantize_shared * fix a buffer size passed to libimagequant * assert pal count <= 256 on png write * Disable palette size check for input pngs, ZAPD fails the check * No OpenMP for clang * When reading an indexed png into a CI format, requantize if there are too many colors for the target texel size --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>	2025-02-17 17:09:42 -05:00
Dragorn421	751d08050f	Merge branch 'main' into meta_new_assets_2025	2025-02-17 15:48:09 +01:00
Dragorn421	ec30dcbe4e	assets xmls fixes (#2476)	2025-02-16 18:10:26 -05:00
Dragorn421	7b503e9e8c	Merge branch 'main' into meta_new_assets_2025	2025-02-16 23:03:51 +01:00
mzxrules	652478c338	Reduce overlay dependencies on global.h (7) (#2472) ... * z64env_flags, z64quest_hint_commands * z64cutscene_spline, z64save.h moved from z64.h * bss * pr suggestion * bss * suggestions	2025-02-16 15:33:55 -05:00
Dragorn421	43d93c112b	handle hackmode_syotes_room, fix compile	2025-02-16 14:27:53 +01:00
Dragorn421	b952b2db1e	some cleanup, use gNameTex_WIDTH/HEIGHT macros in dlists	2025-02-16 13:14:49 +01:00
Dragorn421	7cb604387b	assets xmls fixes	2025-02-16 13:14:10 +01:00
Dragorn421	137e178790	fix assembly warning in normalize.s (#2473)	2025-02-15 21:21:07 -05:00
cadmic	aba3720d62	Use enums for settings in SRAM header (#2429) ... * Use enums for settings in SRAM header * Fix bss * Uglify z_en_mag to match ique	2025-02-15 19:36:19 -05:00
Dragorn421	e1b558df4d	finish xml spec doc	2025-02-16 00:44:13 +01:00
Dragorn421	a0108c1630	fix missing braces in n64dd_error_textures.c	2025-02-15 22:37:58 +01:00
cadmic	a64fd8dea8	fix_bss.py: Try to handle one-past-the-end pointers (#2471) ... * fix_bss.py: Try to handle one-past-the-end pointers * Proofread	2025-02-15 16:24:25 -05:00