9258 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
MascaraSnake	08895ef751	Fixed/clarified some flag descriptions in the ZB config	2019-12-28 08:43:27 +01:00
MascaraSnake	f83d0fe3a1	Fixed/clarified some flag descriptions in the ZB config	2019-12-28 08:42:16 +01:00
GoldenTails	f62579811b	Fixed messed up comparison.	2019-12-27 23:51:13 -06:00
James R	afc78fb56a	Only return if we damaged the monitor	2019-12-27 14:48:55 -08:00
Alam Ed Arias	94bb6655a5	Merge branch 'master' into next	2019-12-27 17:08:16 -05:00
James R	152a63b682	Merge branch 'rotsprite3' into 'next' ... More rollangle changes See merge request STJr/SRB2!582	2019-12-27 16:49:21 -05:00
James R	69ad41e58e	Merge branch 'skinusable-fix' into 'next' ... Fix edge case with R_SkinUsable See merge request STJr/SRB2!573	2019-12-27 16:49:06 -05:00
Jaime Passos	1fb244d87f	GTR_HIDETIME, not GTR_TAG	2019-12-27 18:24:08 -03:00
Jaime Passos	e03eaa554b	In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings.	2019-12-27 17:22:55 -03:00
Jaime Passos	4b2c88fab8	Fix CoopLives_OnChange.	2019-12-27 17:15:23 -03:00
Jaime Passos	3b341245f1	Same deal, but for starposts.	2019-12-27 17:14:56 -03:00
Jaime Passos	1f96f70173	Preparing for the inevitable gametype rule that will handle cooplives...	2019-12-27 17:08:20 -03:00
Jaime Passos	ed29efd9eb	ST_drawLivesArea stuff.	2019-12-27 16:58:55 -03:00
Monster Iestyn	1d04001fdf	use P_SetTarget to assign a value to th->target	2019-12-27 19:24:00 +00:00
Monster Iestyn	282fe7667c	added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic	2019-12-27 19:10:14 +00:00
Alam Ed Arias	c394ad056c	use size_t to count the sprites	2019-12-27 13:20:58 -05:00
Alam Ed Arias	0caa08defd	fread and fwrite use size_t, not int	2019-12-27 13:08:26 -05:00
Alam Ed Arias	ff004c4cf6	we only need link on unix systems	2019-12-27 13:05:15 -05:00
Jaime Passos	6b8839d5aa	burst emeralds with GTR_MATCHEMERALDS	2019-12-27 12:34:35 -03:00
Jaime Passos	f0d58368f9	look for GTR_LIVES rule instead of coop/competition gametype	2019-12-27 12:29:21 -03:00
Jaime Passos	f8eed7171a	add G_CompetitionGametype(void)	2019-12-27 12:28:00 -03:00
Jaime Passos	5c023739e6	change this > to >=	2019-12-27 12:23:50 -03:00
Jaime Passos	1d0d404922	check if the gametype allows spectators to allow jump key respawn	2019-12-27 12:17:38 -03:00
Jaime Passos	9613bdeca6	use GTR_DEATHMATCHSTARTS	2019-12-27 12:14:33 -03:00
MascaraSnake	45c432462e	Merge branch 'why-inline' into 'master' ... I got a compiler warning from P_PlayerHitsPlayer being too big See merge request STJr/SRB2!581	2019-12-27 02:12:01 -05:00
MascaraSnake	e71d07fa8e	Merge branch 'next' into kill-zshift ... # Conflicts: # src/p_mobj.c	2019-12-27 08:11:04 +01:00
MascaraSnake	6a85e40232	Merge branch 'zb-config-refactor' into 'next' ... Zone Builder configuration refactor See merge request STJr/SRB2!570	2019-12-27 02:04:22 -05:00
Jaime Passos	56e94182d5	P_SetupCamera funny	2019-12-27 02:07:13 -03:00
Jaime Passos	51404130af	Respawn delay gametype rule	2019-12-27 01:44:27 -03:00
Jaime Passos	5ea43aa023	Fix sprite rotation crashes.	2019-12-27 00:37:40 -03:00
James R	855e61f59e	Pop monitors properly so Metal doesn't destroy enemy team's monitors	2019-12-26 19:27:25 -08:00
Jaime Passos	96609e45ae	OpenGL funny	2019-12-27 00:02:30 -03:00
Jaime Passos	2d3f45de0d	Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch	2019-12-26 23:53:03 -03:00
Jaime Passos	eca5be52b2	And the sound test	2019-12-26 23:52:42 -03:00
Jaime Passos	956905c8f4	Same deal, but for the level platter and save select screen	2019-12-26 23:49:31 -03:00
James R	76a1a80d71	Save the renderer	2019-12-26 18:44:02 -08:00
James R	e19d0877e8	Merge branch 'time' into 'master' ... haha log files See merge request STJr/SRB2!567	2019-12-26 21:43:46 -05:00
Jaime Passos	644e41d90c	Handle character select screen correctly after a renderer switch	2019-12-26 23:39:40 -03:00
James R	7df6a3090a	Lua CV_FindVar function ... (cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)	2019-12-26 18:30:34 -08:00
James R	e49d12b731	Expose CV_FindVar ... (cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)	2019-12-26 18:30:34 -08:00
Jaime Passos	e617f35182	PU_PATCH funny	2019-12-26 23:26:43 -03:00
James R	4865a19057	One more optimization	2019-12-26 18:23:01 -08:00
James R	9673439628	e	2019-12-26 18:20:48 -08:00
James R	4959d52ae0	Make cv_renderer CV_NOLUA instead of hidden!!!	2019-12-26 18:15:52 -08:00
James R	cb29a9dd0a	CV_NOLUA for when a cvar should not be changed via Lua	2019-12-26 18:15:19 -08:00
James R	f26bdf00fe	A system to encode flags in the command buffer	2019-12-26 18:12:10 -08:00
Jaime Passos	da1718f93c	Avoid possible overflows in the rotsprite arrays.	2019-12-26 21:49:36 -03:00
Jaime Passos	4b653a0b12	Remove the min() and max() calls.	2019-12-26 21:36:35 -03:00
Jaime Passos	56fd29a42a	stuff	2019-12-26 21:27:30 -03:00
James R	1dac3d174e	Merge remote-tracking branch 'origin/master' into next	2019-12-26 15:35:53 -08:00