10362 commits

Author	SHA1	Message	Date
Nev3r	38bc937887	Merge branch 'spritestuff2-archiving-fix' into 'next' ... Fix archived mobjs having no default blend mode and sprite scales See merge request STJr/SRB2!1300	2020-12-16 08:57:36 -05:00
Nev3r	ad03fe852a	Merge branch 'text-color' into 'next' ... Improved text colormaps (Closes #222 and #359) Closes #222 and #359 See merge request STJr/SRB2!1202	2020-12-16 08:50:30 -05:00
Zippy_Zolton	ffef054dee	magenta and green sonicx	2020-12-15 22:19:57 -06:00
James R	f3fa2c4f32	Merge branch 'shieldless' into 'next' ... Add new skin flag SF_NOSHIELDABILITY See merge request STJr/SRB2!1331	2020-12-15 21:00:53 -05:00
James R	3a7941391f	Merge branch 'amys' into 'next' ... fix amy meeting herself in mario mode See merge request STJr/SRB2!1330	2020-12-15 20:57:16 -05:00
James R	ec52d9bb73	Merge branch 'picfmt-fixes' into 'next' ... Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats See merge request STJr/SRB2!1324	2020-12-15 20:55:52 -05:00
James R	cf454b0d77	Merge branch 'dusty' into 'next' ... Make fiery spindust fullbright See merge request STJr/SRB2!1317	2020-12-15 20:53:29 -05:00
Zippy_Zolton	1b4b7271ea	Merge branch 'next' of https://github.com/STJr/SRB2 into text-color	2020-12-15 19:51:40 -06:00
James R	8b1c1a7ac2	Merge branch 'drain-antiri' into 'next' ... Make Ring Drain sectors play the depletion sound instead of the ring sound See merge request STJr/SRB2!1315	2020-12-15 20:51:39 -05:00
James R	ef3102e75a	Merge branch 'gl-colormap-update' into 'next' ... Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370) Closes #187, #247, #301, and #370 See merge request STJr/SRB2!1301	2020-12-15 20:50:45 -05:00
James R	bde40c36b1	Merge branch 'team-elementalfire' into 'next' ... Player-Colored Elemental Fire for competitive gametypes See merge request STJr/SRB2!1312	2020-12-15 20:47:45 -05:00
James R	4ffe8f429d	Merge branch 'intermission-double-free-fix' into 'next' ... Fix double free occuring when unloading the intermission patches See merge request STJr/SRB2!1304	2020-12-15 20:44:57 -05:00
James R	b98d27a1ba	Merge branch 'circuit-finallap' into 'next' ... Final lap text for circuit See merge request STJr/SRB2!1303	2020-12-15 20:42:59 -05:00
James R	57155643b1	Merge branch 'gme-spc-fix' into 'next' ... Fix SPC looping on libgme versions >= 0.6.3 See merge request STJr/SRB2!1302	2020-12-15 20:40:10 -05:00
katsy	284e32074d	GETFLAG	2020-12-14 20:23:24 -05:00
Zippy_Zolton	d90d18f33c	fixes spaces	2020-12-14 16:14:20 -06:00
Zippy_Zolton	a5d7823f5e	Redone colormaps by SonicX8000	2020-12-14 12:52:24 -06:00
katsy	a39949077b	Merge remote-tracking branch 'stjr/next' into dusty	2020-12-14 05:39:35 -06:00
katsy	ead6180ef5	lol	2020-12-14 05:32:51 -06:00
katsy	03c9543db9	you too	2020-12-14 04:06:28 -05:00
katsy	f76803d8c0	go away whitespace	2020-12-14 04:05:14 -05:00
katsy	3e73577b8e	add checks for new flag, make emergency jump call shieldspecial	2020-12-14 04:03:14 -05:00
katsy	e6aff20076	ditto	2020-12-14 04:02:17 -05:00
katsy	708fc52543	add SF_NOSHIELDABILITY	2020-12-14 04:01:50 -05:00
katsy	d37fd1aa23	remove amy	2020-12-14 02:36:00 -05:00
Zippy_Zolton	f30ab44564	Merge branch 'next' of https://github.com/STJr/SRB2 into text-color	2020-12-14 00:16:38 -06:00
Jaime Ita Passos	940f134717	Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats	2020-12-14 00:53:42 -03:00
James R	375c83d492	Merge branch 'fix-playintro-crash' into 'next' ... Fix intro crash See merge request STJr/SRB2!1310	2020-12-13 22:17:25 -05:00
James R	55bc602dbd	Merge branch 'apng-downscale' into 'next' ... Add aPNG downscaling See merge request STJr/SRB2!1197	2020-12-12 17:39:56 -05:00
James R	e305de037c	Merge branch 'player-speed' into 'next' ... Make player->speed and other things use R_PointToDist2 See merge request STJr/SRB2!1309	2020-12-12 17:38:02 -05:00
James R	394b9a752c	Merge branch 'credits-229' into 'next' ... Add Zolton and Ors to the credits See merge request STJr/SRB2!1308	2020-12-12 17:35:29 -05:00
James R	956fd338f0	Merge branch 'oldguards' into 'next' ... Kill remaining HAVE_BLUA and SEENAMES See merge request STJr/SRB2!1319	2020-12-12 17:34:04 -05:00
James R	20e0d99ea0	Remove trailing whitespace	2020-12-12 02:40:46 -08:00
James R	887f4a0919	Merge branch 'master' into next	2020-12-12 02:38:51 -08:00
James R	19af2b9afe	Remove trailing whitespace	2020-12-12 02:37:03 -08:00
James R	41f1b3b97c	Kill SEENAMES	2020-12-12 02:11:23 -08:00
katsy	cedbb8c0de	Update info.c	2020-12-11 23:39:42 -05:00
katsy	d488ff64e0	make fire spindust dust fullbright	2020-12-11 20:59:14 -05:00
Zippy_Zolton	7c1063ed86	Make Ring Drain sectors play the depletion sound instead of the ring sound	2020-12-11 12:34:30 -06:00
Zippy_Zolton	b153276057	Player-Colored Elemental Fire for competitive gametypes	2020-12-10 20:37:50 -06:00
Jaime Ita Passos	d69430dd04	Fix intro crash	2020-12-10 22:01:53 -03:00
Zippy_Zolton	3c041d7304	snailer	2020-12-10 19:01:09 -06:00
Jaime Ita Passos	0d81a70397	Fix ERZ3 mode	2020-12-10 21:55:22 -03:00
Zippy_Zolton	59f7b40497	Make player->speed use R_PointToDist2	2020-12-10 16:09:43 -06:00
James R	15d4732015	Credits: add Zolton and Ors to the programming section	2020-12-10 13:40:47 -08:00
James R	b899610f0f	Merge branch 'lua-skinsprites' into 'next' ... Lua: Allow access to skin.sprites[] See merge request STJr/SRB2!1238	2020-12-10 15:49:48 -05:00
James R	60ce05de38	Merge branch 'fix-gl-draw-cropped' into 'next' ... Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides. See merge request STJr/SRB2!1297	2020-12-10 15:44:51 -05:00
James R	8cc312a16d	Merge branch 'saloondoor-revengeance' into 'next' ... Saloon door fixes (closes #394) Closes #394 See merge request STJr/SRB2!1296	2020-12-10 15:43:31 -05:00
James R	073c011589	Merge branch 'caret-color-letter' into 'next' ... Make caret coloring support letters. See merge request STJr/SRB2!1295	2020-12-10 15:41:02 -05:00
James R	a83a78ac88	Merge branch 'brak' into 'next' ... Fix brak barrier size (Closes #139) Closes #139 See merge request STJr/SRB2!1294	2020-12-10 15:39:42 -05:00