1214 commits

Author	SHA1	Message	Date
Tatsuru	df9809f3d7	The dumbass forgot NiGHTS mode is also a carry power	2019-12-31 20:13:16 -03:00
Tatsuru	402b58ce42	Fix MP Special Stages crashing if a player is being carried when it ends	2019-12-31 19:38:11 -03:00
James R	54bcde1376	Merge branch 'metal-fume-opacity' into 'next' ... Make Metal Sonic's jet fume opaque when re-emerging from water See merge request STJr/SRB2!612	2019-12-31 17:16:14 -05:00
fickleheart	77ba835f4f	Merge branch 'next' into next-newcontrols ... # Conflicts: # src/g_game.c # src/p_setup.c	2019-12-31 12:58:36 -06:00
fickleheart	1419ec72d5	Software FOV ported from kart ... also fixes high software FOVs having buggy walls	2019-12-31 11:22:05 -06:00
lachwright	b575e7ab47	Make elemental crop circle flames obey player gravity	2019-12-31 18:06:40 +08:00
lachwright	8132905436	Make Metal Sonic's jet fume opaque when re-emerging from water	2019-12-31 17:26:35 +08:00
James R	3bcfe5ae99	Merge branch 'dashspeed-fix' into 'next' ... Cap dashspeed between mindash and maxdash before revving. See merge request STJr/SRB2!565	2019-12-31 01:31:43 -05:00
fickleheart	5f50f7e8ae	Fix spying on simple mode players having dumb camera angles	2019-12-30 15:44:52 -06:00
fickleheart	758bb8f3ae	Update playstyle menu handling to use analog/directionchar combo	2019-12-30 15:15:37 -06:00
fickleheart	e0d09a457e	Convert simple movement to directionchar+analog ... Analog + no directionchar is old analog (now known as CS_LMAOGALOG because lmao if you still use it).	2019-12-30 15:05:24 -06:00
fickleheart	61a8f715ac	Convert analog/directionchar cvars into 2-long arrays	2019-12-30 14:01:14 -06:00
fickleheart	f8599ffcb9	Save separate camera settings for standard/simple modes	2019-12-30 12:10:38 -06:00
fickleheart	b4924fdfed	Fix camera reset snap in simple controls	2019-12-30 11:22:54 -06:00
fickleheart	be9384ddd9	Merge branch 'master' into newcontrols ... # Conflicts: # src/d_netcmd.c # src/g_game.c # src/g_game.h # src/m_menu.c	2019-12-30 10:47:09 -06:00
Zachary McAlpin	a91f008d1c	Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object	2019-12-28 17:40:47 -06:00
Zachary McAlpin	930cda3469	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-28 17:32:27 -06:00
Sally Cochenour	31304eda3e	Merge branch 'next' into oglshaderport	2019-12-28 13:58:41 -05:00
GoldenTails	655de1aca8	Fixed messed up comparison.	2019-12-27 23:51:13 -06:00
Jaime Passos	62d79eef2a	Same deal, but for starposts.	2019-12-27 17:14:56 -03:00
Jaime Passos	ff80c4ef4d	Preparing for the inevitable gametype rule that will handle cooplives...	2019-12-27 17:08:20 -03:00
Jaime Passos	8a3b47e1a9	look for GTR_LIVES rule instead of coop/competition gametype	2019-12-27 12:29:21 -03:00
Jaime Passos	203f4c50a0	add G_CompetitionGametype(void)	2019-12-27 12:28:00 -03:00
Jaime Passos	5e328d6d33	check if the gametype allows spectators to allow jump key respawn	2019-12-27 12:17:38 -03:00
Jaime Passos	be32397562	Respawn delay gametype rule	2019-12-27 01:44:27 -03:00
James R	0fd77ff5f4	Merge remote-tracking branch 'origin/master' into next	2019-12-26 15:35:53 -08:00
Zachary McAlpin	e4e233d4de	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-26 17:29:54 -06:00
Jaime Passos	070adb4191	Merge remote-tracking branch 'origin/next' into rotsprite2	2019-12-26 20:27:29 -03:00
Sally Cochenour	add2497220	Port of Jimita's shader stuff + my lighting shader ... Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>	2019-12-25 14:22:01 -05:00
GoldenTails	edd6f743ec	Also cap dashspeed to at most maxdash.	2019-12-24 13:55:19 -06:00
Jaime Passos	8405dc4c07	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-23 23:08:16 -03:00
Jaime Passos	c832d26ee9	ViewpointSwitch improvements.	2019-12-23 20:22:57 -03:00
GoldenTails	39321e8637	Cap dashspeed to at least mindash before revving.	2019-12-23 14:01:37 -06:00
Zachary McAlpin	31dd5ff08b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook	2019-12-22 18:55:58 -06:00
Steel Titanium	5281c44042	Fix super theme ending early if invincibility expired	2019-12-20 23:45:32 -05:00
James R	982c6362db	Merge branch 'elemental-tweak' into 'next' ... Don't uncurl from spin if Elemental Stomp is used See merge request STJr/SRB2!555	2019-12-20 17:32:59 -05:00
Zachary McAlpin	324b05032c	Revert "Added CalculateCamera Hook" ... This reverts commit b545a13312.	2019-12-19 17:21:55 -06:00
Zachary McAlpin	7481a91764	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-19 17:20:31 -06:00
Zachary McAlpin	b545a13312	Added CalculateCamera Hook	2019-12-19 16:41:25 -06:00
Zachary McAlpin	6add4f0aa4	Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition" ... This reverts commit 4bb2a826cf.	2019-12-19 15:07:34 -06:00
Zachary McAlpin	bcbfb7cb19	Revert "Don't execute LUAh_PlayerThink(player) for respawning bots" ... This reverts commit 96a41ca2b8.	2019-12-19 15:07:28 -06:00
Jaime Passos	ad317cd8a2	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-19 02:15:45 -03:00
Jaime Passos	e47f171533	TeamSwitch hook for Lua	2019-12-18 23:40:58 -03:00
Steel Titanium	a0993baa0b	Don't uncurl from spin if Elemental Stomp is used	2019-12-18 21:28:34 -05:00
Jaime Passos	29d316fd74	GTR_PITYSHIELD	2019-12-18 12:09:44 -03:00
Jaime Passos	789e881abc	GTR_TEAMFLAGS	2019-12-18 11:43:50 -03:00
Jaime Passos	448494e19b	More gametype rules yay!!	2019-12-18 01:54:45 -03:00
James R	ebcd9923b1	Merge branch 'fix-divby0-spindash-crash' into 'next' ... Fix a divide by zero crash when mindash and maxdash were the same. See merge request STJr/SRB2!539	2019-12-17 20:42:56 -05:00
Zachary McAlpin	4bb2a826cf	Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition	2019-12-17 19:20:46 -06:00
Zachary McAlpin	96a41ca2b8	Don't execute LUAh_PlayerThink(player) for respawning bots	2019-12-17 18:41:26 -06:00