8128 commits

Author	SHA1	Message	Date
James R	2ed5617c5f	Merge branch 'better-deadzone' into 'master' ... Better Deadzones See merge request STJr/SRB2!541	2019-12-20 17:33:29 -05:00
James R	c50fe1874d	Merge branch 'random-port' into 'master' ... Choose a random port as a client See merge request STJr/SRB2!554	2019-12-20 17:33:12 -05:00
James R	70336933bd	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	124a0754a6	Revert "Added CalculateCamera Hook" ... This reverts commit 9f82cdb401.	2019-12-19 17:21:55 -06:00
Zachary McAlpin	f5c2341f59	Revert "Fix CalculateCamera compiling error" ... This reverts commit c1465c5acc.	2019-12-19 17:21:46 -06:00
Zachary McAlpin	652e53c629	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-19 17:20:31 -06:00
Zachary McAlpin	c1465c5acc	Fix CalculateCamera compiling error	2019-12-19 17:17:17 -06:00
Zachary McAlpin	9f82cdb401	Added CalculateCamera Hook	2019-12-19 16:41:25 -06:00
Jaime Passos	6d7bdf8fdb	Lua gametyperules	2019-12-19 18:27:11 -03:00
Zachary McAlpin	e82b317451	Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition" ... This reverts commit 3fc1069082.	2019-12-19 15:07:34 -06:00
Zachary McAlpin	c1815bfe11	Revert "Don't execute LUAh_PlayerThink(player) for respawning bots" ... This reverts commit fc70164f93.	2019-12-19 15:07:28 -06:00
Jaime Passos	551828607c	Load SPR_ lumps as SpriteInfo	2019-12-19 17:25:19 -03:00
Jaime Passos	320b7777b0	Merge remote-tracking branch 'origin/master' into rotsprite2	2019-12-19 17:20:21 -03:00
Jaime Passos	4e349cbd0f	Remove W_UnlockCachedPatch calls to avoid crashing	2019-12-19 17:14:56 -03:00
James R	77747c66df	Fix switching to software ... Would show a black screen for me on Linux. My suspsicion is that some things are not initialized with just VID_CheckRenderer.	2019-12-19 17:13:23 -03:00
Jaime Passos	5c8604aeb7	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-19 17:09:47 -03:00
Jaime Passos	4ad1727b66	Don't spawn End Level Signs without the GTR_ALLOWEXIT rule	2019-12-19 17:06:07 -03:00
Jaime Passos	74a4ec6f54	Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects	2019-12-19 16:31:38 -03:00
Jaime Passos	9b2b526eb4	Removing commented out code	2019-12-19 16:22:55 -03:00
Steel Titanium	a39b6a1286	Allow access to bluescore and redscore	2019-12-19 16:17:08 -03:00
Jaime Passos	7efd9662d1	Remove GTR_NOGAMEEND	2019-12-19 16:13:27 -03:00
Jaime Passos	f4bb618f93	Organise rules	2019-12-19 16:12:10 -03:00
Jaime Passos	6d7262e985	Remove GTR_PLATFORM	2019-12-19 16:05:03 -03:00
Jaime Passos	768080977f	Remove GTR_ROUNDENDMESSAGE	2019-12-19 15:47:37 -03:00
Alam Ed Arias	1771c7c8ce	Revert "Travis yflip error" ... This reverts commit 2a9a2c0f02.	2019-12-19 10:25:54 -05:00
Alam Ed Arias	a66fd274a1	Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer	2019-12-19 10:24:04 -05:00
Jaime Passos	ce0e4201b8	GTR_DEATHMATCHSTARTS	2019-12-19 02:26:17 -03:00
Jaime Passos	ebdd9c6257	fix warnings	2019-12-19 02:20:49 -03:00
Jaime Passos	019e52a4f4	allow CTF spawns in GTR_TEAMS gametype rule	2019-12-19 02:17:03 -03:00
Jaime Passos	0accadf02f	Merge remote-tracking branch 'origin/next' into gametype-clownery	2019-12-19 02:15:45 -03:00
Jaime Passos	fb6f2fc9b0	Lua! Lua! Lua! ... Expecting the buildbot to complain	2019-12-19 02:13:09 -03:00
lachwright	d401ba558d	Fix pflags not being properly reset when entering dust devil from top	2019-12-19 12:03:36 +08:00
Jaime Passos	00440224d2	De-fuck team change	2019-12-19 00:31:13 -03:00
Jaime Passos	e4b4b60cb6	Remove this debugging command, as I don't need it anymore.	2019-12-19 00:15:19 -03:00
Jaime Passos	5da55e8b76	Shadowed variable declarations whoopsie!!! uwu	2019-12-18 23:53:26 -03:00
Jaime Passos	6f857df5e5	ViewpointSwitch hack so nobody does anything evil ... Prints the generic "can't do this in a HUD hook" message. Whatever. I'm tired.	2019-12-18 23:47:17 -03:00
Jaime Passos	be5fd1a0db	TeamSwitch hook for Lua	2019-12-18 23:40:58 -03:00
Steel Titanium	96cf03b716	Don't uncurl from spin if Elemental Stomp is used	2019-12-18 21:28:34 -05:00
Jaime Passos	b496cc0d62	Whoops	2019-12-18 23:02:07 -03:00
Jaime Passos	ef7e53488d	GTR_CAMPAIGN and GTR_NOGAMEEND	2019-12-18 22:50:49 -03:00
Jaime Passos	5daedc70e7	Special Stages/token stuff	2019-12-18 22:46:17 -03:00
Jaime Passos	9228f99260	Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit	2019-12-18 22:23:30 -03:00
Jaime Passos	5e818e1dab	Custom gametype rankings	2019-12-18 22:02:37 -03:00
James R	843d9b9f0a	-clientport (it's back!) and -serverport, which is an alias to -port ... If you ever need to, you can change the client port number.	2019-12-18 15:47:47 -08:00
Jaime Passos	0421c81e04	ViewpointSwitch hook for Lua	2019-12-18 20:43:54 -03:00
James R	4e32101289	Use a pointer for port_name ... Using strcpy is stupid because we don't know how long the argument would be. There's no need for a buffer anyway.	2019-12-18 15:43:29 -08:00
James R	f584b61c93	Use a random port when connecting	2019-12-18 15:34:55 -08:00
Jaime Passos	d0e18444fb	GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes	2019-12-18 20:12:52 -03:00
Jaime Passos	04ee98a1a1	point limit/time limit	2019-12-18 19:43:12 -03:00
Jaime Passos	396106829a	Ringslinger tweaks	2019-12-18 19:26:45 -03:00
Jaime Passos	eadb3dec9e	Limits checking	2019-12-18 18:59:47 -03:00
Jaime Passos	74d69f3731	Fix comment	2019-12-18 18:52:10 -03:00
Jaime Passos	b8d47dbc60	Accept gametype rules in SOC by just their names as parameters.	2019-12-18 18:50:04 -03:00
Jaime Passos	ec8682b2af	GTR_NOTITLECARD	2019-12-18 18:39:59 -03:00
Jaime Passos	61cad09505	Fix lib_getenum. Also, adding gametypes also creates constant names for them.	2019-12-18 18:30:24 -03:00
Jaime Passos	cb0e14035b	Intermission HUD hook for Lua	2019-12-18 18:09:56 -03:00
Jaime Passos	5f73d48614	Some sort of intermission tally support.	2019-12-18 17:13:05 -03:00
Jaime Passos	e3584e8230	GTR_ALLOWEXIT	2019-12-18 16:52:05 -03:00
Jaime Passos	5b0a094f67	TOL stuff	2019-12-18 16:00:02 -03:00
Jaime Passos	94f2b8f970	Fix warnings	2019-12-18 15:41:03 -03:00
Jaime Passos	7c3cde4564	How did I mess this up?	2019-12-18 15:23:41 -03:00
Jaime Passos	7768e2c7f9	More spectator tweaks	2019-12-18 15:14:24 -03:00
Jaime Passos	d3d91726f5	GTR_EMERALDHUNT and GTR_SPAWNENEMIES	2019-12-18 14:57:42 -03:00
Jaime Passos	0577cec01b	GTR_NOSPECTATORSPAWN	2019-12-18 14:47:39 -03:00
Jaime Passos	1e2331d672	SOC stuff	2019-12-18 14:37:48 -03:00
Jaime Passos	79d5192b7c	TOL/Level platter stuff	2019-12-18 13:24:10 -03:00
Jaime Passos	b759ebf622	Death of TOL_CUSTOM	2019-12-18 12:40:46 -03:00
Jaime Passos	45580ce557	Make NUMGAMETYPEFREESLOTS lower because netcode	2019-12-18 12:36:54 -03:00
Jaime Passos	aa619e1b34	Rankings tweaks	2019-12-18 12:36:02 -03:00
Jaime Passos	7807424633	NUMGAMETYPES vs gametypecount	2019-12-18 12:30:01 -03:00
Jaime Passos	86ac94817a	Spectator HUD tweaks	2019-12-18 12:28:01 -03:00
Jaime Passos	15862ed02c	G_NewGametype	2019-12-18 12:23:42 -03:00
Jaime Passos	6660d63028	There are only so many bits	2019-12-18 12:14:18 -03:00
Jaime Passos	da4e759a73	GTR_DEATHPENALTY	2019-12-18 12:13:24 -03:00
Jaime Passos	83732f38a9	GTR_PITYSHIELD	2019-12-18 12:09:44 -03:00
Jaime Passos	1b81232d32	sike	2019-12-18 11:47:26 -03:00
Jaime Passos	299f2bd8cd	GTR_TEAMFLAGS	2019-12-18 11:43:50 -03:00
Jaime Passos	185fa2799d	Update comments	2019-12-18 11:33:56 -03:00
Jaime Passos	ea5e0d28ed	More gametype rules yay!!	2019-12-18 01:54:45 -03:00
James R	23951cf938	bleh	2019-12-17 20:54:44 -08:00
Jaime Passos	7bfdc2caa0	Gametype rules draft, mind the debug command	2019-12-18 01:25:57 -03:00
Jaime Passos	317191ec7c	Freeslot moment!	2019-12-18 00:52:50 -03:00
Jaime Passos	254d812901	More customisable title card ... Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC. Add the same fields to Lua under their internal names. Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)	2019-12-18 00:28:58 -03:00
James R	4029167a57	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	3fc1069082	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	fc70164f93	Don't execute LUAh_PlayerThink(player) for respawning bots	2019-12-17 18:41:26 -06:00
Zachary McAlpin	01f11cdca6	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-17 18:21:17 -06:00
James R	d1b944121a	Fix "SRB2" SOC directive, though its usefulness is debatable	2019-12-17 14:11:45 -08:00
James R	e009d62dc3	Merge branch 'hud-toggling' into 'next' ... Let Lua toggle Team Match/CTF team scores HUD element See merge request STJr/SRB2!544	2019-12-17 16:17:01 -05:00
James R	184d04e6d5	Merge branch 'rvz1-crashfix' into 'next' ... Fix crash on mapload when removing Dragonbomber with Lua See merge request STJr/SRB2!545	2019-12-17 16:16:51 -05:00
Jaime Passos	79daafd893	Fix missing "-" prefix on "-software" cmdline parm	2019-12-17 18:04:05 -03:00
Jaime Passos	53885e5ac0	Free PU_HWRMODELTEXTURE tag	2019-12-17 16:28:32 -03:00
Jaime Passos	e359f802fd	Update comments	2019-12-17 16:14:26 -03:00
Jaime Passos	cc54163210	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-17 16:12:44 -03:00
Jaime Passos	a0971d0756	Put loadgame patch loading back in M_ReadSaveStrings	2019-12-17 15:56:56 -03:00
Jaime Passos	c3f0e6aa44	Avoid recreating the color LUT mid-recording-frame	2019-12-17 15:37:43 -03:00
Jaime Passos	0af71fafc5	Don't use the local palette, because OpenGL mixes it into the textures themselves	2019-12-17 15:20:22 -03:00
Jaime Passos	3d08664de4	Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs	2019-12-17 15:14:22 -03:00
Jaime Passos	141d0376a5	Merge remote-tracking branch 'origin/master' into flats-in-walls	2019-12-17 15:05:16 -03:00
Jaime Passos	e3ab21c85f	opengl	2019-12-17 13:48:48 -03:00
Jaime Passos	aff5b52eba	change ROTANGLES to 72	2019-12-17 13:39:26 -03:00
Jaime Passos	8422c88063	optimise R_CacheRotSprite	2019-12-17 13:25:55 -03:00
Jaime Passos	c6f36fc470	un-ROTSPRITE rollangle and spriteinfo	2019-12-17 13:09:25 -03:00
Jaime Passos	6a5ea548e6	make ROTANGLES be 360	2019-12-17 13:00:50 -03:00
Jaime Passos	7e55dd31f5	fix menu spacing	2019-12-17 12:53:26 -03:00
Jaime Passos	369563ad92	allow models to change colors more than once.	2019-12-17 12:50:41 -03:00
James R	4da57653eb	Merge branch 'spawn_z_refactor' into 'next' ... (UDMF prereq.) Spawn Z refactor See merge request STJr/SRB2!536	2019-12-16 23:21:07 -05:00
James R	4f33476fc0	Merge branch 'fix-sector-lines' into 'next' ... Fix sector.lines in Lua See merge request STJr/SRB2!542	2019-12-16 23:05:52 -05:00
Steel Titanium	0e371774c8	Fix crash on mapload when removing Dragonbomber with Lua	2019-12-16 21:25:41 -05:00
Tatsuru	0ab31b3de0	Let Lua toggle Match/CTF team scores HUD element	2019-12-16 17:58:00 -03:00
Monster Iestyn	46f431616c	Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean	2019-12-16 20:26:19 +00:00
Monster Iestyn	f028bb0219	Fix numoflines calculations in sectorlines_* functions by first typecasting seclines (the sector.lines address) to size_t before doing any math on it, then (after the math) typecast the result to size_t * and dereference it. ... And yes, this time I tested it to make sure it works :)	2019-12-16 17:46:27 +00:00
Monster Iestyn	130794cc4d	Merge branch 'master' into next	2019-12-16 15:41:47 +00:00
MascaraSnake	79350992df	Some more cleanup of map loading code	2019-12-16 00:17:20 +01:00
MascaraSnake	bb3440d021	Minor cleanup of virtual resources code	2019-12-16 00:04:48 +01:00
James R	53c7df4818	Merge branch 'map-command-no-mapheaderinfo' into 'master' ... Let the map command warp to maps without a level header See merge request STJr/SRB2!528	2019-12-15 16:59:03 -05:00
James R	adc87640d9	Merge branch 'cmake-fixes' into 'master' ... Various cmake adjustments See merge request STJr/SRB2!538	2019-12-15 16:58:45 -05:00
MascaraSnake	230006553d	Set mapthing z in OP_CreateNewMapThing	2019-12-15 21:43:50 +01:00
fickleheart	1f88c70d6a	Fix RVZ autocam AGAIN	2019-12-15 13:33:21 -06:00
Sryder	a093c76cfb	Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone	2019-12-15 15:47:45 +00:00
Monster Iestyn	eb179e4d6a	Remove anti-Tails restriction for the Allow super Pandora's Box cheat. ... Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!	2019-12-15 15:40:56 +00:00
Sryder	76d59330f7	Port the deadzone cvar stuff from kart. ... Add menu items for deadzone.	2019-12-15 15:36:13 +00:00
Sryder	b17bf5d836	Use Scaled Radial Deadzones, instead of Axial deadzones. ... Additionally fixes some weird padscale 0 stuff that was flipped. This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.	2019-12-15 14:37:30 +00:00
GoldenTails	23b3f5a649	Fix a divide by zero crash when mindash and maxdash were the same. ... Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.	2019-12-15 04:09:56 -06:00
MascaraSnake	8a6e244e60	SpawnEmeraldHunt() -> P_SpawnEmeraldHunt()	2019-12-15 09:49:54 +01:00
Eidolon	d63ad82dc5	[cmake] Remove srb2dd target	2019-12-15 00:47:58 -06:00
Eidolon	11f5911943	[cmake] Use same executable names as Makefile	2019-12-15 00:39:04 -06:00
fickleheart	a885380e8a	Add analog deadzone option separate from digital deadzones	2019-12-14 19:41:54 -06:00
Zachary McAlpin	fce6ea0384	Fixed mistake with #endif placement	2019-12-14 19:32:49 -06:00
fickleheart	3db7e48c73	[POTENTIALLY RISKY] Show target arrow above lock-on target ... My judgement on "is this netgame-safe" is "Gunslinger's targeting spawns this only for the local player, so maybe".	2019-12-14 19:21:11 -06:00
fickleheart	7fd2153c08	Realign camera options menu options	2019-12-14 19:20:19 -06:00
fickleheart	0702e366b6	Allow setting center view to a toggle	2019-12-14 19:17:41 -06:00
fickleheart	a812ddd88e	Fix turn-to-input jerk when braking sideways	2019-12-14 19:04:29 -06:00
Zachary McAlpin	ee9e72f48b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features	2019-12-14 17:59:21 -06:00
James R	1123b5debd	Merge remote-tracking branch 'origin/master' into next	2019-12-14 15:28:25 -08:00
MascaraSnake	bcfd9fe504	Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?	2019-12-15 00:22:17 +01:00
Jaime Passos	4d87bcca13	Move position of R_PlaneRipple in the file so this looks more organised	2019-12-14 19:50:40 -03:00
Jaime Passos	871ebef332	Merge remote-tracking branch 'origin/master' into ripple2	2019-12-14 19:36:54 -03:00
James R	14674223e8	Merge branch 'opengl-is-a-bad-renderer' into 'master' ... OpenGL fixes See merge request STJr/SRB2!519	2019-12-14 16:48:50 -05:00
James R	b121bc2b3b	Merge branch 'fix-shield-hover' into 'next' ... Stop characters from being able to activate their abilities when doing a shield ability! See merge request STJr/SRB2!522	2019-12-14 16:48:12 -05:00
James R	64eb89fc56	Merge branch 'portalcullsector' into 'master' ... Restore portal culling code that went gone by pure accident See merge request STJr/SRB2!523	2019-12-14 16:47:51 -05:00
James R	e5714db75c	Merge branch 'software-drawers-refactor' into 'master' ... Optimize Software drawers See merge request STJr/SRB2!533	2019-12-14 16:47:27 -05:00
James R	65a17a8f09	Merge branch 'customexitvars-rework' into 'next' ... Rework G_SetCustomExitVars to allow skipstats 2 See merge request STJr/SRB2!534	2019-12-14 16:47:18 -05:00
Steel Titanium	b3d678a252	Merge branch 'master' into next	2019-12-14 16:44:56 -05:00
James R	c1d54007e4	Fix C90 error from NOHW	2019-12-14 13:30:10 -08:00
Zachary McAlpin	87b816e408	Added PlayerThink hook	2019-12-14 15:28:24 -06:00
James R	2a22adaa60	Oops C90	2019-12-14 12:55:11 -08:00
fickleheart	0047dba279	Fix float cvars saving wrong when set to max	2019-12-13 23:05:36 -06:00
fickleheart	bc2ed52625	Double sensitivity and halve default of turn to input	2019-12-13 22:55:34 -06:00
fickleheart	252b77c651	Scale angle-related camera turns by player speed ... They also operate at full when idle, too.	2019-12-13 22:30:04 -06:00
fickleheart	097fc48f52	Even MORE tta changes: ... - All automatic turning is suspended upon manual rotation - Dest angle uses drawangle again for rolling only	2019-12-13 20:30:56 -06:00
fickleheart	fdc3347e22	More turn-to-angle changes	2019-12-13 20:19:38 -06:00
fickleheart	f82f1513ba	Tweaks to camera shifting	2019-12-13 20:17:31 -06:00
fickleheart	022a44fb01	Don't turn-to-ability while climbing	2019-12-13 19:49:56 -06:00
fickleheart	a03ab5e294	Patch slight camera turn when airbraking	2019-12-13 19:37:01 -06:00
fickleheart	1a60f7a2ad	Fix wacky CEZ2 platform camera	2019-12-13 19:30:19 -06:00
James R	8a23ff0bc8	Handle log file in parent properly	2019-12-13 16:51:49 -08:00
fickleheart	87ad91a2be	LMAO right stick checking used the wrong value	2019-12-13 17:35:48 -06:00
James R	553ad46c74	Add this back for Windoodoo because I'm an idiot	2019-12-13 15:04:31 -08:00
Jaime Passos	4c13190b48	Merge remote-tracking branch 'origin/master' into software-drawers-refactor	2019-12-13 19:22:47 -03:00
Jaime Passos	7f092b884b	Initialise the variable, obviously	2019-12-13 19:04:36 -03:00
Jaime Passos	a27a225a81	Remove SPANDRAWFUNC_MMX, as it's not needed anymore.	2019-12-13 19:02:36 -03:00
Steel Titanium	ad776e560c	Rework G_SetCustomExitVars to allow skipstats 2	2019-12-13 16:36:33 -05:00
Jaime Passos	6720279969	Separate non-powers-of-two draw routines into its own file	2019-12-13 13:11:56 -03:00
Jaime Passos	fa58c1fb26	stuff	2019-12-13 12:26:47 -03:00
James R	c415d80e19	Merge branch 'dashmode-shader' into 'master' ... Add TC_DASHMODE color shader See merge request STJr/SRB2!526	2019-12-13 01:58:18 -05:00
James R	d64a7defed	Merge branch 'toomanyflats-fix' into 'master' ... Fix Ploadflat closing the game with "Too many flats in level" error message See merge request STJr/SRB2!529	2019-12-13 01:57:55 -05:00
fickleheart	c41b2e7456	Suspend turn-to-angle when rotating the camera	2019-12-13 00:52:48 -06:00
fickleheart	098c99a834	Adjust how turn-to-angle tweens	2019-12-13 00:34:34 -06:00
James R	8bea7f6dbc	Rename signal caught message to be more obvious	2019-12-12 22:01:16 -08:00
James R	838850ffc1	Fix signal handler setup error reporting	2019-12-12 21:57:54 -08:00
fickleheart	bc4b1e1abe	Allow switching lockon targets with turn buttons	2019-12-12 23:52:13 -06:00
James R	35053adfb2	Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place	2019-12-12 21:30:35 -08:00
James R	72ee91702c	Kill child when wait fails, so I_Error exits both	2019-12-12 21:21:25 -08:00
James R	f34886850f	Fix idiot mistake	2019-12-12 21:20:51 -08:00
fickleheart	d14fa39d7a	Expand options for aim assist ... This will need a lot of testing to ensure each type works properly.	2019-12-12 23:03:51 -06:00
fickleheart	4941ef4aac	Don't turn strafe keys into turn when locked onto something	2019-12-12 22:13:44 -06:00
Jaime Passos	b0ffe7ed70	Update v_video.c	2019-12-12 23:30:09 -03:00
Jaime Passos	4e814cd424	FINALLY, COLORCUBIUM	2019-12-12 23:18:39 -03:00
Jaime Passos	228b29e23b	HWR_AllowModel	2019-12-12 22:53:19 -03:00
Jaime Passos	ca83bafae8	Initialise the variable, obviously	2019-12-12 22:32:19 -03:00
Jaime Passos	a138a3ab5f	Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer	2019-12-12 22:31:34 -03:00
Jaime Passos	08794559f0	Fix TC_ blending	2019-12-12 22:26:28 -03:00
Jaime Passos	01399c7076	Update hw_main.c	2019-12-12 21:52:59 -03:00
Jaime Passos	ff348fb60a	Add missing prototype, ugh	2019-12-12 21:43:19 -03:00
Jaime Passos	af3cf93683	grafik designe is m passion	2019-12-12 21:41:13 -03:00
Jaime Passos	d80bfb4e94	PU_HWRCACHE_UNLOCKED bmomento bróder	2019-12-12 21:23:55 -03:00
Jaime Passos	08d4a36f63	Texture blending port ... Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>	2019-12-12 21:22:36 -03:00
James R	6dcdb8d951	Move everything to i_system.c ... This also simplifies things; SDL isn't initialized in the parent process.	2019-12-12 15:08:27 -08:00
Jaime Passos	6c3111d809	Stop crashing with models because someone keeps freeing those tags	2019-12-12 19:54:47 -03:00
James R	55f3f27b55	Fix NOHW warnings	2019-12-12 14:00:13 -08:00
Steel Titanium	eb787c2b59	Move S_InitMusicDefs call outside of the check. ... As far as I know, this is competely safe.	2019-12-12 16:32:40 -05:00
Jaime Passos	3bebfb279e	Fix gr_anisotropicmode	2019-12-12 18:28:05 -03:00
Jaime Passos	58a08504c8	Make gr_spritebillboarding on by default sorry not sorry Azeon	2019-12-12 17:48:43 -03:00
Jaime Passos	a4b0195430	Model lighting	2019-12-12 17:48:29 -03:00
Jaime Passos	9246526e8a	Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer	2019-12-12 17:39:18 -03:00
Jaime Passos	f077d17301	Save filtering mode and anisotropic mode cvars to config	2019-12-12 17:37:55 -03:00
Jaime Passos	db61d1a705	Remove HWR_AddEngineCommands	2019-12-12 17:35:41 -03:00
Jaime Passos	bf520b9e33	Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!!	2019-12-12 17:30:19 -03:00
Steel Titanium	4af0cfae36	Init MUSICDEFs if started game with music off and toggled on	2019-12-12 15:17:50 -05:00
Jaime Passos	b7c7529e75	Don't reset the FOV	2019-12-12 17:06:04 -03:00
Jaime Passos	08e3caf9bb	Remove unused cvars	2019-12-12 16:53:31 -03:00
Jaime Passos	792750ee48	Add HWD_SET_MODEL_LIGHTING state	2019-12-12 16:48:37 -03:00
Nev3r	c5d8fe4752	Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection.	2019-12-12 15:04:48 +01:00
Nev3r	c64a9d7ae9	Stop things from becoming Chocapic in THZ3, ACZ2, and special stages. ... Temporarily revert function call order for mapthings.	2019-12-12 11:37:48 +01:00
Nev3r	ec9f727e53	Move map data load procedure to separate functions.	2019-12-12 11:16:55 +01:00
Nev3r	43cbad200c	Move loading functions around a bit and refactor the stage data allocation code.	2019-12-12 10:35:38 +01:00
James R	7c383e4a1f	nix: Fork before game code and wait to catch signals and coredumps ... Ditched signal_handler to avoid worrying about async-signal-safe functions. D_QuitNetGame is not called, so players whose programs are interrupted by a signal will time out from the server. Because the game runs in a child process, the window can close before the "Signal Caught" text box appears. "(core dumped)" is also included in the message if core dumping could be determined.	2019-12-11 23:46:57 -08:00
fickleheart	a188cd5db8	Add boss target assist and finally organize camera options	2019-12-12 00:48:15 -06:00
James R	0ff421d001	Move I_ShutdownConsole to I_ShutdownSystem	2019-12-11 22:10:22 -08:00
fickleheart	efec52c48a	Fix input turning still happening with centered view	2019-12-11 22:47:09 -06:00
Jaime Passos	c578cee0b1	Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs	2019-12-12 01:39:46 -03:00
Jaime Passos	3ca0fbf5c3	da ba dee da ba die	2019-12-12 01:29:59 -03:00
fickleheart	34706515ca	Make locked input turn act the same as normal turning	2019-12-11 21:34:32 -06:00
fickleheart	a0ecb4b71d	Fix the console spam issue AGAIN	2019-12-11 21:20:07 -06:00
fickleheart	a830a20c52	[pink text] nter View	2019-12-11 21:12:38 -06:00
fickleheart	f1b5a2b2d3	Move Z-targeting behavior to Center View	2019-12-11 21:09:23 -06:00
Jaime Passos	ea129f701c	Fix Ploadflat closing the game with "Too many flats in level" error message	2019-12-11 22:45:47 -03:00
Tatsuru	d40359ee02	Hugging now requires being in the same Z position ... Don't try this at home	2019-12-11 19:13:22 -06:00
Jaime Passos	e01eb19044	Sad!	2019-12-11 22:11:00 -03:00
Jaime Passos	0652ffd67f	Merge remote-tracking branch 'origin/master' into flats-in-walls	2019-12-11 21:53:47 -03:00
James R	7a59ade63d	Merge branch 'garbage' into 'master' ... memset SERVERINFO maptitle See merge request STJr/SRB2Internal!624	2019-12-11 19:19:29 -05:00
James R	6464df9876	Maybe I'm mistaken but this probably isn't needed	2019-12-11 16:14:06 -08:00
lachwright	8a70759e0a	Add TC_DASHMODE color shader	2019-12-12 01:27:41 +08:00
Jaime Passos	37679bb44e	Organise	2019-12-11 13:26:28 -03:00
Jaime Passos	9340557d2d	Update f_wipe.c	2019-12-11 13:09:27 -03:00
Jaime Passos	43946d9826	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-11 12:57:59 -03:00
Nev3r	edfe053cc3	Treat warnings as errors; comment out unused function.	2019-12-11 16:37:41 +01:00
Jaime Passos	be13f463f0	Update r_plane.c	2019-12-11 12:36:54 -03:00
Nev3r	d34fd4b755	Epic oversight in upside-down spawn offset.	2019-12-11 15:48:44 +01:00
Jaime Passos	dedd5527da	Restore portal culling code that went gone by pure accident	2019-12-11 11:35:34 -03:00
Nev3r	222336ac0b	Oversight, do not free the data yet vres_Free() does it already at the end.	2019-12-11 15:16:56 +01:00
Nev3r	a87a9e6ff6	Remove wrappers and dupes for map lump reading, as they are no longer used.	2019-12-11 14:40:31 +01:00
Nev3r	9952bae5ee	P_MakeMapMD5() now uses virtres.	2019-12-11 14:20:08 +01:00
Nev3r	14ad3b938e	Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question.	2019-12-11 14:04:09 +01:00
Nev3r	4d86dc11a6	'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter.	2019-12-11 13:54:15 +01:00
Nev3r	bf5a2c68d5	P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not.	2019-12-11 13:22:07 +01:00
Nev3r	854d50f479	Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears.	2019-12-11 11:44:46 +01:00
Nev3r	d2cbdd4fb1	Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now.	2019-12-11 11:10:31 +01:00
Nev3r	584348b91e	Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead.	2019-12-11 10:13:52 +01:00
fickleheart	f74d7163e6	Fix RVZ camera stuff	2019-12-11 01:26:43 -06:00
GoldenTails	07316fc5bd	Stop characters from being able to activate their abilities when doing a shield ability! ... Fixes #61.	2019-12-10 23:55:52 -06:00
fickleheart	2ab83bac60	Run camera movement in the camera options menu ... It's really nice to see adjustments reflected in real time.	2019-12-10 23:18:46 -06:00
fickleheart	69b623e086	Add option to always turn with input while locked ... Uhhh also camera options scrolls now.	2019-12-10 22:01:17 -06:00
fickleheart	cdf5287fcc	Turn camera with strafe keys in camlock while charging spindash	2019-12-10 21:34:57 -06:00
fickleheart	a89f8e91f7	Change defaults and factors of simplecam options	2019-12-10 21:24:43 -06:00
fickleheart	054d51dac6	Make input turn speed tween by lateral momentum, not total	2019-12-10 21:14:50 -06:00
Jaime Passos	f531a8971f	Update m_menu.c	2019-12-10 23:40:15 -03:00
Jaime Passos	9248f12d55	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-10 23:01:10 -03:00
Jaime Passos	f51253a0a8	Tilted water	2019-12-10 17:01:19 -03:00
Nev3r	ca6a7ffbb3	Fix NiGHTS bumpers height.	2019-12-10 18:53:49 +01:00
Nev3r	8466dc5813	Move mobj spawn Z calculating to a separate function.	2019-12-10 18:03:15 +01:00
fickleheart	2b70b4bf36	TODO	2019-12-10 09:08:30 -06:00
fickleheart	72cf5d9927	Don't flood directionchar commands!!!	2019-12-10 08:17:41 -06:00
fickleheart	194e77a6f0	Give spindash turn a separate slider	2019-12-10 08:07:41 -06:00
fickleheart	e1d4e2edcb	Suspend directionchar while holding cam reset ... This should make it completely clear that thok will face the camera while it's held.	2019-12-10 07:58:50 -06:00
fickleheart	08ab15b1b9	Disable thok camera snap	2019-12-10 07:54:27 -06:00
Nev3r	3dfa526eea	Separate Emerald Hunt emerald spawning into another function.	2019-12-10 14:21:08 +01:00
fickleheart	2fa1e75016	I'm hilarious	2019-12-09 22:45:34 -06:00
fickleheart	a3961efc43	Draw crosshair in Simple mode while holding cam reset ... I think this gives extra indication that abilities face toward the camera now.	2019-12-09 22:12:19 -06:00
fickleheart	2a9819947e	Disable all new camera behavior if playstyle is not Simple	2019-12-09 22:09:58 -06:00
fickleheart	b5f7f5f732	Replace direction toggles with a playstyle selection ... It's kinda ugly right now...	2019-12-09 22:06:50 -06:00
fickleheart	834a3bf334	Port deadzone configuration from Kart ... I don't feel like getting out my gamepad, so I'll trust that this works.	2019-12-09 20:39:05 -06:00
fickleheart	3735134948	Fix smoothing into input-based camera rotation	2019-12-09 20:31:19 -06:00
fickleheart	27996ada04	Scale down turn values (and increase defaults to compensate) ... This allows more granularity in menu sliders while limiting the maximums to reasonable amounts.	2019-12-09 20:26:12 -06:00
fickleheart	e4626e9396	Lock camera behind player when holding cam reset ... This also disables abilitydirection movement temporarily.	2019-12-09 20:21:32 -06:00
James R	4f9e227830	Cvar and menu option to let user increase turn speed ... cam_turnmultiplier and cam2_turnmultiplier. "Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera Turning Speed" is now an option.	2019-12-09 16:30:03 -08:00
Nev3r	6fe6db8e18	Removed seemingly redundant (and incorrect) mapthing Z load code. ... The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.	2019-12-09 14:05:22 +01:00
Nev3r	8ea7dd418a	Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function.	2019-12-09 13:26:31 +01:00
fickleheart	c99b137298	Fix abilitydirection camera breaking minecarts	2019-12-08 20:47:11 -06:00
Jaime Passos	4d83db5bb2	Die, Apple!	2019-12-08 22:31:59 -03:00
Jaime Passos	5c02bc59db	Speed up level loading ... Don't flush every texture just because the palette MAY have changed	2019-12-08 22:28:13 -03:00
Jaime Passos	c6769e7220	Die	2019-12-08 22:12:56 -03:00
fickleheart	0cad5021a9	Make input turn slow down when moving slowly	2019-12-08 18:26:20 -06:00
Jaime Passos	7f58002e12	Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer	2019-12-08 21:10:48 -03:00
Jaime Passos	25464c867a	Translate the French	2019-12-08 21:10:14 -03:00
fickleheart	a30623e4ed	Default to no turn-facing since it looks like controller drift	2019-12-08 15:54:37 -06:00
fickleheart	e92d7eca8e	Shift camera sideways toward player angle	2019-12-08 15:54:16 -06:00
fickleheart	4784eb68fa	Don't do thok camera snap in replays	2019-12-08 15:49:10 -06:00
fickleheart	575b5027e8	Don't snap thok if the player is holding a camera control	2019-12-08 15:22:51 -06:00
fickleheart	c94d7895df	Make cam_rotspeed affect non-mouse turn speed ... 10 remains the default and is vanilla behavior.	2019-12-08 15:17:46 -06:00
fickleheart	eee0d42b1f	Make first-person and directionchar-off work as expected	2019-12-08 15:05:44 -06:00
fickleheart	ebd2861593	Add menu options for new camera controls ... Crank everything down to zero and set ability direction to "Camera", and you're back to base 2.2 behavior.	2019-12-08 14:43:25 -06:00
fickleheart	36fa94a22c	Automatically rotate camera to reflect player actions	2019-12-08 14:35:50 -06:00
fickleheart	075f751f67	Add cvar to use abilities in input direction	2019-12-08 14:17:48 -06:00
fickleheart	32c9c912ab	Consolidate G_BuildTiccmd	2019-12-08 13:27:11 -06:00
Alam Ed Arias	e91a689478	Merge branch 'master' into opengl-is-a-bad-renderer	2019-12-08 12:50:45 -05:00
Alam Ed Arias	d8eccc2921	Merge remote-tracking branch 'public/strcasestr-swap' into buildbot	2019-12-08 12:36:23 -05:00
Alam Ed Arias	1d0cd586ba	P_AddWadFile: the PK3 may not have folders	2019-12-08 12:35:21 -05:00
Alam Ed Arias	623629b04a	OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL	2019-12-08 12:33:11 -05:00
Alam Ed Arias	35168ddeae	OpenGL: yflip is used to hold more then true/false	2019-12-08 12:32:23 -05:00
Jaime Passos	d74f2a003b	HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly ... (done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)	2019-12-08 04:40:29 -03:00
Jaime Passos	4c808cb7e2	Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading	2019-12-08 04:32:25 -03:00
Jaime Passos	d8a804febc	LMFAOOOOOOOOOOOOOOOOOOOOOOOO	2019-12-08 04:15:25 -03:00
Jaime Passos	cc12496e9c	Optimize mipmaps	2019-12-08 03:23:37 -03:00
Jaime Passos	ce61b17117	Update hw_main.c	2019-12-08 02:27:51 -03:00
Jaime Passos	964978a337	Delete md2_transform	2019-12-08 02:25:53 -03:00
Jaime Passos	bc60a0a887	Make some things clearer here.	2019-12-08 01:54:03 -03:00
Jaime Passos	40b862967d	Just in case?	2019-12-07 23:55:28 -03:00
Jaime Passos	e9e0683d5e	Cleanup FreeMipmapColormap	2019-12-07 23:46:05 -03:00
James R	d5816d44f3	Use a third variable of XOR nonsense	2019-12-07 17:36:45 -08:00
James R	cadaecbfcf	memset this or the stupid masterserver (used to) show garbage bytes ... Also for security I guess...	2019-12-07 15:47:18 -08:00
mazmazz	2a9a2c0f02	Travis yflip error	2019-12-07 14:30:51 -05:00
mazmazz	0d41a55071	Deployer fixes for 2.2.0	2019-12-07 13:56:05 -05:00
Jaime Passos	69c08f93bb	Update d_main.c	2019-12-07 11:55:53 -03:00
MascaraSnake	79b04c5872	One more asset hash change	2019-12-07 14:17:26 +01:00
toaster	0bd1399c52	Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.	2019-12-07 10:22:10 +00:00
Alam Ed Arias	d02648450a	Let fix that GCC warning	2019-12-06 18:12:50 -05:00
James R	53cfba1f42	Use strncpy	2019-12-06 15:09:07 -08:00
MascaraSnake	0d22970c78	Change versionstring to 2.2.0	2019-12-06 23:47:05 +01:00
MascaraSnake	f6563c85ed	Updated MD5 hashes	2019-12-06 23:43:54 +01:00
MascaraSnake	bf477c6ed4	Merge branch 'master' into nondevelop	2019-12-06 23:23:01 +01:00
MascaraSnake	239242f513	Merge branch 'stretch-credits' into 'master' ... Lengthen credits for msuic parity See merge request STJr/SRB2Internal!620	2019-12-06 17:19:17 -05:00
MascaraSnake	78de32b623	Merge branch 'creditweak' into 'master' ... Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. See merge request STJr/SRB2Internal!621	2019-12-06 17:18:54 -05:00
Steel Titanium	5f9f255f77	Correct comment	2019-12-06 17:10:14 -05:00
toaster	66bd864592	Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.	2019-12-06 22:06:35 +00:00
lachwright	8f2d81ec74	Lengthen credits for msuic parity	2019-12-07 05:59:26 +08:00
MascaraSnake	a0ebb32912	Merge branch 'introskiptext' into 'master' ... Add "Press ENTER to skip..." text to the intro's first scene See merge request STJr/SRB2Internal!619	2019-12-06 16:48:29 -05:00
MascaraSnake	a3549cc8f2	Merge branch 'datestuff' into 'master' ... Date stuff See merge request STJr/SRB2Internal!618	2019-12-06 16:10:36 -05:00
MascaraSnake	f3fd5a50cb	Merge branch 'signpost-cleanup' into 'master' ... Signpost fixes See merge request STJr/SRB2Internal!602	2019-12-06 15:58:46 -05:00
toaster	674fcd7923	Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P	2019-12-06 20:50:41 +00:00
MascaraSnake	f4c89c2dac	Merge branch 'analogfixes' into 'master' ... Small analog mode fixes See merge request STJr/SRB2Internal!604	2019-12-06 15:32:10 -05:00
Steel Titanium	f304931ac4	get lua_blockmaplib.c too	2019-12-06 15:27:20 -05:00
Steel Titanium	86cd363d16	Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff	2019-12-06 15:23:02 -05:00
Steel Titanium	f02418e70c	Fix copy+paste goof	2019-12-06 15:21:41 -05:00
Jaime Passos	fcc4427de6	Update r_patch.h	2019-12-06 17:07:57 -03:00
Jaime Passos	c4518cce9d	Update r_patch.c	2019-12-06 17:05:36 -03:00
MascaraSnake	201cdef381	Merge branch 'f12fix' into 'master' ... Fix F12 issues Closes #356 and #377 See merge request STJr/SRB2Internal!616	2019-12-06 15:01:28 -05:00
Alam Ed Arias	1f183e1c1f	Not dealing with size_t mess with SDL code	2019-12-06 14:42:47 -05:00
MascaraSnake	e105c2f749	Merge branch 'undo_double' into 'master' ... OpenGL cast to float, not store in double See merge request STJr/SRB2Internal!617	2019-12-06 14:28:41 -05:00
Jaime Passos	d7bfe7d652	Merge branch 'lt-extraneous-parameters' into 'master' ... Remove unnecessary function parameters from title card code See merge request STJr/SRB2Internal!603	2019-12-06 14:22:39 -05:00
Steel Titanium	d415cd5c6d	Update copyright date on source files	2019-12-06 13:49:42 -05:00
Alam Ed Arias	f576e61753	OpenGL cast to float, not store in double	2019-12-06 13:45:11 -05:00
lachwright	2e77970526	Fix whitespace issues from when I was new to this shit	2019-12-07 02:31:31 +08:00
lachwright	4a26aec031	Actually fix F12 issues	2019-12-07 02:27:48 +08:00
lachwright	e7574957bc	Hopefully fix F12 issues	2019-12-07 01:52:40 +08:00
toaster	6e8299f39d	Update comments in the config on when main assets/patch.pk3 hashes have been updated (I know MS is going to update the hashes again later, but this'll still be valid to have done then).	2019-12-06 17:38:23 +00:00
toaster	fd6ecb4425	Make modid 18 to match Rob's work.	2019-12-06 17:23:55 +00:00
toaster	1684cf76bd	Make modversion 40 to match Rob's work.	2019-12-06 17:19:42 +00:00
toaster	9e38af7421	* Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). ... * Update md5s. * Update modversion. TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?	2019-12-06 17:14:51 +00:00
lachwright	c4f48ee979	Make Buggles spawn immediately breathable bubbles	2019-12-06 16:29:52 +08:00
MascaraSnake	c468ae5239	Merge branch 'rockcrumblefix' into 'master' ... Edit some rock crumble states to match new sprites. See merge request STJr/SRB2Internal!601	2019-12-05 17:10:34 -05:00
MascaraSnake	69da1a7733	Merge branch 'perfectra' into 'master' ... Record Attack perfect bonus stuff Closes #457 See merge request STJr/SRB2Internal!607	2019-12-05 17:02:38 -05:00
MascaraSnake	bbc5d33266	Merge branch 'notutclear' into 'master' ... Fix clearing maps/unlockables causing crashes and hangs. See merge request STJr/SRB2Internal!609	2019-12-05 17:02:10 -05:00
MascaraSnake	87843365fc	Merge branch 'nightslevsel' into 'master' ... NiGHTS Attack left-right level selection See merge request STJr/SRB2Internal!608	2019-12-05 16:53:21 -05:00
MascaraSnake	6393542dc3	Merge branch 'wordwrapfix' into 'master' ... Fix V_WordWrap and the new additional text colour codes. See merge request STJr/SRB2Internal!612	2019-12-05 16:32:30 -05:00
MascaraSnake	adfbf3630c	Merge branch 'tailsbubblefix' into 'master' ... Tails Bubble Fix See merge request STJr/SRB2Internal!606	2019-12-05 16:20:24 -05:00
MascaraSnake	114753e2fe	Merge branch 'paperfix2' into 'master' ... Another potential papersprite crash fix Closes #456 See merge request STJr/SRB2Internal!605	2019-12-05 16:19:33 -05:00
Alam Ed Arias	c0ec90901e	frameFrame is unsigned, let set it to 0xFF	2019-12-05 15:50:44 -05:00
toaster	b2e9e8fb18	Fix V_WordWrap and the new additional text colour codes.	2019-12-05 19:43:37 +00:00
Jaime Passos	7765dd538c	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-05 16:26:50 -03:00
toaster	b76a1d3df7	* Don't iterate through the list twice to print "No hidden emblems on this map". ... * Make it "No hint available for this emblem" instead of "No hints available", which people may confuse as the first message (I know I did!)	2019-12-05 19:26:31 +00:00
Jaime Passos	ed34cb8d79	Change st_overlay to cv_showhud.value	2019-12-05 16:25:19 -03:00
toaster	514616c546	Allow for 10 emblem hints on a map by poking the drawer a bit. ... This is a very small diff, but I can understand if you'd not feel comfortable having this until after 2.2.0.	2019-12-05 19:09:41 +00:00
toaster	7bd5d291ce	Fix unlockable checklist literally hanging if any unlockables are cleared.	2019-12-05 18:40:30 +00:00
Alam Ed Arias	3120c99eeb	Fix compiling for MSVC	2019-12-05 12:38:50 -05:00
Alam Ed Arias	0ca87560ab	Fix building libpng and zlib with MSVC	2019-12-05 12:33:18 -05:00
Alam Ed Arias	f1d2968c19	Merge branch 'public_next' into private	2019-12-05 11:18:33 -05:00
Alam Ed Arias	b1571f81b1	Merge branch 'master' into next	2019-12-05 10:52:17 -05:00
Alam Ed Arias	0a24c82346	Fix building with MSVC	2019-12-05 10:51:55 -05:00
toaster	7f6c98f046	Fix clearing maps making the Tutorial option on the SP menu crash.	2019-12-05 13:42:08 +00:00
toaster	848d7ad819	Allow the NiGHTS Attack menu to have the levels selectable left-and-right-wise, just like Record Attack.	2019-12-05 11:12:35 +00:00
toaster	2b5957fd1c	Fix #457 and another bug I just realised in one fell swoop. ... That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.	2019-12-05 09:47:29 +00:00
toaster	25eacbffb8	Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay. ... Should resolve both #440 and #458, which are two sides of the same issue - target being overwritten.	2019-12-05 09:36:58 +00:00
toaster	7c7f258c2d	Another potential papersprite crash fix, but way more confident about this one.	2019-12-05 09:28:28 +00:00
lachwright	cffc6a0e46	Fix diagonal input acceleration and glide directioning in analog mode	2019-12-05 15:59:16 +08:00
Jaime Passos	13c6b38b13	Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2	2019-12-05 02:03:09 -03:00
lachwright	28fbdab3d4	Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode	2019-12-05 12:58:44 +08:00
Jaime Passos	c0cc742fb8	Remove unnecessary function parameters from title card code	2019-12-05 01:58:19 -03:00
Jaime Passos	b5d5749bfb	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-05 01:48:58 -03:00
Jaime Passos	7384522aef	Fix Continue game state wipes	2019-12-05 01:47:51 -03:00
lachwright	fdf3944f60	Merge branch 'master' into signpost-cleanup	2019-12-05 12:37:03 +08:00
lachwright	8ddfdf2d0f	Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode	2019-12-05 12:36:25 +08:00
sphere	d1b456b893	Edit some rock crumble states to match new sprites.	2019-12-05 02:22:25 +01:00
Jaime Passos	6adb957f0f	Slap colormap fades everywhere	2019-12-04 19:25:39 -03:00
MascaraSnake	e6f1b82cc4	Merge branch 'minusoneframes' into 'master' ... Minus One Frames See merge request STJr/SRB2Internal!593	2019-12-04 17:15:51 -05:00
MascaraSnake	6b344b9ddf	Merge branch 'freemipmapcolormap-momento-irmao' into 'master' ... Fix FreeMipmapColormap yet again See merge request STJr/SRB2Internal!597	2019-12-04 17:10:06 -05:00
MascaraSnake	a7884e479a	Merge branch 'timeoverrings' into 'master' ... Time Over rings (resolves #446). Closes #446 See merge request STJr/SRB2Internal!596	2019-12-04 17:09:32 -05:00
MascaraSnake	6928763961	Merge branch 'nullplayerslopelaunch' into 'master' ... Fix slope launch with NULL player causing SIGSEGV. See merge request STJr/SRB2Internal!595	2019-12-04 17:07:04 -05:00
MascaraSnake	01da9f7f16	Merge branch 'tokenultimate' into 'master' ... Fix tokens not spawning in ultimate mode See merge request STJr/SRB2Internal!594	2019-12-04 17:06:43 -05:00
MascaraSnake	5662f8de00	Merge branch 'credits-update' into 'master' ... Credits update See merge request STJr/SRB2Internal!484	2019-12-04 16:59:46 -05:00
MascaraSnake	6a811515db	Merge branch 'have_png-compile-fix' into 'master' ... NO_PNG_LUMPS compile fix See merge request STJr/SRB2Internal!598	2019-12-04 16:59:13 -05:00
MascaraSnake	77d446cc04	Merge branch 'spsmshgular' into 'master' ... sfx_spsmsh (hhz spikeball) is now singular Closes #451 See merge request STJr/SRB2Internal!599	2019-12-04 16:58:56 -05:00
toaster	fe0b92d01a	sfx_spsmsh (hhz spikeball) is now singular	2019-12-04 20:32:46 +00:00
Jaime Passos	81cfca29d8	Fix FreeMipmapColormap yet again	2019-12-04 15:50:17 -03:00
Jaime Passos	b646922967	fix Ploadflat warning	2019-12-04 15:41:29 -03:00
Jaime Passos	839251633c	fix ErrorIfPNG errors	2019-12-04 15:26:51 -03:00
toaster	e8ac1c391c	Make rings 0 in competition winner selection if you gamed or timed over, and use the MAXSCORE macro instead of a hardcoded value.	2019-12-04 17:32:47 +00:00
Alam Ed Arias	c432f86624	change from shifting bits to multi for a OLD video function marco	2019-12-04 10:43:33 -05:00
Alam Ed Arias	0751f8987a	Libs: move pngconf.h out of top level libpng source folder	2019-12-04 10:41:54 -05:00
toaster	7f82d7451d	Fix slope launch with NULL player causing SIGSEGV.	2019-12-04 12:13:27 +00:00
Steel Titanium	41210708e2	Merge branch 'fade-timeout-fix' into 'master' ... Temporary fix for the fade timeout See merge request STJr/SRB2Internal!592	2019-12-03 20:19:33 -05:00
toaster	c843f22a24	Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion.	2019-12-03 23:21:36 +00:00
MascaraSnake	20c1a0158d	Added Sev to the Art section of the credits	2019-12-04 00:07:56 +01:00
MascaraSnake	c2577b6eb3	Added more people to the credits and reorganized them slightly	2019-12-04 00:02:47 +01:00
MascaraSnake	602ba32ecc	A few more credits additions/adjustments	2019-12-03 22:22:48 +01:00
toaster	e75490c99d	Semi-hacky fix to R_AddSpriteDefs printing Added -1 frames in 0 sprites: if the start marker is equal to or beyond the end marker, none of r_things' for (l = startlump; l < endlump; l++) loops will run, so just assume no sprites. ... Simply put, `W_CheckNumForFolderStartPK3` and its `End` equivalent will never return INT16_MAX for nonexistence, and I don't want to break any assumptions elsewhere by modifying those functions directly, so this is the simplest possible fix.	2019-12-03 21:05:05 +00:00
MascaraSnake	7a8d1b4d4b	Merge branch 'creditsart' into 'master' ... New credits art + credits header support See merge request STJr/SRB2Internal!591	2019-12-03 14:28:51 -05:00
Louis-Antoine	84e7672cca	Temporary fix for the fade timeout	2019-12-03 12:02:14 +01:00
MascaraSnake	0c048d2667	Merge branch 'tailsbotdetect' into 'master' ... Attempt to detect Tailsbot and Sonic spawning on top of each other See merge request STJr/SRB2Internal!584	2019-12-03 02:20:30 -05:00
MascaraSnake	f9460434f8	Merge branch 'savedatareorder' into 'master' ... Savedata load order of operations change See merge request STJr/SRB2Internal!583	2019-12-03 02:18:06 -05:00
MascaraSnake	c30886a47f	Merge branch 'botregrab' into 'master' ... Allow re-grabbing Tails AI mid-flight (resolves #428) Closes #428 See merge request STJr/SRB2Internal!590	2019-12-03 02:17:37 -05:00
MascaraSnake	c1d5f411e0	Merge branch 'paperfixes' into 'master' ... Nail a likely culprit in papersprite rendering resolving #427 and #375. Closes #427 and #375 See merge request STJr/SRB2Internal!589	2019-12-03 02:16:26 -05:00
MascaraSnake	ab400e926a	Merge branch 'emeraldfall' into 'master' ... Fix emerald coordinate overflow in failed SS tally (resolves #421). Closes #421 See merge request STJr/SRB2Internal!586	2019-12-03 02:15:47 -05:00
MascaraSnake	ba0dc5c884	Merge branch 'ideyagun' into 'master' ... Ideyagun (resolves #406). Closes #406 See merge request STJr/SRB2Internal!582	2019-12-03 02:15:26 -05:00
Alam Ed Arias	b5738620c1	Fixup compiling errors	2019-12-02 12:12:26 -05:00
lachwright	be3d7b7dcd	- Remove y coordinate from struct for credits_pics ... - Update x coordinates for credits_pics entries - Reorder credits_pics entries (what even was the previous order lol) - Add zig zag graphics to credits roll - Attempt to scale the y positions of credits graphics with the length of the credits roll - New escape character for credits entries: \2, which centers the text and makes it yellow - Add support for colored text to V_DrawStringAtFixed	2019-12-02 22:24:05 +08:00
toaster	2bc67bf813	Allow re-grabbing Tails AI mid-flight (resolves #428)	2019-12-01 13:31:33 +00:00
toaster	f21ebaea0c	Nail a likely culprit in papersprite rendering for #427 and #375.	2019-12-01 13:21:41 +00:00
MascaraSnake	ae2594e5ce	Merge branch 'metalfix' into 'master' ... Boss Scream fix See merge request STJr/SRB2Internal!581	2019-12-01 02:26:24 -05:00
MascaraSnake	97fdc5aaf0	Merge branch 'introfix' into 'master' ... Fix intro's BRITEGG/DARKEGG scale See merge request STJr/SRB2Internal!580	2019-12-01 02:25:22 -05:00
sphere	ec3548c7f4	Merge remote-tracking branch 'origin/master' into credits-update	2019-12-01 00:32:01 +01:00
toaster	f662ef9454	Fix emerald coordinate overflow in failed SS tally (resolves #421).	2019-11-30 20:02:51 +00:00
sphere	d9a88ec10c	Promote some programmers, add Blade & CoatRack to texture artists.	2019-11-30 18:23:57 +01:00
toaster	515600c4d0	Attempt to detect Tailsbot and Sonic spawning at the same coords and restrict some undesirable stuff happening, just in case we miss any situations (or for the sake of mods).	2019-11-30 16:54:51 +00:00
mazmazz	be44f0701e	Clean up music error messages	2019-11-30 11:53:45 -05:00
toaster	6e278c1138	Change the order of operations such that savedata info is loaded before mapthings are spawned, so that if you have all the emeralds, the emerald objects won't spawn in BCZ2 if you use the SP savefile's level select to go to it directly.	2019-11-30 15:52:41 +00:00
toaster	3267a98fe9	Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly.	2019-11-30 15:28:50 +00:00
toaster	9d442ae6ea	Wait, no, I'm an idiot.	2019-11-30 14:56:43 +00:00
toaster	2eb8e6be49	...why is Metal overwriting his movecount to spawn explosions?	2019-11-30 14:37:21 +00:00
lachwright	6613286f1c	Fix intro's BRITEGG/DARKEGG scale	2019-11-30 22:07:21 +08:00
MascaraSnake	e664e8b7f3	Merge branch 'jumphood' into 'master' ... Jumphood See merge request STJr/SRB2Internal!573	2019-11-30 06:53:15 -05:00
lachwright	d46f022837	Restore spindash sounds to DSSPNDSH	2019-11-30 19:30:58 +08:00
toaster	85e3180056	Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA.	2019-11-30 10:31:18 +00:00
toaster	0d4158bbd0	Fix the flung Brak not being removed on deathpits.	2019-11-30 10:29:51 +00:00
MascaraSnake	0d433b9e51	Merge branch 'brakyeet' into 'master' ... This Black Eggman? ***YEET*** (resolves #399) Closes #399 See merge request STJr/SRB2Internal!575	2019-11-30 05:21:55 -05:00
MascaraSnake	b22e8c809f	Merge branch 'goldstatue' into 'master' ... Gold statue MTF_EXTRA See merge request STJr/SRB2Internal!576	2019-11-30 05:19:27 -05:00
toaster	c2bd91af50	Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly.	2019-11-30 10:12:45 +00:00
MascaraSnake	23b0b03d4d	Merge branch 'spd' into 'master' ... Deton alert sound See merge request STJr/SRB2Internal!491	2019-11-30 05:04:10 -05:00
MascaraSnake	c72f501042	Merge branch 'sandtnoflip' into 'master' ... S&T no flip See merge request STJr/SRB2Internal!571	2019-11-30 05:03:07 -05:00
MascaraSnake	6bbc412eac	Merge branch 'finalcountdown' into 'master' ... The final countdown (resolves #400). Closes #400 See merge request STJr/SRB2Internal!574	2019-11-30 04:03:07 -05:00
MascaraSnake	8a3c7da1d2	Merge branch 'mapinter' into 'master' ... Intermission Buffer Clear On Map Command (no funny name today) See merge request STJr/SRB2Internal!570	2019-11-30 04:02:44 -05:00
MascaraSnake	3bddd4365a	Merge branch 'newintro' into 'master' ... New intro graphics See merge request STJr/SRB2Internal!524	2019-11-30 04:01:51 -05:00
lachwright	916fec2c41	Make INTRO4 display at high res	2019-11-30 12:31:23 +08:00
lachwright	d88eef3e95	Merge branch 'master' into newintro	2019-11-30 12:30:12 +08:00
toaster	339907fd5d	This Black Eggman? ***YEET*** ... Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.	2019-11-29 21:55:25 +00:00
toaster	fdcc8c912a	Actually, wait; this is way better and cleaner.	2019-11-29 20:41:13 +00:00
toaster	ed0529b9d5	Match final countdown timer to timer (resolves #400).	2019-11-29 20:35:59 +00:00
toaster	0db38d213b	Make Cobalt-picked sound effect audible from far away, like the original.	2019-11-29 20:04:14 +00:00
toaster	de34298bbd	Merge branch 'master' into spd	2019-11-29 19:19:55 +00:00
toaster	1fa87611f7	Give the Robo-Hood a cute jump sound whenever it's fleeing you.	2019-11-29 19:18:05 +00:00
toaster	92f8c002f3	Prevent exit sectors having any effect whatsoever outside of platform gametypes (resolve #396).	2019-11-29 19:11:17 +00:00
toaster	960ee7fe72	Don't flip P1 of a two-character save card, for aesthetique reasons.	2019-11-29 15:58:37 +00:00
toaster	cbc49882bc	Fix screen buffer not being cleared if a map command is used during the intermission.	2019-11-29 15:25:55 +00:00
MascaraSnake	bc00380aa4	Merge branch 'endelinger' into 'master' ... Endelinger (resolves #384). Closes #384 See merge request STJr/SRB2Internal!569	2019-11-28 16:10:04 -05:00
MascaraSnake	ebcb17d607	Merge branch 'sleepwalkin' into 'master' ... Sleepwalkin (resolves most of #382) Closes #382 See merge request STJr/SRB2Internal!567	2019-11-28 16:08:40 -05:00
James R	ccbb122143	Holy shit	2019-11-28 12:10:57 -08:00
MascaraSnake	2495e58bdb	Merge branch 'campokes' into 'master' ... Camera pokes (resolves #359, #363, and #383). Closes #359, #363, and #383 See merge request STJr/SRB2Internal!566	2019-11-28 14:21:18 -05:00
toaster	f5dd0c5c3b	Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out (resolves #384).	2019-11-28 19:11:12 +00:00
MascaraSnake	546c54b390	Merge branch 'mpspecfix2' into 'master' ... Counting spheres (resolves #378). Closes #378 See merge request STJr/SRB2Internal!564	2019-11-28 13:54:47 -05:00
Louis-Antoine	ec69195fc9	Keep counting players as finished even after dying	2019-11-27 17:32:02 +01:00
toaster	803b22a3e7	Change required for Tails' tails to behave like falling sprite.	2019-11-27 13:54:13 +00:00
toaster	7ff218efaf	Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382).	2019-11-27 13:47:38 +00:00
toaster	ae84246721	Fix camera not being flipped when camera is stopped due to game design hack reasons (resolves #383).	2019-11-27 13:37:03 +00:00
LJ Sonic	c29540a201	Merge branch 'exit-move-lj' into 'master' ... No more drowning with exitmove now. See merge request STJr/SRB2Internal!563	2019-11-27 08:17:22 -05:00
toaster	bcbf5e7c38	Correct tutorialmode case doubling up on camerascale.	2019-11-27 12:54:00 +00:00
toaster	7ff4a9b1e7	Make camerascale have no effect in 2D mode (resolves #359 and resolves #363).	2019-11-27 12:31:23 +00:00
toaster	a3050063cd	Resolve #378, because I knew as soon as I saw that issue name that it was my fault.	2019-11-27 09:03:21 +00:00
MascaraSnake	9a1dd06776	Merge branch 'continuequestionmark' into 'master' ... Continue? See merge request STJr/SRB2Internal!562	2019-11-26 17:24:25 -05:00
MascaraSnake	c8c52315fa	Merge branch 'burningpoint' into 'master' ... Burning points (resolves #373). Closes #373 See merge request STJr/SRB2Internal!561	2019-11-26 17:24:22 -05:00
MascaraSnake	3aa72c5553	Merge branch 'ballstuck' into 'master' ... BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374) Closes #374 See merge request STJr/SRB2Internal!560	2019-11-26 17:24:20 -05:00
MascaraSnake	07afb52a2a	Merge branch 'deadstuff' into 'master' ... Matters of mortality See merge request STJr/SRB2Internal!558	2019-11-26 17:24:17 -05:00
MascaraSnake	b98b56670e	Merge branch 'bottweaks' into 'master' ... Bot fixes See merge request STJr/SRB2Internal!557	2019-11-26 17:24:15 -05:00
MascaraSnake	e49e91c355	Merge branch 'unslide' into 'master' ... Unslide (resolves #369). Closes #369 See merge request STJr/SRB2Internal!556	2019-11-26 17:24:12 -05:00
toaster	c55a6cb3f8	MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this	2019-11-26 17:10:59 -05:00
toaster	d56a117a93	Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer.	2019-11-26 18:25:36 +00:00
toaster	fa01a32a7f	Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery (resolves #373).	2019-11-26 17:56:42 +00:00
toaster	613ae0c9f8	Resolve #374.	2019-11-26 17:06:30 +00:00
toaster	f50feb1639	Change the default value of cv_coopstarposts (as per #321), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.)	2019-11-26 12:37:57 +00:00
toaster	b71cf97cac	* Prevent that GOD AWFUL random camera turn that happens sometimes during the fade after you die (when you input camera turn stuff after death) by locking the camera during PST_REBORN. ... * Remove whitespace in P_DeathThink.	2019-11-26 12:33:56 +00:00
toaster	f1387a07a1	Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage.	2019-11-26 12:30:32 +00:00
toaster	6ac44415fb	Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it. ... Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.	2019-11-26 11:55:31 +00:00
toaster	e8b3f84741	Prevent Tailsbot from considering flight when Sonic is exiting.	2019-11-26 11:53:49 +00:00
toaster	1dee1da7e3	Fix issue where you can get stuck in pain frames after stepping up, or after sliding (resolves #369).	2019-11-26 10:11:52 +00:00
Jaime Passos	67d0499903	Fix stuck closed captioning	2019-11-25 20:16:17 -03:00
MascaraSnake	05ee9c8a21	Merge branch 'paperslid' into 'master' ... SMOOTH PAPERCOLLISION TIME!!!!!!!! Closes #273 See merge request STJr/SRB2Internal!554	2019-11-25 17:07:56 -05:00
MascaraSnake	4c1c87df39	Merge branch 'xtrafix' into 'master' ... Stop being so XTRA (resolves #362). Closes #362 See merge request STJr/SRB2Internal!552	2019-11-25 17:02:32 -05:00
MascaraSnake	34baf101aa	Merge branch 'nightsnoforce' into 'master' ... Charsel tweaks See merge request STJr/SRB2Internal!551	2019-11-25 16:54:27 -05:00
MascaraSnake	1128660c5c	Merge branch 'fix-play-sfx-exec-part2' into 'master' ... Fix the "play sound from nowhere as long as you're in the tagged areas" behavior See merge request STJr/SRB2Internal!553	2019-11-25 16:54:08 -05:00
MascaraSnake	73bb913ec9	Merge branch 'paperprojection' into 'master' ... Papersprite projection tweak See merge request STJr/SRB2Internal!535	2019-11-25 16:53:48 -05:00
MascaraSnake	858df0c704	Merge branch 'charlock' into 'master' ... Charlock (resolves #345). Closes #345 See merge request STJr/SRB2Internal!528	2019-11-25 16:44:38 -05:00
MascaraSnake	f1584efe80	Merge branch 'unglue-metalsonic' into 'master' ... Unglue Metal Sonic after floating onto a platform Closes #344 See merge request STJr/SRB2Internal!526	2019-11-25 16:44:18 -05:00
MascaraSnake	8adcea56c3	Merge branch 'minusflip' into 'master' ... Have Minus rotate in mid-air Closes #326 See merge request STJr/SRB2Internal!532	2019-11-25 16:43:49 -05:00
MascaraSnake	aaea0f095c	Merge branch 'knuxstuff' into 'master' ... Minor Knuckles fixes See merge request STJr/SRB2Internal!527	2019-11-25 16:41:56 -05:00
MascaraSnake	f54eeb82b7	-Fix player being able to push up spikes ... -Minor tweaks to make paper collision slightly more reliable	2019-11-25 22:35:40 +01:00
toaster	64cda33d6d	SMOOTH PAPERCOLLISION TIME!!!!!!!! ... resolves #273, damn i feel good	2019-11-25 20:12:42 +00:00
Nev3r	1b360d2cd8	Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor.	2019-11-25 20:30:06 +01:00
toaster	ef556ca6d5	Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check). ... Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.	2019-11-25 18:52:38 +00:00
MascaraSnake	8596445de6	Merge branch 'statisticase' into 'master' ... Statisticase (resolves #339). Closes #339 See merge request STJr/SRB2Internal!531	2019-11-25 13:21:09 -05:00
MascaraSnake	3a12c13e50	Merge branch 'nightsmode-menu-fix' into 'master' ... Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353) Closes #353 See merge request STJr/SRB2Internal!539	2019-11-25 13:20:31 -05:00
MascaraSnake	e48f4170fc	Merge branch 'springroll' into 'master' ... Spring roll (Resolves #336). Closes #336 See merge request STJr/SRB2Internal!543	2019-11-25 13:20:16 -05:00
MascaraSnake	bdc0075ee0	Merge branch 'speclook' into 'master' ... Speclook (resolves #340). Closes #340 See merge request STJr/SRB2Internal!529	2019-11-25 13:20:00 -05:00
LJ Sonic	406ff44bae	Merge branch 'speedingofftocorner' into 'master' ... Fix "Speeding off to..." placement in non-green resolutions See merge request STJr/SRB2Internal!549	2019-11-25 13:12:04 -05:00
LJ Sonic	0cc5d35308	Merge branch 'reversesmash' into 'master' ... Spikes and gravity (resolves #348). Closes #348 See merge request STJr/SRB2Internal!541	2019-11-25 13:11:48 -05:00
LJ Sonic	31af9107e3	Merge branch 'lavafall-firedamage' into 'master' ... Give RVZ lavafalls fire damage (resolves #352) Closes #352 See merge request STJr/SRB2Internal!540	2019-11-25 13:09:18 -05:00
LJ Sonic	66c46bb3ea	Merge branch 'mapisnowZONE' into 'master' ... Map is now ZONE See merge request STJr/SRB2Internal!548	2019-11-25 13:08:01 -05:00
LJ Sonic	69c41c5013	Merge branch 'bashfix' into 'master' ... Fixed crash when BASH's target disappears during chasing Closes #341 See merge request STJr/SRB2Internal!525	2019-11-25 13:06:16 -05:00
LJ Sonic	1892ab0de5	Merge branch 'tutboxgl' into 'master' ... Tutorial Prompt in GL (resolves #349). Closes #349 See merge request STJr/SRB2Internal!544	2019-11-25 13:05:46 -05:00
LJ Sonic	9541137f5e	Merge branch 'join-bug-fix' into 'master' ... Fix for the join bug Closes #302, #338, and #347 See merge request STJr/SRB2Internal!545	2019-11-25 12:58:48 -05:00
LJ Sonic	6c453ebf6e	Merge branch 'mpspecialfixes' into 'join-bug-fix' ... MP Special Stage fixes (resolves #347). See merge request STJr/SRB2Internal!546	2019-11-25 12:56:22 -05:00
toaster	f86b46640d	Skip character select entirely if only one character is available on the list.	2019-11-25 17:06:06 +00:00
toaster	fc407cf6ce	Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection.	2019-11-25 16:55:18 +00:00
toaster	5cf803f7d0	Allow character select for NiGHTS stages on the Secret Level Select now that every character has NiGHTS sprites. ... (think of this as the collorary to 358, not a direct change)	2019-11-25 16:46:26 +00:00
Louis-Antoine	404d09e35a	Do not focus the camera on the end sign if exitmove is active	2019-11-25 17:23:35 +01:00
lachwright	f7ede3b313	Merge branch 'master' into unglue-metalsonic	2019-11-26 00:20:47 +08:00
lachwright	287e8133bb	Add comment	2019-11-26 00:20:43 +08:00
lachwright	5719a93211	Fix 'Speeding off to...' placement in non-greeen resolutions	2019-11-26 00:16:46 +08:00
toaster	6398779983	Correct two instances where "Zone" is forced uppercase.	2019-11-25 16:04:03 +00:00
toaster	2110fa6bd1	Fix extra lives given to game-overed players not re-entering them into the action when cv_coopstarposts is 0.	2019-11-25 14:59:06 +00:00
toaster	71e74ca363	Fix a bunch of shit with MP special stages! ... * Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347). * Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.	2019-11-25 14:33:15 +00:00
MascaraSnake	10df92d232	Merge branch 'shhhhhfang' into 'master' ... Make DSWBREAK a singular sound See merge request STJr/SRB2Internal!534	2019-11-25 03:00:49 -05:00
MascaraSnake	9e598f583a	Merge branch 'hwr-cache-fix' into 'master' ... Fix FreeMipmapColormap crash (resolves #287 and #351) Closes #287 and #351 See merge request STJr/SRB2Internal!538	2019-11-25 02:59:07 -05:00
Louis-Antoine	a187460865	Revert "Render title map on connecting to server screen too" ... This reverts commit b6e145f0c5.	2019-11-25 01:09:00 +01:00
toaster	82843fc78e	Fix Tutorial prompt being incorrect size in GL (resolves #349).	2019-11-25 00:08:38 +00:00
toaster	df5c8e792f	Go from spindash into ordinary roll if player's speed is suddenly above the speed you're allowed to roll at.	2019-11-24 22:55:37 +00:00
Louis-Antoine	74ae5819c4	Account for exiting but non-finished players in G_EnoughPlayersFinished	2019-11-24 23:40:40 +01:00
toaster	c0bc46ca9c	A bunch of spike tweaks. ... * Make it possible to break them in reverse gravity (resolves #348) by making the spikes break in a circle around the spike touched, rather than in a circle around the player. * Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj. * Make their breaking sound singular (prevents eardrum destruction).	2019-11-24 22:38:26 +00:00
MascaraSnake	7b80d509cc	Give RVZ lavafalls fire damage	2019-11-24 23:01:17 +01:00
Steel Titanium	d4a8fd8e64	Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353)	2019-11-24 16:37:13 -05:00
Jaime Passos	c9ff8ec26b	Fix FreeMipmapColormap crash	2019-11-24 17:37:11 -03:00
toaster	3594623891	Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was! ... Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.	2019-11-24 16:42:13 +00:00
lachwright	6733a8c38f	Shhhhh, Fang	2019-11-24 23:46:37 +08:00
lachwright	4e9e5a072f	Have Minus spawn debris upon landing, as suggested	2019-11-24 23:42:27 +08:00
toaster	6773b39a40	Woops	2019-11-24 15:19:15 +00:00
toaster	fd657d2ff4	Fix bugs discovered in testing.	2019-11-24 15:06:37 +00:00
toaster	f602e5bfb7	"showconditionset" option for Unlockables and Extra Emblems. See merge request (coming shortly) for full description/prompt.	2019-11-24 14:35:31 +00:00
lachwright	9a7979d841	Have Minus rotate in mid-air	2019-11-24 22:29:26 +08:00
toaster	508feaad9d	Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339).	2019-11-24 13:51:53 +00:00
toaster	4dfae1a65b	Make cv_exitmove only have effect if gametype is GT_COOP, otherwise immediately exit (resolves #342).	2019-11-24 13:35:37 +00:00
toaster	fcfbd403f0	Make mouselook follow the first-person option when a spectator, even when other variables assume you're in third person (resolves #340).	2019-11-24 13:30:49 +00:00
toaster	6cc2ca7542	* Resolve #345. ... * Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.	2019-11-24 13:24:37 +00:00
lachwright	ccc41c7a8f	Fix elemental stomp activating glide landing after emerging from goop; fix climbing boost-up not scaling properly with player scale	2019-11-24 19:30:20 +08:00
lachwright	3fa04cb091	Make Metal's vertical float speed technically negative	2019-11-24 18:46:59 +08:00
MascaraSnake	4be45a5e43	Fixed crash when BASH's target disappears during chasing	2019-11-24 10:22:00 +01:00
lachwright	23ab807d68	Complete new intro	2019-11-24 15:58:03 +08:00
lachwright	f2de738b09	Merge branch 'master' into newintro	2019-11-24 13:11:38 +08:00
MascaraSnake	d99e3f8337	Merge branch 'translucenthud-showfps-fix' into 'master' ... Title card showfps translucency fix See merge request STJr/SRB2Internal!522	2019-11-23 18:16:17 -05:00
MascaraSnake	5fe89e6e9b	Merge branch 'ra-wipe-fix' into 'master' ... Fix RA fade (resolves #329) Closes #329 See merge request STJr/SRB2Internal!521	2019-11-23 18:16:09 -05:00
MascaraSnake	df50900ac5	Merge branch 'statusbar-stuff' into 'master' ... No longer allow showhud to toggle FPS counter or ping bar See merge request STJr/SRB2Internal!523	2019-11-23 18:09:59 -05:00
MascaraSnake	a24949cfa6	Merge branch 'menu-reordering' into 'master' ... Menu reordering (also renaming secrets to extras) See merge request STJr/SRB2Internal!511	2019-11-23 17:51:46 -05:00
MascaraSnake	33dc443b77	Merge branch 'nightsexitcam' into 'master' ... NiGHTS exit camera tweak See merge request STJr/SRB2Internal!519	2019-11-23 17:51:34 -05:00
MascaraSnake	01f02b142f	Merge branch 'exitcam' into 'master' ... Exit camera fixes (Resolves #327). Closes #327 See merge request STJr/SRB2Internal!518	2019-11-23 17:51:29 -05:00
MascaraSnake	9b8b463791	Merge branch 'horizonclimb' into 'master' ... Horizonclimb (resolves #323) Closes #323 See merge request STJr/SRB2Internal!516	2019-11-23 17:51:17 -05:00
MascaraSnake	cd38173a7b	Merge branch 'superrun' into 'master' ... Super runspd fix See merge request STJr/SRB2Internal!515	2019-11-23 17:51:12 -05:00
MascaraSnake	5715727724	Merge branch 'firefuck2' into 'master' ... Firefuck II Closes #310 See merge request STJr/SRB2Internal!512	2019-11-23 17:51:02 -05:00
Jaime Passos	2a9db29c58	fix showfps with st_translucency	2019-11-23 18:41:28 -03:00
Jaime Passos	e850d42bc2	fix RA fade	2019-11-23 18:15:09 -03:00
Steel Titanium	97a87574b2	No longer allow showhud to toggle FPS counter or ping bar	2019-11-23 16:09:02 -05:00
MascaraSnake	aabddd69f1	Fixed a missing space in the "Speeding off to..." text	2019-11-23 18:51:32 +01:00
toaster	90c13effc0	Since I was tired of seeing NiGHTS players bump their head into the ceiling, and since similar camera enhancements have been made for the papersprite sign exit, implement a camera lock when exiting while NiGHTS. ... https://cdn.discordapp.com/attachments/359091121789468672/647821662003396609/srb20088.gif	2019-11-23 15:40:32 +00:00
toaster	ebead10dca	Remove duplicate viewpointx/viewpointy set.	2019-11-23 15:23:42 +00:00
toaster	7956584797	Have the vertical aiming focus on the signpost's z rather than continue to focus on the player even while the camera is forced to be near the signpost. (resolves #327)	2019-11-23 15:11:24 +00:00
toaster	5a63e22f56	It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into tails->target. ... Resolves #331, and likely also #330 and #309.	2019-11-23 14:43:47 +00:00
toaster	95ed442d55	Prevent Knuckles latching onto horizon special linedefs. ... Also, update all references to the horizon special to use a #defined constant instead of a magic number.	2019-11-23 14:20:41 +00:00
MascaraSnake	4ccb4f5c8a	Merge branch 'crossfade-fix' into 'master' ... Fix crossfades See merge request STJr/SRB2Internal!514	2019-11-23 04:14:07 -05:00
lachwright	dea1ba6568	Merge branch 'master' into signpost-cleanup	2019-11-23 07:05:45 +08:00
toaster	0f164301e1	Do Cobalt's suggestion, because this branch wasn't gonna get merged in its original state anyways.	2019-11-22 16:27:22 -05:00
MascaraSnake	2c85aa9f69	Merge branch 'drtminus' into 'master' ... drt minus See merge request STJr/SRB2Internal!495	2019-11-22 16:09:58 -05:00
toaster	5611f8eff4	I was reading the Sonic 3 Unlocked blog by NeoHazard when I came across a very interesting post. ... https://s3unlocked.blogspot.com/2017/12/over-threshold.html It turns out that in Sonic 3 & Knuckles, the threshold for crossing into the super animation is increased compared to normal gameplay. This makes a lot of sense - however, both Sonic Mania and the Taxman/Stealth mobile remakes missed this. I quickly tested and confirmed that SRB2 had the same issue, so here's the fix.	2019-11-22 21:06:25 +00:00
Jaime Passos	b24c709206	clarify comment	2019-11-22 17:50:05 -03:00
Jaime Passos	faa305a2f2	Fix crossfades ... Fixes NoReload using the wrong wipestyle. Also fixes non-titlemap title screen wipes using the wrong wipestyle.	2019-11-22 17:44:42 -03:00
Jaime Passos	227f69f063	fix missing mmx check	2019-11-22 17:30:53 -03:00
MascaraSnake	6545284eaf	Merge branch 'gfz-debris' into 'master' ... VAdaPEGA's GFZ debris See merge request STJr/SRB2Internal!505	2019-11-22 15:27:11 -05:00
MascaraSnake	e9ca39d3bc	Merge branch 'infopoke' into 'master' ... MS Info packet tweaks (resolves #300) Closes #300 See merge request STJr/SRB2Internal!499	2019-11-22 15:21:41 -05:00
sphere	de2a26bf5d	Swap statistics and tutorial options in the 1 Player menu.	2019-11-22 21:00:03 +01:00
toaster	c8c5237540	Resolve #310.	2019-11-22 19:51:27 +00:00
sphere	07221c50ce	i'm a dumbass	2019-11-22 20:37:35 +01:00
MascaraSnake	ca74636a27	Merge branch 'dsz3target' into 'master' ... Sea Egg targeting systems online! (resolves #303) Closes #303 See merge request STJr/SRB2Internal!501	2019-11-22 14:26:40 -05:00
MascaraSnake	6f82e5197d	Merge branch 'rollout-bumps' into 'master' ... Add fun™ to rollout rocks See merge request STJr/SRB2Internal!504	2019-11-22 14:25:39 -05:00
sphere	e3aca4b647	restore secrets = 0, not sure why i changed that	2019-11-22 20:24:57 +01:00
MascaraSnake	44fa076698	Merge branch 'radiomode3' into 'master' ... Fix conditionset-based unlocks on the Sound Test (resolves #312). Closes #312 See merge request STJr/SRB2Internal!508	2019-11-22 14:12:03 -05:00
MascaraSnake	f7c4ec1965	Merge branch 'mapvisitedupdate' into 'master' ... Intermission fixes/cleanup See merge request STJr/SRB2Internal!509	2019-11-22 14:11:31 -05:00
MascaraSnake	18babe3268	Merge branch 'followghost' into 'master' ... Followmobj Record Attack fix (resolves #322). Closes #322 See merge request STJr/SRB2Internal!510	2019-11-22 14:10:59 -05:00
MascaraSnake	e351d629bd	Merge branch 'playersall' into 'master' ... Players All reliability fix (resolves #301 and #315) Closes #301 and #315 See merge request STJr/SRB2Internal!500	2019-11-22 14:10:39 -05:00
MascaraSnake	a3a7dc6bed	Merge branch 'remove-unused-levelwipes' into 'master' ... (Cleanup) Remove unused levelwipes See merge request STJr/SRB2Internal!507	2019-11-22 09:21:17 -05:00
MascaraSnake	ae8f0b42aa	Merge branch 'titlecard-event-fix' into 'master' ... Remove D_ProcessEvents call in G_PreLevelTitleCard (resolves #317) Closes #317 See merge request STJr/SRB2Internal!506	2019-11-22 09:12:02 -05:00
lachwright	3e1c3b04e7	WIP intro graphics update	2019-11-22 20:08:23 +08:00
sphere	514394a4f3	fuck autocomplete	2019-11-22 04:12:38 +01:00
toaster	143d4aa053	Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.	2019-11-21 23:38:33 +00:00
toaster	3798e886ea	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into mapvisitedupdate	2019-11-21 23:16:06 +00:00
toaster	990d9ed40c	Correct location of followmobj scale write to match read (resolves #322). ... Requires deleting all of RC1's Record Attack replays with followmobj characters, but I think you'll agree that's a reasonable price to pay.	2019-11-21 22:50:04 +00:00
toaster	7ff616b26e	Do a whole bunch of cleanup for mapvisited and intermission related things. ... * Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission. * Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission. * Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission. Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied). Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.	2019-11-21 16:10:28 +00:00
sphere	5a7ebb3ba6	Re-reorganize sound options.	2019-11-21 16:53:37 +01:00
sphere	b37c3a414a	Remove unneeded HAVE_MIXERX checks.	2019-11-21 16:35:27 +01:00
MascaraSnake	f13e67bf8f	Merge branch 'gametype-out-of-range' into 'master' ... Prevent gametype changes being out of range See merge request STJr/SRB2Internal!503	2019-11-21 09:31:05 -05:00
MascaraSnake	9db5c5875c	Merge branch 'hi-lj' into 'master' ... Fix issue with strcasestr that causes a map command crash See merge request STJr/SRB2Internal!502	2019-11-21 09:30:18 -05:00
MascaraSnake	f1ab6783c2	Merge branch 'subtitlesubterfuge' into 'master' ... Subtitle subterfuge (resolves #306) Closes #306 See merge request STJr/SRB2Internal!498	2019-11-21 09:29:13 -05:00
MascaraSnake	3b2b8ab80f	Merge branch 'ptzcrash' into 'master' ... Fix crash in new fireflower (resolves #305). Closes #305 See merge request STJr/SRB2Internal!497	2019-11-21 09:28:35 -05:00
toaster	7c7eec4b9a	Fix conditionset-based unlocks on the Sound Test.	2019-11-21 13:12:54 +00:00
Jaime Passos	248306ccb0	Remove D_ProcessEvents call in G_PreLevelTitleCard	2019-11-21 02:16:09 -03:00
sphere	f021d35e7e	Move tutorial to the bottom of the 1 Player menu.	2019-11-21 02:43:07 +01:00
sphere	74987beb1f	Reword some evaluation sentences.	2019-11-21 02:24:12 +01:00
sphere	48c454553f	Move SP and MP down if extras aren't unlocked yet.	2019-11-21 02:19:31 +01:00
sphere	9608021824	Rename "secrets" to "extras".	2019-11-21 01:34:32 +01:00
sphere	f587069d0e	Reorganize sound options.	2019-11-21 01:14:09 +01:00
sphere	2d509eff47	Move the main menu options around.	2019-11-21 00:34:58 +01:00
lachwright	35f2572e29	Correct sound for GFZ debris (copy-paste oversight)	2019-11-21 01:26:53 +08:00
lachwright	c5d085d333	Add missing GFZD spriteset	2019-11-21 01:14:24 +08:00
lachwright	ac3924c9c8	Add GFZ debris; reorganize wood debris index	2019-11-21 01:05:22 +08:00
lachwright	cdc7a88b04	Add bump sounds to rollout rock & add Newton's third law to jumping off them	2019-11-20 23:45:34 +08:00
toaster	abf0c5e632	resolve #315	2019-11-20 14:34:19 +00:00
lachwright	cde56dbe6c	WIP fix signpost issues with exitmove	2019-11-20 21:02:34 +08:00
Jaime Passos	e0a9b3d695	Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes	2019-11-19 21:49:45 -03:00
Louis-Antoine	032f53ce07	Prevent drowning after completing the level	2019-11-19 22:44:33 +01:00
James R	6ffb18c4b1	Warn if gametype number is out of range to map command	2019-11-19 12:32:02 -08:00
James R	9b96964cbb	Check for out of range gametype on map change	2019-11-19 12:25:50 -08:00
toaster	7645d0417a	Further cleanup.	2019-11-19 20:24:44 +00:00
James R	c5d73e37bb	Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL	2019-11-19 11:16:17 -08:00
Monster Iestyn	d1d1098f7c	fix object type restrictions for popping monitors ... (MT_BOUNCERING to MT_GRENADERING are actually the ammo pickups, MT_THROWNBOUNCE to MT_THROWNGRENADE are what actually want here)	2019-11-19 12:31:20 -05:00
toaster	2bba25c1e1	As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303.	2019-11-19 15:59:24 +00:00
toaster	86f343b84b	Make the All Players linedef exectutor activator sector type more reliable for FOFs that span multiple sectors (resolves #301).	2019-11-19 14:09:24 +00:00
toaster	f5885f84f0	lmao how did i forget a null terminator	2019-11-19 13:40:07 +00:00
toaster	ef1aeb2ff6	MS Info packet tweaks. ... * Report a completely uppercase map title in SERVERINFO, as per the MS previously expected (resolves #300). * Ignore colour codes in map titles in SERVERINFO, since those now function like with console font. * Modulo the skin number provided in PLAYERINFO by 3 in DEVELOP builds, so it's safe to test with certain characters on the MS (AS LONG AS IT'S NOT A RELEASE BUILD).	2019-11-19 13:36:33 +00:00
toaster	3add9a9bd2	Make the SPEEDING OFF TO ZONE text that appears while loading: ... * Use a mixed case "Zone" to match the mixed case level titles. * Have V_TRANSLUCENT to not stick out too much against pure black/white backgrounds. (Can revert this aspect if necessary, but I think you'll agree it's a good balance between readable and aesthetic.)	2019-11-19 13:00:37 +00:00
toaster	2ac44240db	Fix the coords of the subtitle.	2019-11-19 12:59:01 +00:00
toaster	340e2e48f9	Fix crash in new fireflower. (resolves #305) ... Also, correct indentation on bounce ring fuse since I was here.	2019-11-19 11:53:45 +00:00
Jaime Passos	99d4db956c	change vertical alignment	2019-11-18 21:45:30 -03:00
Jaime Passos	8de7ff0c86	fix subttl	2019-11-18 21:44:02 -03:00
James R	1db9e312a6	P_MobjFlip does not return boolean	2019-11-18 15:55:21 -08:00
James R	f3e66f7b58	dist is unused	2019-11-18 15:53:30 -08:00
James R	1febf8cb4b	Mixed code...	2019-11-18 15:52:14 -08:00
James R	eefc285b5c	locvars not needed	2019-11-18 15:48:29 -08:00
Jaime Passos	8de06a93f9	remove UINT8 wipecolorfill	2019-11-18 20:07:37 -03:00
MascaraSnake	2418e33a00	Merge branch 'cobalt-ai' into 'master' ... CobaltBW's Tails AI See merge request STJr/SRB2Internal!358	2019-11-18 17:26:28 -05:00
Jaime Passos	1e4060af8c	remove unused levelwipes	2019-11-18 19:22:46 -03:00
MascaraSnake	3df0afb7db	Merge branch 'f_wipes' into 'master' ... Colormapped fades See merge request STJr/SRB2Internal!469	2019-11-18 17:21:09 -05:00
MascaraSnake	7dc3484e5d	Merge branch 'dragonbomber' into 'master' ... Dragonbomber See merge request STJr/SRB2Internal!489	2019-11-18 17:10:30 -05:00
Jaime Passos	1698e2d986	adjust duration	2019-11-18 19:08:04 -03:00
toaster	5eaa3fc3f8	Left this in by mistake.	2019-11-18 22:07:29 +00:00
toaster	ab70512253	As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite.	2019-11-18 22:05:05 +00:00
Jaime Passos	8a05afa1aa	Merge remote-tracking branch 'origin/master' into f_wipes	2019-11-18 18:48:19 -03:00
toaster	1fdcc270d8	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai ... # Conflicts: # src/p_map.c	2019-11-18 21:33:51 +00:00
MascaraSnake	8adc5bd876	Merge branch 'titlecards' into 'master' ... Titlecards See merge request STJr/SRB2Internal!492	2019-11-18 16:22:32 -05:00
MascaraSnake	1365ef49b3	Merge branch 'jester-fireball' into 'master' ... Mario fireball by Jester (resolves #296) Closes #296 See merge request STJr/SRB2Internal!487	2019-11-18 15:56:33 -05:00
Jaime Passos	aa659836ee	Merge remote-tracking branch 'origin/master' into titlecards	2019-11-18 17:55:47 -03:00
Steel Titanium	8d9ef84970	Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal	2019-11-18 15:41:57 -05:00
MascaraSnake	baaec6f191	Merge branch 'nightstail' into 'master' ... NiGHTS tail See merge request STJr/SRB2Internal!482	2019-11-18 15:41:52 -05:00
Steel Titanium	efac76f833	Merge branch 'public_next' into 'master'	2019-11-18 15:39:41 -05:00
MascaraSnake	2001cad144	Merge branch 'capsuletweaks' into 'master' ... Egg Capsule tweaks See merge request STJr/SRB2Internal!474	2019-11-18 15:24:13 -05:00
MascaraSnake	1210545a8e	Merge branch 'fhzenemytweaks' into 'master' ... Hardcode DrT's FHZ improvements (resolves #295). Closes #295 See merge request STJr/SRB2Internal!483	2019-11-18 15:21:59 -05:00
MascaraSnake	7a48a8d72d	Merge branch 'poledance' into 'master' ... Make ACZ3's slapstick signpost taller (resolves #267). Closes #267 See merge request STJr/SRB2Internal!473	2019-11-18 15:14:48 -05:00
MascaraSnake	233ff8bd27	Merge branch 'exit-move-lj' into 'master' ... Post-exit movement See merge request STJr/SRB2Internal!486	2019-11-18 15:10:15 -05:00
MascaraSnake	5649365c19	Merge branch 'titlecard-lowercase-support' into 'master' ... Lowercase support in titlecards See merge request STJr/SRB2Internal!481	2019-11-18 15:05:02 -05:00
MascaraSnake	98f2ee598d	Merge branch 'endingmus' into 'master' ... Ending music and associated See merge request STJr/SRB2Internal!475	2019-11-18 14:33:22 -05:00
toaster	508fdb493b	compilation fixes (no review yet, currently just about to have dinner)	2019-11-18 19:22:51 +00:00
MascaraSnake	3e7e749327	Merge branch 'reset-rollangle' into 'master' ... Reset rollangle See merge request STJr/SRB2Internal!494	2019-11-18 14:11:32 -05:00
MascaraSnake	881524a2d7	Merge branch 'signpost-cleanup' into 'master' ... Signpost camera cleanup See merge request STJr/SRB2Internal!490	2019-11-18 14:00:05 -05:00
MascaraSnake	778543af08	Merge branch 'pingimprovements' into 'master' ... Better ping implementation. See merge request STJr/SRB2Internal!488	2019-11-18 13:58:41 -05:00
MascaraSnake	dbdbc116c7	Merge branch 'metalbwarp' into 'master' ... Fix Metal Sonic not correctly flipping with gravity (Resolve #289). Closes #289 See merge request STJr/SRB2Internal!472	2019-11-18 13:39:22 -05:00
Jaime Passos	dc70a24b30	restore zigzags	2019-11-18 15:32:48 -03:00
Jaime Passos	b7f2b74d9a	V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements	2019-11-18 15:18:27 -03:00
Jaime Passos	29792c7a2b	missing prototype	2019-11-18 15:13:31 -03:00
Jaime Passos	cf24b57d8f	perplayer	2019-11-18 15:12:55 -03:00
Jaime Passos	5c55c86dd2	invert conditional	2019-11-18 15:06:07 -03:00
MascaraSnake	9da5932d88	Merge branch 'damnnothere' into 'master' ... Disable the GL sprite shadows behind a #define. See merge request STJr/SRB2Internal!485	2019-11-18 13:05:43 -05:00
MascaraSnake	535aa79418	Merge branch 'firefuck' into 'master' ... Firefuck (resolves #291). Closes #291 See merge request STJr/SRB2Internal!476	2019-11-18 13:05:00 -05:00
Jaime Passos	85f1b847e9	LF_WARNINGTITLE	2019-11-18 15:04:40 -03:00
MascaraSnake	3e7242af3c	Merge branch 'papersign3' into 'master' ... I fucked up papersigns (Resolve #288). Closes #288 See merge request STJr/SRB2Internal!471	2019-11-18 13:03:46 -05:00
Jaime Passos	444953d0bb	oh sh	2019-11-18 14:32:34 -03:00
Jaime Passos	6920d20a0f	map header option	2019-11-18 14:08:47 -03:00
Jaime Passos	e40bf85a6f	lua	2019-11-18 13:50:44 -03:00
Jaime Passos	4ea3513076	Organize	2019-11-18 12:56:41 -03:00
lachwright	f786a8dbf6	Important fixes & mine lob speed reduction	2019-11-18 22:57:26 +08:00
Jaime Passos	9d17614c55	arg	2019-11-18 11:42:45 -03:00
Jaime Passos	6c98dde736	stuff	2019-11-18 11:39:54 -03:00
lachwright	280d151d76	Allow positive momentum retention when jumping off rollout rocks	2019-11-18 22:36:25 +08:00
toaster	0e71edeb50	In the absence of a proper revamp of the badnik, give the Deton the SPB sound from Kart when it sees the player, as a teaching shorthand and/or easter egg.	2019-11-18 13:27:02 +00:00
lachwright	27fcaf0f93	Whoops, deleted a little too much by accident	2019-11-18 16:26:15 +08:00
lachwright	4c432c376e	Make camera use signpost's ground z coordinate instead of the player's z coordinate	2019-11-18 16:22:12 +08:00
lachwright	f682de3f1b	Fix controllable flight ending when player hits the ground while being carried by Tailsbot	2019-11-18 15:55:55 +08:00
lachwright	bb67b24143	Add flight indicator	2019-11-18 15:17:27 +08:00
Steel Titanium	5ad00ccd2e	Add Azeonus/SwitchKaze's name	2019-11-18 01:16:44 -05:00
lachwright	70051bd794	Don't let the bot decide to fly if it doesn't have the ability to fly	2019-11-18 13:37:09 +08:00
lachwright	52a24e0bc4	Allow AI Tails to carry the player	2019-11-18 13:30:07 +08:00
lachwright	bf4dbead74	Update to latest script version	2019-11-18 11:22:27 +08:00
Jaime Passos	8a7b3d7022	Merge remote-tracking branch 'origin/master' into titlecards	2019-11-17 23:57:18 -03:00
James R	4439d29ed7	Shift showping display up a bit	2019-11-17 18:54:23 -08:00
James R	b05dec5294	Shift ping display in scores HUD up, so it aligns with the bottom of player name	2019-11-17 18:53:17 -08:00
James R	22421b1031	Snapping for showping, so it doesn't jump way up on non-green	2019-11-17 18:52:05 -08:00
lachwright	ac7d07c9da	Prevent mines from sliding upon touching the ground	2019-11-18 10:35:56 +08:00
Louis-Antoine	b4987636fe	Add missing checks for PF_FINISHED in HUD code	2019-11-18 03:27:39 +01:00
lachwright	76831595ce	Merge branch 'master' into cobalt-ai	2019-11-18 10:13:16 +08:00
Steel Titanium	2584241a44	Better ping implementation.	2019-11-17 20:22:47 -05:00
Jaime Passos	635e121bfc	Restore old sound effect	2019-11-17 21:33:59 -03:00
Jaime Passos	64939816fb	Fireball	2019-11-17 21:25:17 -03:00
Louis-Antoine	24744d07e4	Disable exitmove by default	2019-11-17 23:52:51 +01:00
Louis-Antoine	688bf0158d	Disable Tails carrying for players who completed the level ... To avoid trolls...	2019-11-17 23:46:34 +01:00
Louis-Antoine	6c98a150be	Show the exit icon for finished players	2019-11-17 23:44:48 +01:00
toaster	4cc1b2b327	Disable the GL sprite shadows behind a #define. ... Reasoning: * They're horribly broken (they completely ignore slopes). * A similar final demo GL-only feature (coronas) has been completely disabled. * Nobody's going to bugfix them before release because not even the devteam's resident GL users use them. * They look ugly.	2019-11-17 22:18:46 +00:00
lachwright	cf53e255eb	Remove tester console prints	2019-11-18 05:31:26 +08:00
lachwright	5cafed5c72	Make rollout rocks more friendly	2019-11-18 05:30:14 +08:00
lachwright	b721c035f8	Add Dragonbomber enemy	2019-11-18 05:23:59 +08:00
sphere	440515e3af	whoops	2019-11-17 22:13:38 +01:00
toaster	ef5558af97	Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha	2019-11-17 20:34:25 +00:00
toaster	0c98fb746c	Add some NiGHTS animations which default to normal player sprite2s to the existing player->panim set list, which makes Tails' tails appear due to how P_DoTailsOverlay is coded (assuming the skin is Tails, requiring them to have SPR2_NFLY available).	2019-11-17 18:04:02 +00:00
toaster	8ce054a7c8	Align to base rather than top.	2019-11-17 15:55:22 +00:00
toaster	5909b85627	Fix overlapping on You Can Now Become Super Sonic screen.	2019-11-17 15:20:20 +00:00
toaster	76897b560f	Update end tally and sound test to accomodate new title font.	2019-11-17 14:56:05 +00:00
toaster	fdd681ab72	Since I had to tweak this branch to do the scrapped changing-to-title-music-at-a-different-time thing (since it was too late, and too late is WAY worse than too early): Have the credits music fade out over a shorter time when going to the title screen (vs going to evaluation), as opposed to stopping entirely.	2019-11-17 14:14:38 +00:00
Nev3r	5dc494da16	Mapname lowercase support (#146) ... * Moved levelname parsing to before where uppercase conversion occurs. * Extended titlecard font range. * Replaced misc. "ZONE" strings with "Zone" for titlecard purposes. * Don't convert to uppercase when rendering the titlecard name. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-11-16 20:36:25 -05:00