1573 commits

Author	SHA1	Message	Date
Sal	60745502f2	Merge branch 'additive-subtractive-hud' into 'master' ... Additive and subtractive for the HUD See merge request KartKrew/Kart!360	2021-02-02 18:23:49 -05:00
Sally Coolatta	ec1bcd73dc	Merge branch 'additive-subtractive-hud' into pos-hud-tweaks	2021-02-02 18:23:07 -05:00
Sally Coolatta	237f86749d	Merge branch 'master' into finish-line-beam	2021-02-01 23:31:19 -05:00
Sryder	a06e4da65b	Additive and subtractive for the HUD	2021-02-01 17:53:27 +00:00
Latapostrophe	aee76fe88d	expose karthud to lua. bruh.	2021-01-21 22:18:00 +01:00
Sally Coolatta	2af75a2bd1	Fix merge conflicts	2021-01-11 00:06:34 -05:00
Sally Coolatta	a14cf1f029	Merge branch 'master' into new-menus	2021-01-10 21:31:09 -05:00
Sally Coolatta	cfda66103d	Merge branch 'master' into just-tumble	2021-01-06 23:02:51 -05:00
Latapostrophe	74a39837bb	Merge conflicts	2021-01-06 18:33:42 +01:00
GoldenTails	d0b1a48806	Make caret coloring support letters.	2020-12-06 04:28:12 -06:00
GoldenTails	d673604b48	Split dehacked.c into multiple files.	2020-11-23 21:42:26 -06:00
James R	0d4fc032c5	Merge branch 'remove-unused-music-types' into 'next' ... Remove unused music type enums See merge request STJr/SRB2!1253	2020-11-22 17:16:35 -05:00
Jaime Ita Passos	be274a4fa9	Merge branch 'next' into spritestuff2	2020-11-19 00:52:43 -03:00
Sally Coolatta	d0ca3b78c1	Merge branch 'master' into battle-rethink	2020-11-18 17:49:06 -05:00
Sal	b2eb64ac09	Merge branch 'roll-and-tilt' into 'master' ... Roll & pitch replace modeltilt See merge request KartKrew/Kart!326	2020-11-17 20:03:48 -05:00
Sally Coolatta	e16c7d722f	Cherry-pick e1b265df2	2020-11-16 19:55:28 -05:00
Sally Coolatta	14b379fd27	Cherry-pick 4eb69a664	2020-11-16 19:52:26 -05:00
Sally Coolatta	ef0da6ce9c	Finished bumper destruction	2020-11-16 02:38:13 -05:00
Sally Coolatta	ae5d5abe24	Chaos Emeralds now sparkle	2020-11-16 00:51:00 -05:00
Sally Coolatta	0dc0ff8e6f	More finalized Chaos Emerald visuals	2020-11-15 15:11:13 -05:00
Sally Coolatta	42f411399a	Add bumper explosion effect	2020-11-15 12:56:03 -05:00
Sally Coolatta	827a1b5fca	Refactor stealing & destroying bumpers ... - Prevents being able to farm extra bumpers off of karma players - Paves the way for bumper destroy animation later	2020-11-15 06:25:38 -05:00
James R	66edde2556	Remove unused music type enums	2020-11-14 15:56:40 -08:00
Sally Coolatta	56a20d05df	Merge branch 'master' into battle-rethink	2020-11-11 00:11:18 -05:00
Steel Titanium	8804e6063a	Remove unused music types	2020-11-08 21:33:12 -05:00
Sally Coolatta	39acb46903	Last 3/4s: Spindash wind	2020-11-08 15:32:30 -05:00
Sally Coolatta	bffc367c36	Second-half spindash dust effect	2020-11-08 14:14:13 -05:00
Sally Coolatta	e6a9e5a68e	Merge branch 'master' into new-menus	2020-11-08 02:49:28 -05:00
Sally Coolatta	0e28470228	Merge master	2020-11-08 02:34:24 -05:00
Sally Coolatta	11872504ae	Merge master	2020-11-08 01:26:40 -05:00
Jaime Passos	8599447c70	Remove RF_VOXELSPRITE	2020-11-05 00:44:10 -03:00
Sally Coolatta	91ed67bece	Start on Chaos Emeralds ... Functional! However, you don't drop them yet.	2020-11-01 23:44:54 -05:00
Steel Titanium	115b509348	Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs ... # Conflicts: # src/dehacked.c	2020-11-01 23:22:03 -05:00
James R	cbafb906db	Merge branch 'lua_expose-gamestate' into 'next' ... Expose gamestate to Lua See merge request STJr/SRB2!1229	2020-11-01 22:57:52 -05:00
Steel Titanium	ef1ca357de	Expose more music functions to Lua	2020-10-31 21:15:41 -04:00
Steel Titanium	00f9e777af	Expose gamestate to Lua	2020-10-31 16:36:15 -04:00
Sally Coolatta	875493d778	Remove the need for setting rotation axis in spriteinfo for models ... Now it just does it like Software	2020-10-30 02:15:49 -04:00
James R	81b8abed53	Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life	2020-10-28 21:51:28 -07:00
Jaime Passos	d2c000b252	Implement an "ignore colormaps" sprite rendering flag	2020-10-27 19:54:50 -03:00
Jaime Passos	cdc4a6d86e	Implement blend modes	2020-10-27 00:03:41 -03:00
Sally Coolatta	62139f144a	Paper item spawners ... Code is a little horrendous in a few places but I will hopefully fix later :V	2020-10-26 22:20:02 -04:00
Sryder	01a37668bc	Add missing MFD_TRANSSUB to dehacked	2020-10-26 11:22:27 +00:00
Sryder	11386e12ba	Keep NUMTRANSMAPS what it was, instead add NUMEFFECTMAPS to end of enum ... Should have easier merging and be less likely to break current effects.	2020-10-26 11:18:53 +00:00
Sryder	a585d3c9d1	Revert "Fix various things that used NUMTRANSMAPS for the number of translucent trans maps" ... This reverts commit dc453fbbda.	2020-10-26 11:07:17 +00:00
Sryder	dc453fbbda	Fix various things that used NUMTRANSMAPS for the number of translucent trans maps	2020-10-25 23:19:20 +00:00
Sryder	488ad70da3	Merge branch 'the-scary-22-merge' of git@git.do.srb2.org:KartKrew/Kart.git into additive-transmap	2020-10-25 14:43:44 +00:00
Sally Coolatta	2509d5a29c	Merge branch 'the-scary-22-merge' into battle-rethink	2020-10-24 21:39:32 -04:00
Sally Coolatta	7c2bd0d1c2	Merge remote-tracking branch 'srb2/next' into the-scary-22-merge	2020-10-24 20:50:58 -04:00
Sally Coolatta	9b6aa946ea	Merge remote-tracking branch 'srb2/master' into the-scary-22-merge	2020-10-24 19:28:06 -04:00
Sally Coolatta	fda698a290	Merge master	2020-10-24 18:34:07 -04:00