7541 commits

Author	SHA1	Message	Date
lachwright	f3e9dd0cad	Add static ATZ Gargoyles	2019-10-31 19:38:28 +08:00
lachwright	95a3546988	Finish Glaregoyle states	2019-10-31 19:18:44 +08:00
toaster	126fc44d6e	Change sounds, after discussing with Lach.	2019-10-30 17:37:42 +00:00
toaster	67a99f6334	ACTUALLY applied colorized flashing for dashmode to non-SF_MACHINE players, which wasn't happening for non-transparent players because :VVV	2019-10-30 17:16:44 +00:00
lachwright	7c08cd69fa	WIP new states for Glaregoyle	2019-10-31 00:32:19 +08:00
toaster	04f400e048	Give the clone fighter's vectorisation colour, rather than forcing greyscale.	2019-10-29 23:24:00 +00:00
toaster	4d55a9f4a9	Metal Sonic battle improvements. ... * Tweaked to use new sprites. * Jet fume behaves much closer to Lach's wonderful work. * Instead of clobbering tracer to spawn powerup overlay, use hprev. * Change timings. One second less to charge up, but two seconds less to spin them out. * Remove terrible pinch overlay in favour of new dashmode-mimic flashing.	2019-10-29 23:11:12 +00:00
toaster	56d095e39f	Finish the Metal demo if the Metal playback object is dead.	2019-10-29 18:17:04 +00:00
toaster	2d1a574e09	* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following... ... * Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well. * Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.	2019-10-29 17:38:14 +00:00
toaster	d7ea986d7b	I was right on the money - SendWeaponPref seems to have been delayed compared to earlier in development. Doesn't matter a lick for regular gameplay (net or otherwise), but absolutely mandatory to get it sorted ASAP in Record Attack.	2019-10-29 15:59:59 +00:00
toaster	f0f8b544de	* Add thok auras to Metal playback. ... * Add height changes to demos and Metal playback (to properly place thok aura relative to object). * Fix followmobj recordings in reverse gravity (done via more strenuous flag setting + info height serialisation). * Make RA ghosts fade in from start tic, and go colorized on their final one. * Fix thok auras potentially doing bad things if they're set to MT_NULL. * Add sprite change support to Metal playback. * Re-enable some stuff I previously disabled for Metal recording/playback. * Make ALL objects spawned with skins properly acknowledge that their spawnstate's frame is a sprite2, rather than just specific objects. * Fix placement of Metal Sonic fume in reverse gravity. * Since not backwards compatible with the previous test build, increment DEMOVERSION again. (Don't worry, we've got like 65524 more versions allowed before we run out of possible DEMOVERSIONs...)	2019-10-29 15:32:22 +00:00
lachwright	9436993a3e	Implement new states for Buggle, the new Aquabuzz	2019-10-29 15:32:03 +08:00
Jaime Passos	417aa778aa	Use doomtype.h types instead of libpng types	2019-10-29 00:20:21 -03:00
Jaime Passos	5464b6ab28	Use doomtype.h types instead of libpng types	2019-10-29 00:15:33 -03:00
Jaime Passos	0a49340ae1	Fix warnings when NOPNG=1	2019-10-28 23:46:33 -03:00
Jaime Passos	94ab276508	Merge remote-tracking branch 'origin/master' into f_wipes	2019-10-28 23:14:00 -03:00
toaster	1906709cf2	* Improve the Metal Sonic recording/playback system. ... * Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!) * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.) * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do. * Disable dashmode while recording, for a fairer race. * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt. * Always start Metal recording in wait frames for bonus taunting. Other relevant changes: * Increment DEMOVERSION *again*. * Improve the Record Attack ghost followmobj recording to accomodate Metal's jet. * Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone. * Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force. * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.	2019-10-28 22:12:47 +00:00
Jaime Passos	f6e8226c4e	Update p_user.c	2019-10-28 15:37:26 -03:00
Jaime Passos	a22af36305	add r_patch.c	2019-10-28 15:28:42 -03:00
Jaime Passos	1a44159ce9	Update r_data.c	2019-10-28 14:36:19 -03:00
Jaime Passos	79e99dc471	Merge remote-tracking branch 'origin/master' into rotsprite_i	2019-10-28 14:29:10 -03:00
Louis-Antoine	e91bf1a32e	Fix some intro fades displaying text in all-caps	2019-10-28 16:10:22 +01:00
lachwright	8824cd64fd	Merge branch 'master' into knuxstuff	2019-10-28 22:25:32 +08:00
lachwright	46ba988541	Slow climbing down underwater	2019-10-28 22:21:20 +08:00
toaster	ce91bdaaab	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut	2019-10-28 14:19:25 +00:00
toaster	9a160823aa	Replace the s3k sound used when starting dashmode with the Sonic CD equivalent, which among other things is more appropriate AND isn't used for anything unrelated so can have a more appropriate caption	2019-10-28 14:19:07 +00:00
lachwright	b93c2467e7	Don't let Knuckles play the landing animation unless in fall state	2019-10-28 22:13:34 +08:00
lachwright	1306b2bbc5	Slow glide down underwater	2019-10-28 21:30:36 +08:00
toaster	d9196485f6	Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake...	2019-10-28 13:01:15 +00:00
toaster	17dde0d91c	Forgot to make pw_noautobrake count down........	2019-10-28 12:54:55 +00:00
toaster	22649f698e	Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again.	2019-10-28 11:34:20 +00:00
James R	33816e49ca	Add overflow checks so we I_Error instead of death crash into oblivion ... You'd love to know how we even reached (size_t)-1.	2019-10-28 00:40:25 -07:00
James R	fb9421893e	:oh:	2019-10-27 14:29:13 -07:00
James R	a00dfcf420	Oh right, the keywords...	2019-10-27 14:26:29 -07:00
James R	f0e19d1597	Fix minor unnecessary call	2019-10-27 14:25:20 -07:00
James R	56ee233b08	Fix compiler warnings	2019-10-27 14:23:53 -07:00
James R	7bf819f5af	Use a superior strcasestr	2019-10-27 14:23:13 -07:00
James R	70df5242a3	Extend map name text matching code into a function	2019-10-27 14:23:03 -07:00
James R	bb65e8d72f	Add support for custom keywords ... For now, 32 characters separated by spaces. Also fixed a SIGSEGV from an empty level title.	2019-10-27 14:10:26 -07:00
James R	6358d839ee	Overhaul the map command ... Added support for map names, matched by substring and keywords too! Added support for two digit MAP codes without the MAP part. Added support for decimal map number. (But who cares.) Gave a better description of command. Supported abbreviated optional parameters. And now REALLY detects incorrect parameters.	2019-10-27 14:02:36 -07:00
James R	2078b47952	Move gamedata param to cover -resetdata	2019-10-27 10:33:40 -07:00
James R	4ac136f626	Custom gamedata parameter	2019-10-27 10:31:17 -07:00
toaster	df785e1651	* Add alternate numerical drawer for continues on Intermission screen if there's > 5. ... * Tweak offsets on Continue screen numerical continue drawer to match.	2019-10-27 17:20:43 +00:00
mazmazz	23c6011348	Fix char select music not playing in secrets menu	2019-10-27 13:12:36 -04:00
toaster	2439b2cb32	More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop.	2019-10-27 13:37:14 +00:00
toaster	9e8733be42	Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2.	2019-10-27 13:07:06 +00:00
toaster	fa187a66e2	* Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag. ... * Add a dashmode downpower sound.	2019-10-27 13:02:07 +00:00
toaster	0c52de7a29	Fix bot showing up in NiGHTS stages with a two-pronged approach. ... * Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens. * Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack). Also: * Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.	2019-10-27 12:20:17 +00:00
toaster	c221a89c67	Fix unsigned/signed comparisons.	2019-10-27 11:18:37 +00:00
Nev3r	a58c794691	Missing ;	2019-10-27 12:03:52 +01:00
James R	b6e145f0c5	Render title map on connecting to server screen too	2019-10-26 12:50:49 -07:00
MascaraSnake	801e83aef6	Merge branch 'use-zones-pk3' into 'master' ... Use zones.pk3 instead of zones.dta. See merge request STJr/SRB2Internal!352	2019-10-26 15:33:13 -04:00
mazmazz	91eb380412	Fix some jingle resuming behavior with boss music switching	2019-10-26 15:02:45 -04:00
MascaraSnake	9e9e6a8f8f	Merge branch 'metalstuff' into 'master' ... Metal Sonic's jet fume See merge request STJr/SRB2Internal!413	2019-10-26 14:52:04 -04:00
mazmazz	26cb75e961	Fix MIDI not being disabled when non-native	2019-10-26 12:09:27 -04:00
lachwright	e89948ce71	Merge branch 'master' into metalstuff	2019-10-26 16:07:59 +08:00
MascaraSnake	92be187731	Merge branch 'master' into knuxstuff	2019-10-26 08:09:13 +02:00
James R	634292a5fc	Differing signedness comparison	2019-10-25 21:44:34 -07:00
James R	64e7708832	I say damn you massive initializer!	2019-10-25 21:36:10 -07:00
mazmazz	c7c72a4892	Merge branch 'master' into new-title	2019-10-25 22:29:29 -04:00
lachwright	6c9ad67c84	Fix pointer typo (whoops)	2019-10-26 08:34:38 +08:00
lachwright	aa34f74f75	Remove imtermediary state transitions	2019-10-26 08:32:36 +08:00
lachwright	ca768b044d	Merge branch 'master' into metalstuff	2019-10-26 08:30:37 +08:00
lachwright	63d24d529a	Merge branch 'master' into knuxstuff	2019-10-26 05:53:49 +08:00
MascaraSnake	03c5b70fc5	Merge branch 'newmenus' into 'master' ... Better looking menus, nametags and much more. (Resolves #245 and #244 and #252) Closes #245, #244, and #252 See merge request STJr/SRB2Internal!389	2019-10-25 17:46:16 -04:00
MascaraSnake	4d022046fa	Merge branch 'object_tweaks' into 'master' ... Object tweaks (object_tweaks division 3) See merge request STJr/SRB2Internal!394	2019-10-25 17:45:48 -04:00
MascaraSnake	1c1fefe25f	Merge branch 'linedef-153' into 'master' ... Dynamic Sinking Platform (for Red Volcano Zone) See merge request STJr/SRB2Internal!401	2019-10-25 16:56:19 -04:00
MascaraSnake	46d105dd53	Some basic code hygiene: Remove references to the air bob code being "old" or "outdated"	2019-10-25 22:55:10 +02:00
MascaraSnake	2118b0e613	Merge branch 'hammer-landing' into 'master' ... Twinspin landing option See merge request STJr/SRB2Internal!402	2019-10-25 16:39:02 -04:00
MascaraSnake	faf61912a6	Merge branch 'lua-allow-player' into 'master' ... Allow access to players userdata outside levels. See merge request STJr/SRB2Internal!386	2019-10-25 15:40:31 -04:00
MascaraSnake	7d69409cf7	Merge branch 'set-name-on-join' into 'master' ... Set the player's name as soon as they enter the game See merge request STJr/SRB2Internal!397	2019-10-25 15:38:21 -04:00
MascaraSnake	4a9eb387f7	Merge branch 'window-focus-music' into 'master' ... Window focus options for playing sounds/music See merge request STJr/SRB2Internal!407	2019-10-25 15:37:06 -04:00
MascaraSnake	2a8e5b7bff	Merge branch 'james-kart' into 'master' ... My changes to Kart See merge request STJr/SRB2Internal!406	2019-10-25 15:36:40 -04:00
MascaraSnake	f1a7a3b4de	Merge branch 'kartport_misc-changes' into 'master' ... Kart ports: misc changes See merge request STJr/SRB2Internal!380	2019-10-25 15:33:30 -04:00
MascaraSnake	ff061fb813	Merge branch 'kartport_namedvalues' into 'master' ... Kart-port - Named cvar values + Improved "HELP" command (round 3) See merge request STJr/SRB2Internal!388	2019-10-25 15:32:56 -04:00
toaster	f2596ab0bb	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks ... # Conflicts: # extras/conf/SRB2-22.cfg	2019-10-25 20:32:15 +01:00
MascaraSnake	403d698724	Merge branch 'mi-tinkers-with-lua-again' into 'master' ... MI tinkers with lua again See merge request STJr/SRB2Internal!392	2019-10-25 15:27:55 -04:00
MascaraSnake	d7480f20fa	Merge branch 'intangible-flats-tangible-sides' into 'master' ... Collide with walls of FOF if both planes are intangible See merge request STJr/SRB2Internal!385	2019-10-25 15:26:54 -04:00
MascaraSnake	080ff854b8	Merge branch 'be-more-nice-with-levelselect-mp' into 'master' ... Remove level select restrictions in DEVELOP Multiplayer Closes #238 See merge request STJr/SRB2Internal!399	2019-10-25 15:26:09 -04:00
MascaraSnake	829706a090	Merge branch 'walltransfermove' into 'master' ... Let players move after spinning off a wall transfer See merge request STJr/SRB2Internal!412	2019-10-25 15:20:20 -04:00
MascaraSnake	5a28c03a26	Merge branch 'superminecarts' into 'master' ... Super and Minecarts fixes (resolves #259) Closes #259 See merge request STJr/SRB2Internal!408	2019-10-25 15:19:47 -04:00
MascaraSnake	2ee42c498b	Merge branch 'nonightsbot' into 'master' ... Disable tailsbot in NiGHTS maps (resolves #261) Closes #261 See merge request STJr/SRB2Internal!409	2019-10-25 15:19:05 -04:00
MascaraSnake	7a09a8bd3a	Merge branch 'cezfangcheat' into 'master' ... CEZ3 Fang cheat fix (resolves #262) Closes #262 See merge request STJr/SRB2Internal!410	2019-10-25 15:18:16 -04:00
lachwright	2d458059c8	Don't fuck nojumpspin characters who are capable of rolling	2019-10-25 18:51:41 +08:00
lachwright	d5b1467e79	Put player in jump state after spinning during a wall transfer	2019-10-25 18:48:40 +08:00
toaster	630bdaa876	Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors.	2019-10-24 21:14:51 +01:00
toaster	d89d8acc59	I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour.	2019-10-24 20:40:03 +01:00
toaster	4ff46d14dd	Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring).	2019-10-24 19:55:02 +01:00
toaster	ea0fe50f5a	Fix CEZ3's first phase being cheated by Fang.	2019-10-24 19:33:03 +01:00
toaster	527254584d	Disable tailsbot in NiGHTS maps, not just Special Stages. (Resolves #261)	2019-10-24 19:16:53 +01:00
toaster	989e089e0a	resolve #263 (this is going into master because it's literally just the line being present twice)	2019-10-24 19:00:54 +01:00
toaster	a215eeabf0	* Fix Super players who die being eternally super. ... * Fix music stack corruption in multiplayer where a super player dies and it's not you. * Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch). Resolves #259.	2019-10-24 18:51:12 +01:00
James R	c970911ac2	The console sucks, so "Don't" becomes "No" :lancer:	2019-10-23 17:37:09 -07:00
James R	48173beb35	Menu options	2019-10-23 17:31:10 -07:00
James R	cd252eb468	Console variables to toggle music/sound playing when the window is unfocused ... Playsoundsifunfocused and playmusicifunfocused. "No" by default.	2019-10-23 17:21:09 -07:00
James R	9162ba87cc	Revert sound and music window focus related toggles ... This partially reverts commit 5ac8a26814.	2019-10-23 15:24:34 -07:00
Steel Titanium	bfce75d5cd	Disable restriction for `DEVELOP` builds only	2019-10-23 16:29:50 -04:00
MascaraSnake	0ef50557c2	Merge branch 'spinbust' into 'master' ... Make spinbust behavior consistent with other bustable blocks Closes #254 See merge request STJr/SRB2Internal!398	2019-10-23 02:51:47 -04:00
MascaraSnake	8cd0ebb679	Merge branch 'atz-hazards' into 'master' ... Azure Temple Hazards See merge request STJr/SRB2Internal!404	2019-10-23 02:51:00 -04:00
lachwright	06bbbb5cf8	Put dashmode players in pain state when damaging enemy with >1HP	2019-10-23 13:54:15 +08:00
lachwright	7be046e16c	Fix compile warnings	2019-10-23 13:46:30 +08:00
lachwright	6d498fe357	Allow machine skins to damage objects in dashmode	2019-10-23 13:41:32 +08:00
James R	52c5d49215	Apply HUD translucency to ping and FPS counters	2019-10-22 21:54:09 -07:00
James R	d86be51472	Toggle ping and FPS counters with HUD	2019-10-22 21:50:51 -07:00
James R	0b314a82bb	Use long double suffix	2019-10-22 21:48:15 -07:00
james	aa9f19512c	Use less confusing player sorting key names	2019-10-22 21:41:34 -07:00
james	39baca89d3	Do not start sound system when disabled	2019-10-22 21:39:37 -07:00
lachwright	c201879d69	Add Metal's jet fume	2019-10-23 12:35:17 +08:00
James R	923f43f887	Move change viewpoint control checking so it doesn't take precedence ... Notably over chat.	2019-10-22 21:32:12 -07:00
James R	5ac8a26814	Miscellaneous window de-focus options ... Music pausing is now optional. Sounds may be paused--on by default. The game itself being paused in off-line mode is now optional. (showfocuslost now loads from config.)	2019-10-22 21:15:20 -07:00
James R	12540dca32	Make "Focus lost" HUD overlay optional	2019-10-22 20:30:05 -07:00
James R	43ca2c1b30	Support splitscreen PLAYERINFO and don't expose clients' IP addresses	2019-10-22 20:14:01 -07:00
James R	a24814c2fc	Add a "-noaudio" parm to cover "-nomusic" and "-nosound"	2019-10-22 20:09:33 -07:00
James R	f0ee901160	Support adding to CV_FLOAT cvars with the Add command	2019-10-22 20:04:02 -07:00
James R	135619af8b	Add a command to increment cvars	2019-10-22 20:03:45 -07:00
James R	602c66d173	Grab mouse on window focus ... Window focus does not necessarily imply mouse movement.	2019-10-22 19:45:43 -07:00
James R	3ffa84a77b	Replace ping command with a condensed and sorted version	2019-10-22 19:40:05 -07:00
James R	29a5999a44	"NEWPING" might as well be the only ping	2019-10-22 19:39:26 -07:00
James R	d62674c184	Clang warnings	2019-10-22 19:18:56 -07:00
toaster	386ac78600	Merge branch 'mace-place' into 'master' ... Make maces normally placeable in maps. See merge request STJr/SRB2Internal!390	2019-10-22 13:29:06 -04:00
Monster Iestyn	520deac658	remove last few specks of Windows CE code I missed years ago	2019-10-22 16:39:44 +01:00
Nev3r	dbd8e563b4	Merge branch 'soundex_tweak' into 'master' ... Tweak Line Special 414's behavior See merge request STJr/SRB2Internal!382	2019-10-22 05:31:22 -04:00
sphere	57a8af1557	Disable standalone hangable chains, since they're not a good mechanic.	2019-10-22 02:29:34 +02:00
James R	acd28c001e	lmao I forgot the backside FOF	2019-10-21 14:44:16 -07:00
James R	ea0a0f4f3c	Comment for insanity	2019-10-21 14:28:22 -07:00
James R	e2f2166d24	Fix hang due to comparison not working on at least GCC 9.1 ... I have no idea what the fuck is going on here. k infinitely ascends. (Even above integer restrictions when I made it UINT8.) I can only imagine some kind of fuckery in the stack. Surely this is a compiler error.	2019-10-21 14:20:29 -07:00
lachwright	3a3122e255	Add green flame sprites, state, and object	2019-10-21 16:22:20 +08:00
lachwright	d6411b9549	Add new ATZ gargoyle sprites	2019-10-21 13:43:02 +08:00
lachwright	c52ee364f5	Only allow landing in the melee ability mid-twinspin if jump or spin is held	2019-10-21 12:49:12 +08:00
James R	e15ffd2bc8	Optimize texture/patch/png/flat flat caching ... SIGSEGV in the case where you have a TEXTURES entry, but no texture or flat, has been fixed. Missing flats for now yield a HOM instead of REDFLR as well. OpenGL also doesn't work yet. And I'm too tired for now to bother with it.	2019-10-20 20:24:03 -07:00
lachwright	441aceb116	Add new dashmode colormap	2019-10-21 04:37:56 +08:00
toaster	9d425b21e2	Modify initial platform sink to be more natural, while still toeing the line between "forgiving" and "punishing".	2019-10-20 19:13:46 +01:00
lachwright	a2f0f61d75	Merge branch 'master' into linedef-153	2019-10-20 20:20:41 +08:00
MascaraSnake	57d29a9b65	Merge branch 'platterwrap' into 'master' ... Prevent wraparound on Level platter when there are less than 3 rows See merge request STJr/SRB2Internal!383	2019-10-20 06:45:05 -04:00
MascaraSnake	7c481744a4	Merge branch 'kartport_dedi' into 'master' ... Kart-port dedicated server Lua fix (round 2) See merge request STJr/SRB2Internal!387	2019-10-20 06:43:54 -04:00
MascaraSnake	41dd9c4f0a	Merge branch 'flats-fixes-13102019' into 'master' ... Transparent flat fixes (Resolves #249) Closes #249 See merge request STJr/SRB2Internal!384	2019-10-20 06:42:17 -04:00
MascaraSnake	fcf05c728b	Merge branch 'master' into object_tweaks	2019-10-20 12:34:49 +02:00
MascaraSnake	54847b1949	Merge branch 'mapthingtweaks' into 'master' ... Mapthing tweaks (object_tweaks division 1) See merge request STJr/SRB2Internal!396	2019-10-20 06:33:01 -04:00
Steel Titanium	b219be6f5e	Remove level select restrictions in Multiplayer	2019-10-19 21:37:03 -04:00
MascaraSnake	1604e4d439	Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST	2019-10-19 22:20:48 +02:00
Monster Iestyn	9c36cf00d8	Merge branch 'fix-player-state-resynch' into 'master' ... Fix player state resynching See merge request STJr/SRB2Internal!393	2019-10-19 16:15:19 -04:00
James R	fc97ccd7d4	Fix item selection not returning to "Specify IPv4 Address"	2019-10-19 13:07:20 -07:00
James R	4a15e2d1d8	Fix "You must specify an IP address" message returning to title instead of MP menu	2019-10-19 13:01:06 -07:00
James R	dfdbc0afe3	Don't fade to character select from secret level select	2019-10-19 12:42:53 -07:00
James R	25d8b7d5ea	Don't fade to Server Options	2019-10-19 12:25:02 -07:00
Steel Titanium	3e0a9cf742	Revert my old attempt of making the level music fade out before game over jingle	2019-10-19 14:36:30 -04:00
MascaraSnake	3f42834a98	Merge branch 'thinkerlists_oops' into 'master' ... Fixed a netgame crash that was caused by a closing brace being in the wrong place :v See merge request STJr/SRB2Internal!395	2019-10-19 13:34:28 -04:00
toaster	c8629c2aab	Adjust hardcoded skin numbers for character-related events, to fit with the re-ordered skins.	2019-10-19 18:16:52 +01:00
toaster	bf761a26d6	* Implement fixes/tweaks as written on the gitlab. ... * `SPR2_NTAG` last vestiges removal. * Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`. * Fixed nametag colour issues. * Support widescreen with nametags. * Fix a metric SHITTON of compiler errors. * Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`) * GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`) * Redefining `lines` within the scope of the global. * Redefining `string` within the function-specific `string`. * It would be recommended for y'alls to turn ERRORMODE on!	2019-10-19 18:15:54 +01:00
Louis-Antoine	88d239ac36	Set the player's name as soon as they enter the game	2019-10-19 17:09:18 +02:00
toaster	7e04cbbc16	Fix mixed declaration and code error in A_RolloutRock (object_tweaks division 2)	2019-10-19 16:01:04 +01:00
toaster	920736ac8b	Grouped ports from object_tweaks. ... * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Put diagonal blue spring in config.	2019-10-19 15:57:01 +01:00
toaster	dfd6c5b9d2	Fix hw_light.c list (not gonna make an exe for this)	2019-10-19 15:50:16 +01:00
toaster	e549de392f	Prevent CA2_MELEE, CA_TWINSPIN and CA_BOUNCE from fucking up boosters.	2019-10-19 14:46:14 +01:00
toaster	7f26b90113	Decrease drag on directionchar in waterslides on sphere's request.	2019-10-19 14:32:34 +01:00
toaster	f2bbf53c0d	Change boost panel thing numbers per MS's request.	2019-10-19 14:32:15 +01:00
MascaraSnake	73c39990f9	Fix restoration of delayed linedef executors in P_NetUnArchiveThinkers for real	2019-10-19 14:51:24 +02:00
MascaraSnake	c7fd22f98a	Fixed a netgame crash that was caused by a closing brace being in the wrong place :v	2019-10-19 12:08:15 +02:00
toaster	8e9ada1093	* Add MT_BANPYURA and MT_BANPSPRING to dehacked.c. ... * Correct spelling of `MT_BANPSPRING`.	2019-10-18 20:32:35 +01:00
toaster	ad09f2603d	* New object types! ... * Red and yellow Boost panels! * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better. * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes. * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability! * Banpyura! * A Crushstacean with a spring instead of a crushclaw. * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif * Wanted this for a while, finally added it. * Improved springs. * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground. * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity. * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well. * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN. * Make directionchar "lag behind" a little bit in waterslides. * Improved flame jets. * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1! * Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!) * Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode. * Improved ZB config. * Add above new types. * Add Blue Diagonal Spring, which existed in the source but not the config. * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).	2019-10-18 18:33:45 +01:00
Monster Iestyn	246a6489e9	Fix missing & which I totally forgot about in writing this fix (yes this is the "compile error" everyone was talking about)	2019-10-18 13:37:42 +01:00
sphere	8c6884f534	Update credits.	2019-10-18 00:33:46 +02:00
Monster Iestyn	07c02f075b	Fix sprite-related console errors that occur in netgames whenever the game attempts to synch the player's state. ... Turns out the code was using P_SetMobjStateNF to "fix" the player's state ...which got things all wrong, lol.	2019-10-17 18:22:06 +01:00
Monster Iestyn	c097ee563d	Merge branch 'master' into mi-tinkers-with-lua-again	2019-10-17 18:02:42 +01:00
sphere	26fed77671	Fix standalone hangable chains being broken, thanks to toaster.	2019-10-17 01:01:40 +02:00
Steel Titanium	28607a81b5	Kill off SPR2_NTAG	2019-10-16 18:25:20 -04:00
Steel Titanium	edea290b0f	Show "Press ESC to exit" string on NiGHTS Attack menu too	2019-10-16 18:00:54 -04:00
Steel Titanium	dc0a1899ec	Fix ifselectvalnextmapnobrace indentation	2019-10-16 17:49:21 -04:00
sphere	2cc129c5c0	Undo grabbable chains being placeable for now, since they're bugged.	2019-10-16 22:31:57 +02:00
Louis-Antoine	92b92dd3eb	Fix clients being resynched at the wrong gametic	2019-10-16 21:24:30 +02:00
sphere	42de16b904	Make the maces and related objects normally placeable.	2019-10-16 21:12:04 +02:00
toaster	e3e87d7655	Compile fix.	2019-10-16 17:39:38 +01:00
toaster	77160ae37b	Just revert the respawn, retry and suicide stuff cuz it's apparently contentious. Who knew?	2019-10-16 17:38:38 +01:00
toaster	45e5f70eb8	Merge retry and respawn into one command, respawn.	2019-10-16 11:38:09 +01:00
Steel Titanium	38d044e475	Seperate name tag sprite into SPR2_NTAG	2019-10-16 00:22:05 -04:00
Steel Titanium	58ef85d591	Make nametag SPR2 frame be the last frame of SPR_XTRA	2019-10-15 23:41:01 -04:00
Steel Titanium	9c33f160a6	Lots of changes ... * Show emblem requirement on record attack menu * Use bigger emblems on the menu. * Display your best number of collected rings in yellow if reached perfect bonus. * Adjusted XTRA frames (again)	2019-10-15 22:54:21 -04:00
toaster	360ae45994	Make use of MINVAL and MAXVAL consistent in COM_Help_f.	2019-10-15 13:46:45 +01:00
toaster	8f3e59b43d	Improved "HELP" command! ... Ported from Kart, original commit also by me (toaster).	2019-10-15 13:36:04 +01:00
toaster	aa9bc574da	* Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue. ... * Optimise M_ChangeCvar.	2019-10-15 12:24:31 +01:00
toaster	3185a66191	Quick macro substitution to make sure MAXSCORE is consistent.	2019-10-15 11:55:40 +01:00
toaster	910df54fb5	Added some examples of cvars that can use named values. ... * Pandora's box now has infinite lives show up as "Infinite" instead of "-1". * `pointlimit None` * `timelimit None` * Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again. * `respawndelay Off` * `resynchattempts Don't`	2019-10-15 11:49:37 +01:00
toaster	911fd9576b	Rework min/max cvars to allow for "named" values outside their range! ... Kart-port round 3, with the original commit written by me, toaster.	2019-10-15 11:23:59 +01:00
toaster	079ef023c9	Fix dedicated server extra lua variables not being synched for joiners. ... Original fix written by Lat`.	2019-10-15 10:49:14 +01:00
Steel Titanium	313b534911	More record attack stuff. ... Show emblem requirements. Committed because I need sleep...	2019-10-15 01:55:50 -04:00
Steel Titanium	37101f826e	Allow access to players userdata outside levels. ... In exchange for preventing access to any mobj_t userdata outside levels, including player's own mobj_t.	2019-10-14 22:12:26 -04:00
Steel Titanium	597949f370	Change this for consistency.	2019-10-14 21:47:20 -04:00
James R	5007abee23	Collide with walls of FOF if both planes are intangible	2019-10-14 13:22:33 -07:00
lachwright	9ef72c0862	Fix directionchar issue from faulty merge conflict resolution	2019-10-15 02:57:18 +08:00
lachwright	b48d8cf68b	Merge branch 'master' into knuxstuff	2019-10-15 02:50:59 +08:00
lachwright	9cad882626	Merge branch 'master' into knuxstuff	2019-10-15 02:49:44 +08:00
MascaraSnake	2f9a13d5e0	Make shatter blocks intangible to the player, but solid to everything else	2019-10-14 20:15:03 +02:00
lachwright	2417c5aab2	Remove glide landing dust; put player in landing state after glide-sliding off a ledge	2019-10-15 01:40:56 +08:00
lachwright	0836062edd	Limit climb camera rotation to a 180 degree cone	2019-10-15 01:19:58 +08:00
toaster	2f26cfad01	Prevent wraparound on Level platter when there are less than 3 rows. ... Addresses #251 - I wanted to keep the scrolling because it looks nice and because I don't want to fuck with these drawers too bad.	2019-10-14 17:17:00 +01:00
Nev3r	c935797a34	Encapsulate the second behavior branch into an else. ... When a tag is provided, the tagged sector-related branch is run exclusively now. This prevents playing the same sound again from the caller object's origin and other unwanted behaviors. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-10-14 16:30:20 +02:00
Jaime Passos	edd016690d	A bunch of stuff	2019-10-14 02:24:44 -03:00
Steel Titanium	0f79396757	New intermission thinker hook	2019-10-13 20:50:46 -04:00
Steel Titanium	9e9a40cadb	Merge branch 'master' into newmenus	2019-10-13 20:12:48 -04:00
Steel Titanium	cb228c4938	Undo this	2019-10-13 20:12:28 -04:00
Steel Titanium	bf75a4c29f	New -port command line paramater	2019-10-13 20:04:45 -04:00
Jaime Passos	0cf2774129	remove duplicate NearestColor prototype	2019-10-13 19:45:35 -03:00
Jaime Passos	88d19a2d9c	fix holey textures	2019-10-13 18:37:41 -03:00
MascaraSnake	ad4033ec9e	Make shatter blocks solid	2019-10-13 23:08:54 +02:00
lachwright	c71213155d	Unfuck glide slide/landing dust's P_RandomRange parameters	2019-10-14 04:08:07 +08:00
MascaraSnake	63a7fb6956	Merge branch 'anotherctgfix' into 'master' ... Fix reverse gravity cacti (and all other A_ConnectToGround stuffs) See merge request STJr/SRB2Internal!378	2019-10-13 13:27:24 -04:00
toaster	46268214fc	Fix reverse gravity cacti (and all other A_ConnectToGround stuffs).	2019-10-13 17:48:40 +01:00
MascaraSnake	05a3023cb0	Merge branch 'nightsangle' into 'master' ... Fixed NiGHTS spawnpoint angle camera jump fuckups See merge request STJr/SRB2Internal!376	2019-10-13 12:47:32 -04:00
toaster	dabd0b2e01	Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request. ... (Resolves #250)	2019-10-13 16:30:29 +01:00
toaster	a5b5712be9	Fixed NiGHTS spawnpoint angle camera jump fuckups.	2019-10-13 16:15:46 +01:00
MascaraSnake	9bdb38df64	Merge branch 'lenient_acz3' into 'master' ... Make ACZ3 Boss damage while bouncing more lenient See merge request STJr/SRB2Internal!375	2019-10-13 11:08:26 -04:00
MascaraSnake	16a05d996e	Merge branch 'scrollwep' into 'master' ... Add scroll-wheel weapon changing to default controls Closes #248 See merge request STJr/SRB2Internal!374	2019-10-13 11:08:13 -04:00
MascaraSnake	01fbb91f7e	Merge branch 'bogus_requestskin' into 'master' ... Fix bogus "requested skin not found!" print Closes #247 See merge request STJr/SRB2Internal!373	2019-10-13 11:07:59 -04:00
MascaraSnake	008e232d78	Merge branch 'connect-to-ground-fix' into 'master' ... Fix for A_ConnectToGround on gravflipped objects See merge request STJr/SRB2Internal!372	2019-10-13 11:07:46 -04:00
toaster	57f756ddf1	Fix condition which was MEANT to allow attacking Fangboss from the side while bouncing, but instead made it extremely difficult to pull off.	2019-10-13 15:30:51 +01:00
toaster	d9129db5ed	Add scroll-wheel weapon changing to default controls ... (resolves #248)	2019-10-13 15:19:31 +01:00
toaster	e62d097265	Fix "requested skin not found!" print happening whenever you select an unlockable character. ... Also, since I'm less paranoid now - readd the skin number to its print.	2019-10-13 15:10:19 +01:00
sphere	636760760f	Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster.	2019-10-13 14:41:17 +02:00
toaster	0350262a0f	On the recommendation of Sryder, revert everything relating to the cpusleep changes except for the new default value of 1.	2019-10-13 13:12:07 +01:00
toaster	6033f70b01	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes	2019-10-13 12:18:00 +01:00
toaster	4b965fe43b	Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier)	2019-10-13 12:17:24 +01:00
toaster	9ca227237a	Better cpusleep command. Sal said it better than I can, so in her words: ... * Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog * New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.	2019-10-13 12:05:12 +01:00
toaster	5502242e8b	MD2 crash fix.	2019-10-13 11:59:38 +01:00
toaster	008f576560	Revert stupid 2.1-compat fuckup I did in slopes code.	2019-10-13 11:55:50 +01:00
toaster	a550eb79d3	Additional crash fix for papersprites.	2019-10-13 11:53:53 +01:00
MascaraSnake	a03ecac921	Merge branch 'openglskydome2' into 'master' ... OpenGL sky dome See merge request STJr/SRB2Internal!350	2019-10-12 11:06:47 -04:00
MascaraSnake	a7c0fe9672	Merge branch 'openmpt-crash-fix' into 'master' ... libopenmpt related changes See merge request STJr/SRB2Internal!351	2019-10-12 11:02:45 -04:00
MascaraSnake	71f93e7071	Merge branch 'sneakers-reduction' into 'master' ... Reduce speed sneaker factor to 1.67x See merge request STJr/SRB2Internal!368	2019-10-12 11:00:24 -04:00
MascaraSnake	6fab3d28b2	Merge branch 'OGL_regressions' into 'master' ... Correct minor OGL regressions See merge request STJr/SRB2Internal!361	2019-10-12 09:53:20 -04:00
MascaraSnake	8af715eb36	Merge branch 'left-right-ra-level-select' into 'master' ... Left and Right Arrow keys also select level in Record Attack See merge request STJr/SRB2Internal!363	2019-10-12 09:53:05 -04:00
MascaraSnake	d401862714	Merge branch 'amytweaks' into 'master' ... Amy tweaks See merge request STJr/SRB2Internal!366	2019-10-12 09:52:44 -04:00
toaster	a2a5983256	Prevent Time Attack level handler always beeping.	2019-10-12 09:42:03 -04:00
MascaraSnake	d735e1b9c2	Merge branch 'rvz-hardcode' into 'master' ... RVZ hardcode Closes #178 See merge request STJr/SRB2Internal!357	2019-10-12 09:37:23 -04:00
MascaraSnake	68a82c3849	Merge branch 'amycameo' into 'master' ... Amy for Frozen Hillside (full pitch in description) See merge request STJr/SRB2Internal!356	2019-10-12 07:16:26 -04:00
MascaraSnake	15bba9e1b0	Merge branch 'hoop_drawdist' into 'master' ... Only apply NiGHTS draw distance to hoops See merge request STJr/SRB2Internal!370	2019-10-12 03:10:53 -04:00
MascaraSnake	0f562d27d7	Merge branch 'fastgoop' into 'master' ... Increased THZ goop speed by 25% Closes #229 See merge request STJr/SRB2Internal!367	2019-10-12 03:10:26 -04:00
lachwright	3600e1b140	Allow rollout rock's splash sound delay reduction to occur above water	2019-10-12 04:41:50 +08:00
lachwright	a01373741b	Don't spam splash sounds on the rollout rock	2019-10-12 04:35:51 +08:00
lachwright	2daeb81f36	Create new linedef special type 153: Dynamically Sinking Platform	2019-10-12 04:23:11 +08:00
MascaraSnake	68599ccc63	Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag	2019-10-11 21:02:11 +02:00
Steel Titanium	25971de368	Attempt to fix the offset issues. ... Better than the previous commit, but not quite there yet.	2019-10-10 15:50:06 -04:00
toaster	1560453797	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode ... # Conflicts: # src/p_map.c	2019-10-10 17:51:29 +01:00
MascaraSnake	354429ca39	Merge branch 'intro-sky-fix' into 'master' ... Fix the sky on the intro cutscene not scrolling. Closes #220 See merge request STJr/SRB2Internal!353	2019-10-10 02:36:53 -04:00
MascaraSnake	7fedde9811	Merge branch 'promiscuousplanes' into 'master' ... Headbumps and associated Closes #242 See merge request STJr/SRB2Internal!360	2019-10-10 02:36:10 -04:00
MascaraSnake	c17a3227a0	Merge branch 'bumperstuff' into 'master' ... Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9. Closes #246 See merge request STJr/SRB2Internal!365	2019-10-10 02:35:33 -04:00
MascaraSnake	a138c0ebf2	Merge branch 'acz_touchups' into 'master' ... ACZ touchups Closes #209, #208, and #158 See merge request STJr/SRB2Internal!359	2019-10-10 02:34:46 -04:00
Steel Titanium	4af432e658	Basic outline color support. ... This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.	2019-10-10 02:00:52 -04:00
lachwright	b2529136e0	Reduce speed sneaker's top speed factor to 1.67x	2019-10-09 21:39:51 +08:00
lachwright	d553b6a011	Add sounds to rollout rock in lava	2019-10-09 15:06:50 +08:00
lachwright	82fcdf4d43	Make MT_PUMA not hurt players' ears when placed in groups or loading the map (new functionality for A_PlaySound)	2019-10-09 14:24:27 +08:00
Steel Titanium	18bf8aa6e4	WIP: New character select name font	2019-10-09 00:28:01 -04:00
toaster	43e13b38c9	Change one of the Pyrefly captions.	2019-10-08 19:45:43 +01:00
toaster	1155a7c3a0	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode ... # Conflicts: # src/p_mobj.c	2019-10-08 19:43:43 +01:00
toaster	4870107974	Increased THZ goop speed by 25%, per Cobalt's script. (Hardcoding it was way more difficult than it looked, I'm rusty at my maths :V )	2019-10-08 16:38:53 +01:00
James R	34bddc1ce7	Merge remote-tracking branch 'origin/master' into next	2019-10-07 18:19:48 -07:00
James R	91d3f7e2cc	Merge branch 'fix-fixedrem' into 'next' ... Make FixedRem less laggy by just using the modulo operator. See merge request STJr/SRB2!503	2019-10-07 21:16:33 -04:00
James R	b32a0315eb	Merge branch 'fix-MF_NOCLIPTHING' into 'next' ... Fix MF_NOCLIPTHING See merge request STJr/SRB2!467	2019-10-07 21:14:49 -04:00
James R	92dd9d2066	Forgot includes	2019-10-07 18:11:00 -07:00
James R	88615f58cf	Merge branch 'lua-error-print-fix' into 'master' ... Lua: Fix some errors not working properly. See merge request STJr/SRB2!510	2019-10-07 21:09:00 -04:00
James R	2f521f2eb1	ferror does not return errno, are you stupid? ... Use M_FileError to return the proper error description, or "end-of-file".	2019-10-07 18:04:42 -07:00
MascaraSnake	bc794a2227	Players can jostle free from Pterabytes	2019-10-08 00:00:41 +02:00
MascaraSnake	788415a4db	Don't apply autobrake to Pterabyte-carried players	2019-10-07 22:33:06 +02:00
MascaraSnake	0fceb66e71	Make the Pyrefly glowing and damaging in its fire-spawning state	2019-10-07 22:23:52 +02:00
MascaraSnake	ce5d0691ac	Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode	2019-10-07 19:12:03 +02:00
MascaraSnake	8062422f13	Fixed wrong sound being played by Pyreflies with Ambush	2019-10-07 19:11:36 +02:00
lachwright	3412eb655a	Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability)	2019-10-07 22:51:13 +08:00
lachwright	77dd5260ab	Allow rock to disappear if unridden for 12 seconds	2019-10-07 22:22:51 +08:00
toaster	46a1d6897c	Address checkbox 1 and 2 of #235. ... * If using twinspin and have melee ability too, go into melee landing when hitting the ground. * Only have melee go directly forward if standing/idle, otherwise use drawangle.	2019-10-07 15:03:28 +01:00
lachwright	c64997bfe5	Add Ambush and Flip flag behaviors	2019-10-07 20:55:58 +08:00
toaster	d84564d9f2	Change the time NiGHTS bumpers aren't responded to to 5 tics rather than 9.	2019-10-07 13:08:49 +01:00
lachwright	95f6e2008f	Better rollout behavior in lava	2019-10-07 15:25:32 +08:00
MascaraSnake	2113774a6a	Don't deplete special stage timer in water if you have water protection	2019-10-07 09:01:17 +02:00
lachwright	bfb9bac5bd	Collision polish	2019-10-07 14:51:32 +08:00
MascaraSnake	fe2f383997	Fixed a typo	2019-10-07 08:36:40 +02:00
lachwright	bed9dff077	Readability changes	2019-10-07 13:36:36 +08:00
lachwright	306779fac0	Readability changes	2019-10-07 13:35:10 +08:00
lachwright	7850d43725	Let ridden rollout rocks collide with other players	2019-10-07 13:14:23 +08:00
James R	6fd645ef27	A-arrows on Record Attack level select ... Menu code sucks, did you know?	2019-10-06 14:45:42 -07:00
James R	0be3743450	Key handler to allow selecting map by arrow keys in Record Attack ... Enter still goes to the platter.	2019-10-06 14:11:16 -07:00
Jaime Passos	7746767735	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c	2019-10-06 17:40:41 -03:00
MascaraSnake	058ed632de	Fixed solid objects (such as Minus-carried TNT barrels) not colliding with players. ... Springs and gas jets are exempt because all hell might break loose otherwise.	2019-10-06 19:53:54 +02:00
toaster	9b94fd3752	* Add rudimentary support for MF2_LINKDRAW in GL. ... * Allow MF_ENEMY objects to flash, just as they do in Software.	2019-10-06 16:31:13 +01:00
toaster	a2f8b84b5a	Good catch by MS.	2019-10-06 16:17:11 +01:00
toaster	d19aebb01a	* Fix Minus being intangible after launch. ... * Implement MS's temp bodge-fix for the TNT getting stuck on the player.	2019-10-06 16:15:13 +01:00
toaster	df172ee33f	Fix Minus being intangible after it pops up.	2019-10-06 16:09:33 +01:00
toaster	8b1a20f415	Fix Minus causing crashes if it picks up a Snapper.	2019-10-06 16:04:19 +01:00
toaster	aec5f26819	Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.)	2019-10-06 15:44:24 +01:00
toaster	5bbc31c18f	Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups ... # Conflicts: # src/p_enemy.c	2019-10-06 15:18:59 +01:00
lachwright	2d33950590	Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode	2019-10-06 22:12:47 +08:00
toaster	cc87ba39c2	There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.)	2019-10-06 15:11:00 +01:00
toaster	79b95a53ed	Fix Snapper's head snapping to higher planes, and add gravflip support.	2019-10-06 15:04:04 +01:00
toaster	a5704238c7	Resolve #242 by adding SF_TRIGGERSPECIAL_HEADBUMP, enabled by ML_EFFECT2. ... Also, readd SF_INVERTPRECIP, which was done in a random branch last year and then lost because it was never merged. Enabled by ML_EFFECT1.	2019-10-06 14:34:25 +01:00
MascaraSnake	defffd667e	Fixed and simplified the big fern leaf spawning code	2019-10-06 14:18:27 +02:00
toaster	93ce5bb94d	Add solidity back to MT_SALOONDOOR, to work as a backup in case MT_SALOONDOORCENTER doesn't work (which it has issues with in one location in ACZ2 for some reason, and I can't identify why). ... Fully resolves #209, in any case.	2019-10-06 12:14:18 +01:00
toaster	df2600cbea	Resolve #208. ... * Tailsbots can't get into Minecarts. * Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.	2019-10-06 12:13:13 +01:00
MascaraSnake	17a2d1071c	Spawn big fern leaves relative to angle	2019-10-06 10:30:22 +02:00
MascaraSnake	357baeaa60	Added gravflip support to lavafall, Pyre Fly and Pterabyte	2019-10-05 22:20:48 +02:00
MascaraSnake	a7d6ebd5bd	Lavafall lava also kills rings	2019-10-05 20:37:48 +02:00
MascaraSnake	2f4edc0cb9	Players carried by Pterabyte cannot adjust their angle and are in their falling state	2019-10-05 20:29:47 +02:00
MascaraSnake	b9c3f72112	Grouped MFE_TOUCHLAVA together with the other liquid-related flags	2019-10-05 20:10:07 +02:00
MascaraSnake	16d077fde3	Coins don't melt in lava and lavafalls have displayoffset 1	2019-10-05 20:00:54 +02:00
toaster	0235d9e7ec	Fix Saloon doors. ... * Make the center be the object stuff collides with, so that if the door is open people can't slip through. * Add an MF_AMBUSH enhancement to allow non-minecart players to travel through. * Make A_SaloonDoorSpawn more customisable. (var1 = object type, var2 = distance sides should be placed apart)	2019-10-05 13:21:35 +01:00
MascaraSnake	99220ae48b	Fixed a typo	2019-10-05 10:45:24 +02:00
MascaraSnake	cabc4e0294	Implemented lava splish. Feel free to suggest a different "splish" sound.	2019-10-05 10:00:59 +02:00
lachwright	b180fd7c91	Update to 9/25 Lua script	2019-10-05 03:02:27 +08:00
lachwright	b120193eb7	Fix AI angling	2019-10-05 02:48:20 +08:00
lachwright	00697caa6e	Initial commit	2019-10-03 12:49:46 +08:00
Jaime Passos	1750ed5383	nights attack	2019-10-02 22:02:13 -03:00
Jaime Passos	a7dcf534ca	character select	2019-10-02 21:57:04 -03:00
Jaime Passos	a0e9fbfffe	test	2019-10-02 21:28:02 -03:00
Jaime Passos	6a8539c8f1	test	2019-10-02 20:00:43 -03:00
lachwright	27c9fe5047	Fix false comment	2019-10-03 02:31:32 +08:00
Steel Titanium	625de1f4f6	Some changes. ... Restore the menu headers for record attack and character select menu. Attempt to optimize the NiGHTS mode menu. (Help getting the scrolling to work in an efficient way would be nice).	2019-10-01 23:40:59 -04:00
Steel Titanium	6b10ffb88f	Merge branch 'master' into newmenus	2019-10-01 16:52:31 -04:00
MascaraSnake	5c1fabfaae	Lava is now either completely solid or completely intangible. No more half-assing	2019-10-01 21:58:18 +02:00
MascaraSnake	24e80c9b23	Made solid lava walls damaging	2019-10-01 21:17:33 +02:00
toaster	f224e03e1d	Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...	2019-10-01 18:19:37 +01:00
Monster Iestyn	b72609f7f7	Merge branch 'master' into mi-tinkers-with-lua-again	2019-09-30 20:51:29 +01:00
MascaraSnake	5460e0e1f9	Merge branch 'master' into acz-fixes	2019-09-30 20:50:33 +02:00
MascaraSnake	e75dee7747	Fix various minus carrying bugs	2019-09-30 20:35:47 +02:00
lachwright	5bbd56b6fa	Improve glide bounces	2019-09-30 16:35:05 +08:00
lachwright	7d57d53d45	Allow camera movement while climbing; allow sliding while landing from a glide	2019-09-30 14:38:58 +08:00
Steel Titanium	ebe99dad7a	Make comment more clear	2019-09-30 01:29:57 -04:00
Steel Titanium	592a98a3e8	Fix the sky on the intro cutscene not scrolling.	2019-09-30 01:25:21 -04:00
lachwright	c72b5d8a49	Allow retention of momentum when climbing off surfaces	2019-09-30 10:55:57 +08:00
lachwright	906a2b1f59	Merge branch 'master' into knuxstuff ... Update to master (necessary for climbing changes)	2019-09-30 09:56:04 +08:00
Jaime Passos	d67804cb9c	png fix yes so cool	2019-09-29 19:10:49 -03:00
Jaime Passos	7eb5155240	sprite2info soc yummy yummy yes	2019-09-29 19:03:10 -03:00
MascaraSnake	d301d2bba4	Fixed a bug with the ring lava melting	2019-09-29 23:22:38 +02:00
MascaraSnake	4375ea8089	Lava now melts rings!	2019-09-29 23:11:21 +02:00
MascaraSnake	3d985c1b9e	Pterabytes can now swoop you off a rollout rock	2019-09-29 22:13:10 +02:00
lachwright	6c0e4a154d	Resolve merge conflicts	2019-09-30 03:07:03 +08:00
lachwright	e57b0f7126	(Hopefully) cover all cases for resetting rock usability	2019-09-30 03:05:08 +08:00
Jaime Passos	b2ac64f24c	better soc	2019-09-29 15:53:04 -03:00
MascaraSnake	cd45bca848	Pterabyte: Don't drop off player in the first ten tics after grabbing	2019-09-29 19:51:27 +02:00
MascaraSnake	c00144a4f8	Pterabyte: Don't target players who are invincible after being hurt	2019-09-29 19:29:34 +02:00
Jaime Passos	318fde6ae7	Giant mistake	2019-09-29 14:12:53 -03:00
MascaraSnake	9431497f7d	Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode ... # Conflicts: # src/d_player.h # src/dehacked.c # src/p_map.c # src/p_user.c	2019-09-29 18:49:53 +02:00
MascaraSnake	26ecab14d7	Implemented the Pterabyte grabbing mechanic	2019-09-29 18:42:17 +02:00
Jaime Passos	4a0848acd7	I want to be able to stack skins in a sprite2 block	2019-09-29 12:41:15 -03:00
Jaime Passos	82be346091	change comment and error message	2019-09-29 12:16:38 -03:00
Jaime Passos	c268743220	hehee	2019-09-29 12:13:51 -03:00
lachwright	60cbc2e6b4	Remove unused locals	2019-09-29 21:29:37 +08:00
lachwright	71603006dc	Resolve merge conflicts	2019-09-29 20:29:49 +08:00
lachwright	8abb6129c1	Hardcode pumice ball ... Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly	2019-09-29 20:18:40 +08:00
MascaraSnake	22e3c37e5d	Don't make the Pterabyte radius adjustable (doesn't work correctly right now)	2019-09-29 11:58:33 +02:00
MascaraSnake	598047ae8b	Hardcoded the Pterabyte (without the grabbing mechanic)	2019-09-29 10:39:09 +02:00
sphere	bea7224ebf	Use zones.pk3 instead of zones.dta.	2019-09-29 05:31:50 +02:00
Jaime Passos	73e4e67595	JIMITA DO THE SOC	2019-09-28 19:13:51 -03:00
Jaime Passos	b74cfca3e2	JIMITA DO TH EROTSPRITE	2019-09-28 17:56:27 -03:00
Monster Iestyn	52562c4125	whoops, didn't mean to include this	2019-09-28 20:45:44 +01:00
Jaime Passos	8aefc03409	quick maths	2019-09-28 13:40:40 -03:00
Jaime Passos	6574e1a7d3	memory management	2019-09-28 12:50:07 -03:00
Jaime Passos	5118f8589d	Merge remote-tracking branch 'origin/master' into rotsprite_i	2019-09-28 12:14:55 -03:00
Steel Titanium	cf852e7d39	Fix crash if speed is too high ... Also update libopenmpt	2019-09-27 23:53:19 -04:00
Jaime Passos	0aba0aa4b9	Merge remote-tracking branch 'origin/master' into openglskydome2	2019-09-27 22:47:10 -03:00
Monster Iestyn	fa444a37eb	Added < 0 checks to all three variables added in last commit ... (no point checking >= MAXPLAYERS tbh, there's no reason the game would even set those values that I can think of offhand)	2019-09-27 23:15:38 +01:00
Monster Iestyn	240aa34794	Added consoleplayer, displayplayer and secondarydisplayplayer, by popular request	2019-09-27 21:16:11 +01:00
toaster	ff8c43664a	Merge branch 'addons-menu-cleanup' into 'master' ... Addons menu cleanup See merge request STJr/SRB2Internal!316	2019-09-27 08:55:36 -04:00
toaster	55a2f1ee1f	Merge branch 'bossprovements' into 'master' ... ACZ3 intro Closes #217 See merge request STJr/SRB2Internal!346	2019-09-27 08:55:19 -04:00
toaster	40a7b67a86	Merge branch 'dsz3shockwave' into 'master' ... Deep Sea Zone 3 hardcoding Closes #185 See merge request STJr/SRB2Internal!349	2019-09-27 08:54:57 -04:00
toaster	65d9c52884	Merge branch 'automap-fixes' into 'master' ... Automap fixes See merge request STJr/SRB2Internal!348	2019-09-27 08:52:59 -04:00
toaster	3f1d84a6b3	Merge branch 'patch-fixes' into 'master' ... Patch fixes (Resolves #230) Closes #230 See merge request STJr/SRB2Internal!347	2019-09-27 08:52:41 -04:00
toaster	4d058d1d25	Merge branch 'lachfixes' into 'master' ... Several bug fixes! Closes #210, #192, and #189 See merge request STJr/SRB2Internal!345	2019-09-27 08:52:23 -04:00
toaster	c091174f2e	Merge branch '231-tails-ai-should-die-when-taking-damage-in-ultimate' into 'master' ... Resolve "Tails AI should die when taking damage in Ultimate" Closes #231 See merge request STJr/SRB2Internal!344	2019-09-27 08:51:11 -04:00
toaster	c97037e98e	Merge branch 'inputstuff' into 'master' ... Trigonometric input capping See merge request STJr/SRB2Internal!343	2019-09-27 08:50:55 -04:00
sphere	bc128dffdc	Fix compiling errors, thanks to toaster.	2019-09-26 23:15:52 +02:00
lachwright	264c60fb70	P_SetTarget fixes, added SPR_SHCK to hw_light.c	2019-09-27 02:13:02 +08:00
toaster	ec1712064c	* Add vwre vwre intro for Fang Clone Fighter battle. (Still skipped with presence of MTF_AMBUSH) ... * https://cdn.discordapp.com/attachments/428262628893261828/626792815451701259/srb20006.gif * Add fadeout instead of slapstick for Fang Clone Fighter death. * Allow placed Fang and Metal Sonic objects to be marked as Clone Fighters always through presence of MTF_EXTRA.	2019-09-26 17:06:29 +01:00
lachwright	d5e0ac1450	Added A_Boss3ShockThink to dehacked.c	2019-09-26 18:57:25 +08:00
lachwright	c9c9f95057	Lowered shockwave speed	2019-09-26 17:12:03 +08:00
lachwright	0cd3e4fd62	Hardcoded DSZ3 shockwave	2019-09-26 05:27:51 +08:00
Monster Iestyn	75ee3193f4	Write a new hack for getting sector->linecount from sector->lines in Lua, to put my mind at rest about it at last. ... 1) In sector_get, actually push the memory address of the lines array within sector_t, rather than push the value of "lines" itself (essentially, we we want a pointer to a double pointer, or rather a TRIPLE pointer haha) 2) In the sectorlines_* functions, use offsetof to shift the memory address so we can obtain the value of linecount within the sector_t struct, and dereference the result to obtain the value of linecount itself 3) ??? profit Untested and uncompiled atm, but I have some confidence this might work	2019-09-25 20:27:41 +01:00
lachwright	fb9248793a	Fix errormode compilation error	2019-09-25 23:09:05 +08:00
toaster	313fed2a59	Correctly restrict MF_NOCLIPTHING-objects from being interacted with from both moving and non-moving side.	2019-09-25 15:49:37 +01:00
lachwright	c1750d9359	Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling)	2019-09-25 22:36:48 +08:00
toaster	9504d078e4	Don't lock on if something is literally intangible.	2019-09-25 15:12:19 +01:00
toaster	2a452ddcf5	Remember when Lach recorded their live reaction to 2.2 so far? Do you recall what the reaction to ACZ3 was? ... If you don't, the reaction was "WHAT?? Why is he here? This is GREAT but, what??" And while the reaction is on the positive end of things, it's stll clearly not advisable for our defining Big Reveal of the already huge update. To this end: Here is a mini cutscene! https://cdn.discordapp.com/attachments/428262628893261828/626207624043429898/srb20005.gif * He's digging through Eggman's trash. * Clearly doesn't expect to see you! * Ready for a fight all the same. * You can attack him during the mini cutscene if you're impatient. * Skipped if you give him MTF_AMBUSH. * Requires new assets (including map) to test, but I'm not ready to make a MR yet because I have other thoughts first. Also, since I was poking around in p_enemy.c, I fixed A_Boss1Laser's issues (not working with direct 2.1 port states and having the weird secondary attack).	2019-09-25 14:36:20 +01:00
lachwright	77613018f8	(Crudely) fixed camera jitter on certain FOF slopes	2019-09-25 21:15:19 +08:00
lachwright	264d82c8d0	Fixed Brak's flames not animating	2019-09-25 20:32:56 +08:00
lachwright	68ee7a6658	Fixed spectators taking unwarranted damage in splitscreen	2019-09-25 17:13:03 +08:00
Lachlan Wright	5de1225b3e	Hopefully added the newline back?	2019-09-25 05:06:04 -04:00
Lachlan Wright	3b30b9d656	Add parentheses over change	2019-09-25 05:00:43 -04:00
lachwright	09868d2999	Dust devil fixes	2019-09-25 16:32:06 +08:00
Lachlan Wright	637490e2de	AI players no longer take shield damage in Ultimate mode	2019-09-24 23:49:20 -04:00
Jaime Passos	c7f6db5c07	remove unused macros	2019-09-24 19:54:16 -03:00
Jaime Passos	a197449854	INT32 -> boolean	2019-09-24 19:49:24 -03:00
Jaime Passos	886fe2ad86	remove unused struct	2019-09-24 19:46:52 -03:00
Jaime Passos	b022ebe912	better crosshair	2019-09-24 19:44:30 -03:00
Jaime Passos	f7c1727959	fix automap FRACBITS confusion	2019-09-24 19:11:52 -03:00
lachwright	51cee6d5bd	removed outdated comment	2019-09-25 03:16:04 +08:00
lachwright	dc637736ea	Trigonometric input capping	2019-09-25 03:12:56 +08:00
James R	e69dd9bd75	Automate the silly joystick menu items definition	2019-09-23 20:54:53 -07:00
James R	5cdbde25c1	All for a cvar...	2019-09-23 20:23:40 -07:00
Steel Titanium	6a870b4467	Various of changes ... Changed any instance of "joystick" in strings to "gamepad" Renamed some cvars Added a define for MAX_JOYSTICK Added back the missing command line params.	2019-09-23 22:46:44 -04:00
Jaime Passos	d9507d62f8	ignore TRANSPARENTPIXEL	2019-09-23 19:20:59 -03:00
Jaime Passos	61aa84d15a	pixel alpha mistake	2019-09-23 18:27:43 -03:00
Jaime Passos	9c7b3f1d80	patch fixes	2019-09-23 18:25:53 -03:00
lachwright	98d0a0d98e	Added bounce-off behavior for multi-hit enemies/bosses	2019-09-24 03:54:04 +08:00
lachwright	3fdf48f9b0	Further cleanup	2019-09-24 03:21:01 +08:00
lachwright	41d718dabf	Cleanup	2019-09-24 03:10:41 +08:00
lachwright	de294d84e7	Lots of CA_GLIDEANDCLIMB changes: ... Glide speed now starts at whatever speed you were traveling at prior. If glide speed is below actionspd, the glide accelerates towards it. When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash. Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply. Climb speed increased x1.33.	2019-09-24 02:17:20 +08:00
Steel Titanium	dfee7efd33	Merge branch 'master' into internal-hotplug-stableid	2019-09-23 00:44:34 -04:00
Steel Titanium	73146a8338	Restore code that somehow got reverted??? ... How did this even happen??	2019-09-22 20:30:07 -04:00
lachwright	e897f5df45	Sneakers affect max glide speed, changed glideslide behavior	2019-09-23 02:56:01 +08:00
lachwright	0772ee693c	Merge remote-tracking branch 'origin/master' into knuxstuff ... Update to master branch	2019-09-23 00:21:35 +08:00
lachwright	e9d211d2bc	reallowed strafe key leeway, increased leeway strength	2019-09-23 00:21:28 +08:00
lachwright	203f9d8c1a	Trying out a new glide	2019-09-22 21:11:49 +08:00
sphere	f7ad5501e1	Increase emblem and token hitbox sizes.	2019-09-22 04:19:09 +02:00
sphere	f8c97aeb27	Tweak bubble grabbing behavior.	2019-09-22 04:05:22 +02:00
toaster	c36123aa56	Mark new-style log names as loaded.	2019-09-20 17:43:41 +01:00
toaster	113568095a	* Resolve compiling issues with logmessages. ... * Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)	2019-09-20 17:22:09 +01:00
Alam Ed Arias	8d3d5566b8	Undo file mode change on menu files	2019-09-20 12:18:57 -04:00
toaster	7da89e3bc9	Merge branch 'camerafix' into 'master' ... Camera fixes Closes #105 See merge request STJr/SRB2Internal!303	2019-09-20 11:51:30 -04:00
toaster	661966ced6	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae	2019-09-20 16:45:06 +01:00
toaster	880c2cdada	Merge branch 'playerfixes' into 'master' ... Some Player fixes and enhancements Closes #216, #219, #222, and #224 See merge request STJr/SRB2Internal!334	2019-09-20 11:39:32 -04:00
toaster	20d098de8f	Merge branch 'betterdirs' into 'master' ... Better directory structure See merge request STJr/SRB2Internal!321	2019-09-20 11:36:56 -04:00
toaster	361be5c659	Merge branch 'nmus-pk3' into 'master' ... Support W_VerifyFile on PK3 See merge request STJr/SRB2Internal!328	2019-09-20 11:35:22 -04:00
toaster	d59c02fc0b	Merge branch 'timerfix' into 'master' ... Timerres fix Closes #213 See merge request STJr/SRB2Internal!338	2019-09-20 11:34:50 -04:00
lachwright	19e0e43e87	test??	2019-09-20 12:07:57 +08:00
Alam Arias	bf55dd293e	Merge remote-tracking branch 'private/master' into flats-png-macro-fix-please-just-work-already	2019-09-19 21:43:57 -04:00
Alam Arias	530b5784b8	platersprite_t is not the same as unsigned	2019-09-19 21:42:59 -04:00
Jaime Passos	322a0b8c41	Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already	2019-09-19 22:41:45 -03:00
Jaime Passos	ef7e8c5d58	use byteptr.h macros	2019-09-19 22:40:23 -03:00
sphere	4c7a7a7e0b	Small DSZ coral tweaks.	2019-09-20 00:51:44 +02:00
lachwright	222d4f2b7c	Improved orbital camera in Software; cam_adjust cvars changed to on by default	2019-09-20 02:02:17 +08:00
toaster	802ddf94b1	Always pretend cv_playersforexit is 4 in co-op special stages.	2019-09-19 18:44:55 +01:00
toaster	a3ea2274f4	Fix inconsistency between score tally screen and timerres cvar (Resolves #213).	2019-09-19 17:43:23 +01:00
toaster	f8475eef26	Disable some code which sometimes makes the player enter walking frames when jumping up to a platform, such as the CEZ3 buttons, despite still being in jumping mode. ... If this causes more problems than it solves it can be reverted, but doing a bunch of playthroughs of DSZ1/2, GFZ1, and CEZ3 didn't seem to uncover anything, so I'm tentatively putting it in this branch.	2019-09-19 13:20:52 +01:00
toaster	ca9e6e31da	* Resolve #224 (landing frames on ceiling contact). ... * Fix some other landing weirdness with CA_BOUNCE.	2019-09-19 13:20:05 +01:00
toaster	cf14d5fe5d	* Remove sounds from swimming. ... * Lower default swim animation speed. * Make speed of flight/swim animation increase whenever mashing jump.	2019-09-19 12:30:30 +01:00
toaster	c2f7b14336	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes	2019-09-19 12:00:55 +01:00
lachwright	5015f8e142	Added Camera Options submenu (provided my files aren't broken again (please D:))	2019-09-19 17:34:04 +08:00
sphere	c81452211d	Updated ACZ cacti.	2019-09-18 21:40:33 +02:00
sphere	284ced06ec	Merge branch 'master' into new_algae	2019-09-18 20:17:36 +02:00
toaster	f870b5237f	* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added. ... * Make the pain-causing cactodes have DMG_SPIKE.	2019-09-18 17:48:41 +01:00
toaster	4e36cd82d3	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes	2019-09-18 17:24:56 +01:00
toaster	a5460c7451	Correct location of MT_CACTI10 and MT_CACTI11 in relation to their positions given in info.h and dehacked.c (fixes several ACZ-related crashes)	2019-09-18 17:24:22 +01:00
toaster	3285cc9a0d	Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)	2019-09-18 16:06:13 +01:00
toaster	2ed9d957b0	Fix Knuckles being able to climb up solid midtextures by repeatedly gliding at them. (addresses #174 checkbox 2)	2019-09-18 15:26:21 +01:00
toaster	5d37ddd676	Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed.	2019-09-18 14:16:52 +01:00
toaster	a8a8ae0d0b	Only set flight time to 0 if skin has SPR2_SWIM spriteset.	2019-09-18 14:11:06 +01:00
toaster	e993b8981e	Fix solidity of lava in reverse gravity. (Resolves #216)	2019-09-18 13:55:20 +01:00
toaster	9d774f7578	More swim stuff! ... * Prevent being able to damage enemies from below while swimming. * Make the swim-specific bubbles happen at the hands instead of where the propeller would be. * Improve placement/angle of swimming tails overlay. * Immediately set flight time to 0 if a player is being carried underwater.	2019-09-18 13:46:17 +01:00
toaster	6a63802afa	Merge branch 'patch-blending-aggregate-return-fix' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into charfixes	2019-09-18 12:46:36 +01:00
toaster	e230d7351c	Completely untested cuz I need to commit before I can merge the compile fix, but the intent of this commit is: ... * Fix S_PLAY_FLY_TIRED animation being fast. * Add moving tails to S_PLAY_SWIM animation! * Fix autobrake happening when your controls are locked by pw_nocontrol/PF_STASIS. (Resolves #219, hopefully..?)	2019-09-18 12:46:18 +01:00
toaster	45a99ce318	Change startchar's default value to 0 (Resolves #222).	2019-09-18 12:26:34 +01:00
Jaime Passos	5f6c702ed6	sky barreling	2019-09-17 23:38:04 -03:00
Jaime Passos	a6831aff9c	compile fix	2019-09-17 22:29:53 -03:00
sphere	81d1453dc4	New animated DSZ kelp.	2019-09-18 02:05:19 +02:00
Alam Ed Arias	35e3d9acab	Revert "Merge branch 'gl_skydome' into 'master'" ... This reverts merge request !326	2019-09-17 20:20:09 +00:00
Alam Ed Arias	2a33ffb7d7	PNG support: use png_const_bytep, so we do not drop const type	2019-09-17 16:18:54 -04:00
Alam Ed Arias	062f0278bc	Merge branch 'master' into next	2019-09-17 14:20:48 -04:00
Alam Ed Arias	78075ecd89	Fix FALLTHRU for Win32 console interface code	2019-09-17 14:18:27 -04:00
toaster	e179e1f9c4	Merge branch 'morecactis' into 'master' ... More harmful cactus See merge request STJr/SRB2Internal!329	2019-09-16 16:36:06 -04:00
Nev3r	777e7f8760	Merge branch 'deathstuff' into 'master' ... Lots of death stuff Closes #207 See merge request STJr/SRB2Internal!306	2019-09-16 16:32:45 -04:00
Nev3r	21b5ebf6fa	Merge branch 'abilityclean' into 'master' ... Clean up an ungodly amount of shit relating to abilities. Closes #195, #167, and #177 See merge request STJr/SRB2Internal!307	2019-09-16 16:09:20 -04:00
toaster	71cc09c8c2	Merge branch 'luabanks' into 'master' ... Lua save-banks! See merge request STJr/SRB2Internal!295	2019-09-16 07:56:49 -04:00
Jaime Passos	db979845e0	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c	2019-09-15 16:24:24 -03:00
Jaime Passos	a86e2332da	Fix MD2 loading	2019-09-15 16:24:17 -03:00
Jaime Passos	4e1791bbf4	Merge branch 'croppedpatchbleed' into 'master' ... Fix the V_DrawCroppedPatch bleeding on the current charsel screen. See merge request STJr/SRB2Internal!311	2019-09-15 12:37:46 -04:00
Jaime Passos	32769f6c71	Merge branch 'png-patches' into 'master' ... PNG patches See merge request STJr/SRB2Internal!327	2019-09-15 12:23:46 -04:00
Nev3r	9771087554	Always force player camera direction for springs with horizontal thrust component.	2019-09-15 17:43:19 +02:00
Steel Titanium	3ebb9c2c49	More harmful cactus	2019-09-12 21:36:13 -04:00
James R	86f9609623	Support W_VerifyFile on PK3	2019-09-12 17:06:57 -07:00
Jaime Passos	2a04ac69e1	()	2019-09-12 16:12:31 -03:00
Jaime Passos	acc8dae274	Merge remote-tracking branch 'origin/master' into png-patches	2019-09-12 16:04:20 -03:00
Jaime Passos	6c37576bc0	Moved this macro	2019-09-12 16:03:44 -03:00
Steel Titanium	00d64c380d	Merge branch 'newicon' into 'master' ... New EXE icon See merge request STJr/SRB2Internal!265	2019-09-12 14:05:32 -04:00
Jaime Passos	a0ec86ce01	Fix powers-of-two checks	2019-09-12 14:32:31 -03:00
toaster	9006bdd6a3	I_Error if no frames are found for a loaded skin's SPR2_STND subspriteset, given this is what everything will default to if nothing else is provided, and I really don't wanna go across the code adding checks for sprite2s not existing (since R_GetSkinSprite2, under all circumstances other than this one, is capable of bouncing back).	2019-09-12 12:52:25 +01:00
Jaime Passos	9b0e2b8991	Make nametags compatible with current player.dta ... (again)	2019-09-11 22:18:03 -03:00
Jaime Passos	f2915817a7	Merge remote-tracking branch 'origin/master' into newmenus	2019-09-11 22:17:42 -03:00
Jaime Passos	e3df9cc6b1	Crash prevention	2019-09-11 20:38:15 -03:00
Jaime Passos	a5ff609873	Read user chunks	2019-09-11 20:18:04 -03:00
Jaime Passos	affff0a7e5	Merge remote-tracking branch 'origin/master' into png-patches	2019-09-11 17:08:17 -03:00
Jaime Passos	ed551f2536	Transparency, not translucency	2019-09-11 17:03:50 -03:00
Jaime Passos	aa91627ba2	Allow PNG graphics to be used as patches ... Also allows them to be used as sprites.	2019-09-11 16:59:28 -03:00
toaster	323c7fa064	Increase maximum number of Luabanks to 16 on Steel's suggestion. (Using the Web IDE 'cuz I'm tired, so no new exe; luckily I made the code flexible to constant replacement!)	2019-09-11 14:22:56 -04:00
toaster	440b63ef13	Merge branch 'musicplus-resetmusic-followup' into 'master' ... Follow-up fixes for reset-upon-dying music See merge request STJr/SRB2Internal!284	2019-09-11 14:14:09 -04:00
toaster	9aed6374cd	Forgot to put these in Lua. (Not gonna make a fifth exe today just for this one change, though.)	2019-09-11 17:32:41 +01:00
Steel Titanium	2ced626518	Merge branch 'gl_skydome' into 'master' ... OpenGL sky dome See merge request STJr/SRB2Internal!326	2019-09-11 11:58:05 -04:00
Steel Titanium	1bafec9f55	Merge branch 'ast_newstyles' into 'master' ... Patch translucency styles See merge request STJr/SRB2Internal!324	2019-09-11 11:57:45 -04:00
James	737690c8b8	Added cam_adjust, de-ghettoified the camera in general	2019-09-11 10:45:59 -04:00
toaster	10a0b38ab1	Fix an issue where completing a stage normally would not correctly set startrings for the next one (as opposed to warping directly or dying inside it).	2019-09-11 14:25:22 +01:00
toaster	fe7e374e3b	Fix the Save Select platter drawing for the new player signpost art. ... This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!	2019-09-11 13:32:12 +01:00
toaster	ab1472bfc1	Tweak gameovertics slightly to avoid having no sound for too long.	2019-09-11 13:30:24 +01:00
toaster	ed5e8c486c	Continue screen! With aaaaaall the new assets to go with it. ... * https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif * https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif * I will be accepting no further questions at this time.	2019-09-11 00:50:51 +01:00
Jaime Passos	fec579db8c	Merge remote-tracking branch 'origin/master' into gl_skydome	2019-09-10 19:20:20 -03:00
Jaime Passos	f1cc17ea02	Enable usage of R_DrawSpan_8_MMX if drawing a flat with powers-of-two dimensions	2019-09-10 17:25:21 -03:00
Jaime Passos	eb1b6eedeb	some adjusts	2019-09-10 16:54:40 -03:00
James	4be108fa76	Lach has blessed us with a remade cam_adjust.	2019-09-10 10:11:03 -04:00
toaster	25e975e781	Add the new s1, s2, cd, 3db and kc sounds to sounds.c and sounds.h! ... These have been in srb2.pk3 for a while, but they were inaccessible because of not having in-game references.	2019-09-10 15:06:20 +01:00
toaster	6c2ef39408	Update SPR2 defaulting for SPR2_CNT1.	2019-09-10 14:44:04 +01:00
Jaime Passos	f0788598c9	Better fades	2019-09-09 23:31:48 -03:00
Alam Ed Arias	aebff2a430	Merge branch 'undo_322' into flats-png_port	2019-09-09 15:05:43 -04:00
Alam Ed Arias	470ac5fed2	Revert "Revert "Merge branch 'flats-png_port' into 'master'"" ... This reverts commit 043bb86acd.	2019-09-09 15:05:17 -04:00
Alam Ed Arias	9d64ee88a0	Be clear on what FALLTHRU we really want	2019-09-09 15:02:13 -04:00
Nev3r	043bb86acd	Revert "Merge branch 'flats-png_port' into 'master'" ... This reverts merge request !322	2019-09-09 18:40:21 +00:00
Jaime Passos	0a69190848	Missing arguments	2019-09-09 15:39:10 -03:00
Jaime Passos	6553d816ea	Merge remote-tracking branch 'origin/master' into flats-png_port	2019-09-09 14:12:28 -03:00
toaster	2b0344a22f	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff	2019-09-09 15:25:48 +01:00
toaster	e5d9d3499f	DON'T PUSH ALONE - first dregs of continue screen	2019-09-09 15:25:36 +01:00
Steel Titanium	555b4e1766	Fix function being redefined	2019-09-08 19:39:23 -04:00
toaster	8c035ecb86	Merge branch 'lightning_polys' into 'master' ... Lightning Polys See merge request STJr/SRB2Internal!294	2019-09-08 19:04:56 -04:00
toaster	0392cfc158	Merge branch 'spawnobject-linedef' into 'master' ... Linedef type 461 (Spawn Object) See merge request STJr/SRB2Internal!304	2019-09-08 18:58:50 -04:00
Steel Titanium	1bf78a2423	Move mobj_t declaration to top of the block	2019-09-08 17:14:47 -04:00
Steel Titanium	cc80cd77c5	Fix this mistake	2019-09-08 16:54:40 -04:00
Monster Iestyn	c696063260	Merge branch 'mprelated-tweaks' into 'master' ... Various improvements and changes to multiplayer menu See merge request STJr/SRB2Internal!300	2019-09-08 16:45:14 -04:00
toaster	9041a399c6	Merge branch 'nightsattackfixes' into 'master' ... NiGHTS attack fixes Closes #205 See merge request STJr/SRB2Internal!319	2019-09-08 16:42:45 -04:00
toaster	e03d03110b	Merge branch 'ending-star' into 'master' ... Endings: Fireworks fallback graphics. See merge request STJr/SRB2Internal!296	2019-09-08 16:28:52 -04:00
toaster	ba50a03d9c	Update SPR2_XTRA references for adjusted player.dta content.	2019-09-08 21:28:12 +01:00
toaster	6815748a3e	Merge branch 'flippost' into 'master' ... Flippost Closes #206 and #191 See merge request STJr/SRB2Internal!320	2019-09-08 16:24:58 -04:00
toaster	11e3f5ec96	Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale.	2019-09-08 21:21:36 +01:00
toaster	0ed589449a	Merge branch 'newegg' into 'master' ... Newegg dot blag See merge request STJr/SRB2Internal!305	2019-09-08 16:11:50 -04:00
toaster	2c898841e9	Extend gameovertics again by two seconds.	2019-09-08 18:03:51 +01:00
toaster	4dc9a95224	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff	2019-09-08 18:00:25 +01:00
toaster	2e90c40934	Fade time before Game Over track. ... Notably, can no longer use P_PlayJingle because of pre-fade.	2019-09-08 18:00:01 +01:00
Jaime Passos	ff1fa3f92b	Implement all the other alpha blend styles	2019-09-08 13:21:00 -03:00
Steel Titanium	995ab1c84d	Merge branch 'master' into internal-hotplug-stableid ... Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.	2019-09-08 01:55:36 -04:00
Steel Titanium	8ee0a9309b	Better directory structure	2019-09-08 01:29:09 -04:00
Steel Titanium	807614d02d	Add _ to the record and nights attack tracks for organization	2019-09-07 22:57:20 -04:00
Jaime Passos	abfa5e10b6	Make nametags compatible with current player.dta	2019-09-07 23:40:00 -03:00
mazmazz	7780de9edc	Merge remote-tracking branch 'origin/master' into newmenus	2019-09-07 22:25:47 -04:00
mazmazz	b7c9f15225	Fix NiGHTS attack menu not drawing correct background	2019-09-07 22:00:38 -04:00
Jaime Passos	4adff34402	opengl patch translucency	2019-09-07 22:43:29 -03:00
Jaime Passos	a67dd633ff	if that function can't return NULL why should i do this?	2019-09-07 19:02:50 -03:00
Jaime Passos	3cc2b76fb8	probably want to Z_Free this...............	2019-09-07 18:56:08 -03:00
Jaime Passos	ff293c3f6f	fix non powers of two spans	2019-09-07 18:20:49 -03:00
toaster	d26ff197dc	* Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) ... * Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function. * If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).	2019-09-07 22:12:47 +01:00
Jaime Passos	f461b76bb0	fix translucency	2019-09-07 16:54:26 -03:00
toaster	5d85e82fa6	Fix detection of GRADE_ constants in SOC.	2019-09-07 20:08:05 +01:00
GoldenTails	14cd7a5a0c	Merge branch 'master' into fix-fixedrem	2019-09-07 12:19:13 -05:00
Monster Iestyn	c6af108d8c	Merge branch 'musicfixes' into 'master' ... Minor musicplus-related fixes See merge request STJr/SRB2Internal!310	2019-09-07 11:45:15 -04:00
Monster Iestyn	d998dad2ad	Merge branch 'stop-bullying-tails' into 'master' ... Ignore bots when looking for a player Closes #190 See merge request STJr/SRB2Internal!301	2019-09-07 11:44:46 -04:00
Monster Iestyn	a287b9e317	Merge branch 'fix_skipintro' into 'master' ... Fix -skipintro in OpenGL See merge request STJr/SRB2Internal!308	2019-09-07 11:44:09 -04:00
Monster Iestyn	52a4b77f83	Merge branch 'devmode-toggletwod' into 'master' ... DEVMODE: 2D toggle command See merge request STJr/SRB2Internal!309	2019-09-07 11:43:01 -04:00
toaster	92b77c987b	Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!)	2019-09-07 12:10:50 +01:00
toaster	5640aa955a	Fix the V_DrawCroppedPatch bleeding on the current charsel screen.	2019-09-07 12:07:29 +01:00
toaster	cf4b5a1b9d	* Comment out the notices that the two types of music are disabled (see issue #179; not a perfect fix, but good enough for now).	2019-09-07 11:49:13 +01:00
toaster	54b89eefbb	* Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations).	2019-09-07 11:48:58 +01:00
toaster	99b4439b2a	* Allow CA2_GUNSLINGER users to pop monitors with their ability (as long as their weapon type isn't a pre-existing weapon ring). ... * Correct the position of a carried player relative to Tails.	2019-09-07 11:33:26 +01:00
Steel Titanium	bc52bc83cc	2D toggle command	2019-09-06 20:51:39 -04:00
Jaime Passos	d38ba4d88c	define stuff idk	2019-09-06 19:41:29 -03:00
Jaime Passos	02a7d8e0a2	Fix tilted spans.	2019-09-06 19:37:07 -03:00
Jaime Passos	2a85ed0bdd	test	2019-09-06 19:26:05 -03:00
Jaime Passos	0cc553be5f	Merge remote-tracking branch 'jimita/flats-png' into flats-png_port	2019-09-06 19:20:45 -03:00
Jaime Passos	de4a609421	Merge remote-tracking branch 'origin/master' into fix_skipintro	2019-09-06 16:08:18 -03:00
Jaime Passos	f3cf3ca453	Cleanup.	2019-09-06 16:05:46 -03:00
Jaime Passos	56abc63c29	Ignore key held events.	2019-09-06 15:25:11 -03:00
Jaime Passos	a991a10ffc	Merge remote-tracking branch 'origin/master' into newmenus	2019-09-06 15:10:09 -03:00
toaster	bb2012a8d0	Clean up an ungodly amount of shit relating to abilities. ... * Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker. * Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS. * Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195). * Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it. The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).	2019-09-06 19:01:46 +01:00
Jaime Passos	6aedca899f	2.2 skies aren't flipped	2019-09-05 17:42:36 -03:00
Jaime Passos	c6f3e4d53d	Make sky dome look a bit better	2019-09-04 13:59:09 -03:00
toaster	5bc034bc3e	[slightly off-topic commit] don't allow MP Special Stages to be selectable via the MP level platter	2019-09-04 15:52:25 +01:00
toaster	0986195d21	Bunch of fixes for dying in MP special stages. ... * Don't allow the stage to be reloaded in G_DoReborn. * If you do ANY spawn after the very beginning moment, you're forced to be a spectator. * Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.	2019-09-04 15:51:14 +01:00
toaster	7177d76cfd	Seperate "Game" and "Over" assets, per Sev's request and design. ... https://cdn.discordapp.com/attachments/428262628893261828/618812279127015475/srb20069.gif	2019-09-04 15:21:00 +01:00
Jaime Passos	f0b4a609a8	Very tiny fix	2019-09-03 23:44:04 -03:00
Jaime Passos	53ddf19f94	Interpolation flag support	2019-09-03 22:57:54 -03:00
Jaime Passos	4760ff0963	Crash prevention	2019-09-03 21:31:32 -03:00
Jaime Passos	916bdeb880	3 digits frame number	2019-09-03 18:31:59 -03:00
Jaime Passos	1dca3338fd	Sprite2 support but I'm not a dumbass	2019-09-03 18:27:22 -03:00
Monster Iestyn	4c39225c3e	Merge branch 'public_next'	2019-09-03 19:07:57 +01:00
Jaime Passos	f6d2b5109b	PRBoom sky dome	2019-09-03 02:12:17 -03:00
mazmazz	57974168c8	WIP 2.2 title screen (Alacroix)	2019-09-02 22:40:28 -04:00
Jaime Passos	1fca5a749e	Merge remote-tracking branch 'origin/master' into rotsprite_i	2019-09-02 23:36:30 -03:00
Jaime Passos	6b151ef4ea	Merge remote-tracking branch 'origin/master' into fix_skipintro	2019-09-02 23:36:15 -03:00
Jaime Passos	1e506ef180	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b	2019-09-02 23:35:36 -03:00
Jaime Passos	3f00bc1639	Merge remote-tracking branch 'origin/master' into newmenus	2019-09-02 23:34:25 -03:00
Jaime Passos	c21d83e8af	Sprite2 support!	2019-09-02 23:29:16 -03:00
Jaime Passos	d99026df3b	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b	2019-09-02 20:27:50 -03:00
toaster	f07309707d	Lots of death stuff. ... * Genesis-style love and attention to the death event. * Only visibly decrement lives/rings when you're respawning (or game over, see below). * Faster no-button-press respawn. * Game Over specific love. * Animation of Level Title font coming in from the sides. * https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif * Change gameovertics to 10 seconds instead of 15. * Make the minimum time before you can force going to the Continue screen longer. * Accomodate death in MP special stages as a form of exit. * Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits. * Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn. Also, two not-quite death things which nonetheless were relevant to change: * Fix quitting a special stage having some of the shared spheres/rings disappear into the aether. * Fix a warning during compilation for the Ring Penalty print.	2019-09-01 15:55:23 +01:00
toaster	fe99c64511	Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3)	2019-09-01 11:43:30 +01:00
James	bbe8ef9ff7	Merged orbital cam, made my reset code not run in NiGHTS, 2D mode, or when exiting levels.	2019-08-31 17:06:01 -04:00
James	577a8fd387	Merge branch 'camorbit-sev' into camerafix	2019-08-31 14:53:43 -04:00
MascaraSnake	a5ae8abdb2	Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH	2019-08-31 12:53:55 +02:00
toaster	6a9da63d7f	Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.	2019-08-30 19:19:54 +01:00
Monster Iestyn	602154fe8b	Merge branch 'ring-penalty-graphic' into 'master' ... Weapon ammo penalty indicator See merge request STJr/SRB2Internal!297	2019-08-30 13:28:05 -04:00
MascaraSnake	8ddcced6f0	Pyre Fly: Don't spawn smoke and flames if no player is in range	2019-08-30 09:05:49 +02:00
MascaraSnake	4cece9fe36	Pyre Fly: Don't run the fuse code when dead	2019-08-30 08:55:29 +02:00
MascaraSnake	806b106905	Hardcoded the Pyre Fly	2019-08-30 08:17:25 +02:00
Steel Titanium	8167a88bec	Rename private mode to unlisted mode	2019-08-30 00:38:58 -04:00
Steel Titanium	5c295d285b	Capitalize the 'if'	2019-08-30 00:36:10 -04:00
Steel Titanium	10ea0f21ae	Fix spawning within random range	2019-08-29 23:56:15 -04:00
Alam Ed Arias	028996915d	Merge branch 'master' into next	2019-08-29 19:28:02 -04:00
Alam Ed Arias	dadec1196b	Warn on implicit fallthrough	2019-08-29 19:27:52 -04:00
James	bcd0b04488	Forgot to account for z axis -- thanks James R	2019-08-29 17:17:58 -04:00
James	656879b90b	Is this thing working?	2019-08-29 15:56:46 -04:00
Steel Titanium	8655b8f1f1	Add spawn object linedef special. ... Note that spawning a object within a random range does not fully work yet and crashes the game	2019-08-29 01:57:58 -04:00
Steel Titanium	1040a93a6e	Ignore bots when looking for a player	2019-08-28 23:12:25 -04:00
Steel Titanium	7ccff2e6e3	Merge branch 'master' into mprelated-tweaks	2019-08-28 22:26:52 -04:00
Steel Titanium	7e47117afa	Add warning message when attempting to use the master server browser while modifiedgame is true.	2019-08-28 20:24:30 -04:00
Steel Titanium	121d8b7838	Merge branch 'abpolish' into 'master' ... Autobrake polish Closes #176 See merge request STJr/SRB2Internal!293	2019-08-28 00:34:21 -04:00
Steel Titanium	b4d8126675	Rename offline mode to private mode	2019-08-27 18:05:30 -04:00
MascaraSnake	2933ec3e9c	Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states	2019-08-27 19:33:54 +02:00
Steel Titanium	a98862b3ed	Allow letters to be used on ipv4 address field	2019-08-26 22:00:07 -04:00
Steel Titanium	b2712af2d0	Reorder the main multiplayer menu	2019-08-26 21:49:12 -04:00
Steel Titanium	1416312200	Move some cvars out of D_ClientServerInit and save them ... Ported over from Kart	2019-08-26 20:38:32 -04:00
Jaime Passos	015216b9ac	Don't draw borders or patches if not necessary.	2019-08-26 20:49:04 -03:00
James R	89c4989987	Show a negative number to indicate ammo penalty	2019-08-26 16:07:17 -07:00
Jaime Passos	93f1450b8a	Merge remote-tracking branch 'origin/master' into newmenus	2019-08-26 19:32:44 -03:00
Monster Iestyn	ab90526541	Merge branch 'candamagefix' into 'master' ... P_PlayerCanDamage fix See merge request STJr/SRB2Internal!291	2019-08-26 11:32:10 -04:00
MascaraSnake	671da01607	Only spawn lavafall rocks if a player is nearby	2019-08-25 23:43:07 +02:00
MascaraSnake	7ca67a8688	Added reverse gravity support to lavafalls	2019-08-25 23:31:12 +02:00
Monster Iestyn	db3a2e02a5	Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively	2019-08-25 22:24:08 +01:00
MascaraSnake	50e51c137e	Hardcoded the lavafall	2019-08-25 23:05:38 +02:00
MascaraSnake	57d28c7814	Rejig the thing type numbers	2019-08-25 20:01:08 +02:00
Monster Iestyn	d1105abdb3	Merge branch 'public_next' ... # Conflicts: # src/d_netfil.c	2019-08-25 18:18:59 +01:00
MascaraSnake	2a5c576c1c	Hardcoded the RVZ scenery	2019-08-25 12:40:32 +02:00
Steel Titanium	13d627ee7f	Remove extra whitespace	2019-08-24 18:29:56 -04:00
Monster Iestyn	964693d542	Merge branch 'master' into next	2019-08-24 23:28:38 +01:00
Steel Titanium	08808e2200	I don't even know how this happened	2019-08-24 18:27:07 -04:00
Steel Titanium	9f7613ef6d	Typecast p to INT16 ... Since the enum type is implementation-defined, and could be either signed or unsigned.	2019-08-24 18:22:18 -04:00
toaster	b746ef66ac	Fix range print for getter error (setter was caught ahead of time)	2019-08-24 22:56:20 +01:00
Steel Titanium	fbec4af086	Fallback graphic for firework display, if the character lacks one.	2019-08-24 17:17:55 -04:00
MascaraSnake	dbbb805e92	Green Snapper: Update Z position of legs during movement	2019-08-24 20:23:28 +02:00
toaster	4e256b73b2	Lua save-banks! ... * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.	2019-08-24 18:25:27 +01:00
MascaraSnake	9809e15033	Green Snapper: Use TryMove instead of TeleportMove for the head, so it doesn't snap up to higher floors.	2019-08-24 11:29:08 +02:00
James R	e5071bb605	Compare the file name only for real ... CL_SendRequestFile prepends the path for each file.	2019-08-23 11:00:05 -07:00
Steel Titanium	53892a9eb1	Work on new title card ... Even though it's not complete there's an issue where it would stop breifly during a fade.	2019-08-23 00:21:12 -04:00
toaster	1f2baf5b6b	Make polyobjects agree with sector lighting/colormap like a FOF. ... Caution: has weird retry/reload bug. Ask sphere for sample map/coords.	2019-08-22 22:30:36 +01:00
Monster Iestyn	9d2e7b66ba	Merge branch 'gfz_boss_rework' into 'master' ... GFZ boss rework + boss explosion fun See merge request STJr/SRB2Internal!290	2019-08-22 11:27:24 -04:00
toaster	fc1abdd7f8	Autobrake polish! ... * Make it actually look like a brake, so people can tell it's on instead of just having high friction. * Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).	2019-08-22 16:13:00 +01:00
GoldenTails	74de804817	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem	2019-08-22 06:27:00 -05:00
Steel Titanium	7731bf6b09	Use correct integer format	2019-08-21 21:25:45 -04:00
Jaime Passos	f90a6540d6	NiGHTS Attack menu: Let patch offsets control the alignment of the top border.	2019-08-20 21:45:55 -03:00
James R	c6c0a9dd1a	Old string drawing functions are dumb	2019-08-20 16:33:39 -07:00
Jaime Passos	41d5ffa17f	Fix OpenGL renderer crash with -skipintro command line parameter.	2019-08-20 20:21:53 -03:00
Jaime Passos	1a1f4136e8	Fix character select menu to use the new Color_Opposite array.	2019-08-20 19:08:45 -03:00
Jaime Passos	403eafb003	Merge remote-tracking branch 'origin/master' into newmenus	2019-08-20 19:07:34 -03:00
Steel Titanium	6ef9ee5467	true not TRUE	2019-08-20 15:43:59 -04:00
Monster Iestyn	eacc589ae1	Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437)	2019-08-20 20:31:28 +01:00
Monster Iestyn	2dd5f1abe3	Fixes for lib_cvRegisterVar (the Lua version of CV_RegisterVar): ... * Make sure the consvar's properties are all initialised to zeros as defaults * Error if the consvar is not given a name * Error if the consvar has CV_CALL but no call function * Error if the consvar has CV_NOINIT but not CV_CALL	2019-08-20 18:18:29 +01:00
Monster Iestyn	7f5034bb75	Merge branch 'mi-cleanup-returns' into 'master' ... MI cleanup returns See merge request STJr/SRB2Internal!292	2019-08-20 09:35:36 -04:00
Monster Iestyn	54dbd7b4c1	Merge branch 'landingbetter' into 'master' ... Fix all our landing woes. (For now.) See merge request STJr/SRB2Internal!289	2019-08-20 09:28:40 -04:00
Monster Iestyn	03ce0adef8	Remove references to old console ports that slipped in from the 2.1 source code a while back	2019-08-20 14:13:38 +01:00
Monster Iestyn	f3484f7ded	Merge branch 'public_next' ... # Conflicts: # src/config.h.in # src/d_clisrv.c # src/d_netcmd.c # src/doomdef.h # src/p_map.c # src/p_maputl.c # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj	2019-08-20 13:54:48 +01:00
Steel Titanium	5ef4b938be	Draw record attack foreground even if a message is currently on-screen.	2019-08-20 00:15:35 -04:00
Jaime Passos	12a6479521	Unlock all cached patches, fix accidental merge conflict.	2019-08-20 00:41:06 -03:00
Jaime Passos	d59febb5aa	Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus	2019-08-20 00:21:28 -03:00
Jaime Passos	e4e3af7be0	Remove new character select screen transitions. ... I should not have implemented it in the first place.	2019-08-20 00:18:34 -03:00
Jaime Passos	61866f326a	New Record Attack menu.	2019-08-20 00:12:22 -03:00
Steel Titanium	15b363773f	Fix record attack foreground not appearing. ... I'm not sure why it suddenly broke when the same condition worked before.	2019-08-19 22:10:52 -04:00
Jaime Passos	e2dde4412d	Fix character description text rendering.	2019-08-19 18:49:23 -03:00
Jaime Passos	5290f4c80b	Cool defines	2019-08-19 16:19:25 -03:00
Jaime Passos	15957bf13f	hghdfhdjhdhkdlfh	2019-08-19 15:34:12 -03:00
Jaime Passos	94e21c7b03	slight cleanup	2019-08-19 15:27:20 -03:00
Jaime Passos	29dc1119e5	uh	2019-08-19 14:43:48 -03:00
Jaime Passos	85499040d3	did The Thing	2019-08-19 14:23:03 -03:00
Jaime Passos	381258883e	More character select work	2019-08-18 22:26:52 -03:00
Jaime Passos	f13a014c4c	Tweak Record Attack screen just a little bit	2019-08-18 20:35:16 -03:00
Jaime Passos	6a66057a60	how do i code	2019-08-18 19:46:55 -03:00
Jaime Passos	feac7b56ec	Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus	2019-08-18 19:35:14 -03:00
Jaime Passos	778461028e	Character select WIP	2019-08-18 19:34:54 -03:00
Steel Titanium	59cdfa8e27	New music for record attack and nights attack menus	2019-08-18 17:32:52 -04:00
Steel Titanium	a40d5a2a45	Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus	2019-08-18 13:46:50 -04:00
Jaime Passos	5e11c5fbe7	Merge remote-tracking branch 'origin/master' into newmenus	2019-08-18 14:46:34 -03:00
Jaime Passos	f68652aa66	I	2019-08-18 14:16:48 -03:00
GoldenTails	ac7db85149	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem	2019-08-17 21:17:38 -05:00
Monster Iestyn	c50831f875	Merge branch '2.1.25-prep' into 'next' ... Update version to 2.1.25 See merge request STJr/SRB2!507	2019-08-17 14:07:04 -04:00
Monster Iestyn	9a4a90c9cb	Merge branch 'netcode-exploits' into 'next' ... Fix an exploit where players could steal the final hash of a login See merge request STJr/SRB2!508	2019-08-17 14:05:20 -04:00
James R	9c1fa867fa	Include md5.h	2019-08-17 10:34:19 -07:00
James R	c1ba72ead8	Remove a printf	2019-08-17 10:33:33 -07:00
James R	19dd9a3c14	Kart discrepancies	2019-08-17 10:33:14 -07:00
Monster Iestyn	0949406b9c	Update MD5 for patch.dta	2019-08-17 18:15:23 +01:00
Monster Iestyn	450ea0cc43	Disable the level end music fade code for now, because we discovered it causes freezes sometimes.	2019-08-16 23:19:43 +01:00
Monster Iestyn	e52a314ddb	Update version to 2.1.25	2019-08-16 20:14:01 +01:00
Monster Iestyn	ae9ecef592	Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges	2019-08-16 14:54:01 +01:00
Monster Iestyn	5c2786b163	Make the various carry types' handling code into a switch case	2019-08-15 18:02:30 +01:00
Monster Iestyn	d55790097f	split MT_TAILSOVERLAY handling code into a function of its own, since there's so much of it ... # Conflicts: # src/p_user.c	2019-08-15 18:02:22 +01:00
Monster Iestyn	bbefc3b7f4	After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all. ... (Naturally I did the same to the camera equivalent) # Conflicts: # src/p_maputl.c	2019-08-15 14:30:10 +01:00
Monster Iestyn	cda81cc166	Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised. ... * If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously. * Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this. * Finally, there is no more need for that back = front nonsense hack anymore with my changes made. # Conflicts: # src/p_maputl.c	2019-08-15 14:28:06 +01:00
Monster Iestyn	c8d1dd3be8	P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all! ... # Conflicts: # src/p_maputl.c	2019-08-15 14:25:02 +01:00
Monster Iestyn	27dd99ae72	Remove commented out P_CheckSector calls and add extra comments explaining the situation	2019-08-15 14:21:19 +01:00
Monster Iestyn	8fa54c1ab4	Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. ... This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.	2019-08-15 14:20:52 +01:00
Steel Titanium	ff9766beee	Merge branch 'master' into newmenus	2019-08-14 22:51:06 -04:00
toaster	7cd21cdfa9	Tweak the Metal Sonic death explosion sequence. It's longer than all the others before the egg capsule comes up, but so is Mecha Sonic in s3k, so it fits. ... (Not uploading an exe for this miniscule change. If you want to play with this, get it in Master. :P )	2019-08-14 10:22:14 +01:00
toaster	35f90e3322	Use the softer explosion sound from s3k to go with the increased quantity of explosions.	2019-08-13 20:24:46 +01:00
toaster	598e9017b1	Fix P_PlayerCanDamage for CA_FLY and CA_BOUNCE to be less lenient in causing damage, by making them based off the top and bottom of the player object respectively rather than its vertical center.	2019-08-13 20:11:44 +01:00
toaster	324c584e5d	Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch. ... Also make its bomb throw anim use all the new sprites.	2019-08-13 19:41:04 +01:00
Monster Iestyn	f5332ccf8e	Fixed TC_RAINBOW so it doesn't accept invalid colors, whoopsies	2019-08-12 19:06:18 +01:00
toaster	640b39d9aa	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework	2019-08-12 18:50:42 +01:00
toaster	e62fefad5d	Tweak the animation speed of the fleeing eggmobiles' sweatdrops.	2019-08-12 18:50:23 +01:00
toaster	8605d77af6	Fix an issue with painstate-exiting detection in the boss1 thinker.	2019-08-12 18:49:58 +01:00
Monster Iestyn	0685b9705c	Initialise player_names[] in D_RegisterClientCommands such that we don't need to have to manually update it if MAXPLAYERS ever changed	2019-08-12 15:18:36 +01:00
Monster Iestyn	b7a2b3f7a2	Added switch cases to skin color related functions in r_draw.c, added extra error checking	2019-08-12 15:02:36 +01:00
Monster Iestyn	7ba4bbf867	Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua	2019-08-12 14:00:26 +01:00
toaster	9ae750d09c	Since I had to do a clean build to get this up to date (the state list was updated), I decided to redo all the boss explosion animations to be way more aesthetically pleasing. ... Basically, think "Sonic 3". https://cdn.discordapp.com/attachments/371082353990303745/610233312765673493/srb20047.gif	2019-08-12 00:34:42 +01:00
Monster Iestyn	37dd048f12	tweak the defaults for titlescrollxspeed and numDemos	2019-08-11 22:28:32 +01:00
Monster Iestyn	92b47f8729	Fix uninitialised variable error toaster found in P_MinecartThink	2019-08-11 22:14:50 +01:00
toaster	c7bbefb3f8	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework	2019-08-11 21:17:13 +01:00
Monster Iestyn	0ba2b28381	Disable patch.dta at Rob's request, since we don't really use it anymore	2019-08-11 20:24:14 +01:00
toaster	f85bc7c61f	Fix Rob's Knuckles issue.	2019-08-11 19:37:15 +01:00
toaster	ed8ad7abde	Did some testing, needed to fix one more issue with moving surfaces and spinning.	2019-08-11 14:36:52 +01:00
GoldenTails	aa165f4f19	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem	2019-08-10 19:48:19 -05:00
toaster	e3aec8e067	Fix all our landing woes. (For now.) ... * Player state upon collision with ground after rolling now sets state properly. * Fix the thing where Knuckles can glide up a slope like it's nothing WHILE keeping things working for bouncers.	2019-08-10 16:06:59 +01:00
Monster Iestyn	24526d4758	Merge branch 'polyobj-collide-fix' into 'master' ... Polyobject collide fix See merge request STJr/SRB2Internal!288	2019-08-09 14:30:44 -04:00
Alam Ed Arias	fd77fe819b	curbgname need one more byte to hold the NULL	2019-08-08 23:46:08 -04:00
Alam Ed Arias	92a954609d	Merge branch 'public_next' into private	2019-08-08 23:41:19 -04:00
Alam Ed Arias	81b294eec1	Merge branch 'master' into next	2019-08-08 23:18:31 -04:00
Alam Ed Arias	268b5a09d9	Disable address-of-packed-member warning	2019-08-08 22:47:33 -04:00
Alam Ed Arias	eacf89e309	Makefile: GCC80 does not exist	2019-08-08 22:34:09 -04:00
Alam Ed Arias	b773b61b8c	Revert "Try to compile with AppVeyor's GCC 9.1.0" ... This reverts commit 749c2753e4.	2019-08-08 22:31:18 -04:00
Alam Ed Arias	749c2753e4	Try to compile with AppVeyor's GCC 9.1.0	2019-08-08 22:19:22 -04:00
Alam Ed Arias	5a79a446df	Tested to be compile with Mingw64 9.1.0	2019-08-08 21:25:46 -04:00
Alam Ed Arias	d5cc3ce48d	Makefile: support GCC 9.1	2019-08-08 20:27:57 -04:00
Alam Ed Arias	07f89fd6b5	Makefile: stop building with DWARF v2 debugging info	2019-08-08 18:43:42 -04:00
Monster Iestyn	1b9eb3c3e4	After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all. ... (Naturally I did the same to the camera equivalent)	2019-08-08 23:04:47 +01:00
Monster Iestyn	17e53ee27b	Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised. ... * If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously. * Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this. * Finally, there is no more need for that back = front nonsense hack anymore with my changes made.	2019-08-08 16:37:09 +01:00
Monster Iestyn	a8b7ecab4d	P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all! ... (This is an untested fix for VAda's apparent collision with thin air below a polyobject in ACZ2 in beta 5)	2019-08-07 23:27:26 +01:00
MascaraSnake	506093acbb	Merge branch 'fang-fixes' into 'master' ... Fang fixes Closes #154 and #140 See merge request STJr/SRB2Internal!285	2019-08-07 14:46:02 -04:00
MascaraSnake	3196fd225d	Merge branch 'fixme' into 'master' ... Build fixes See merge request STJr/SRB2Internal!287	2019-08-07 14:45:41 -04:00
Alam Ed Arias	b5279c34fa	Fix compiling without MixerX support	2019-08-07 12:42:07 -04:00
Alam Ed Arias	a6fe6ebcd3	Fix signed vs unsigned comapre	2019-08-07 12:41:22 -04:00
Alam Ed Arias	cebc1d46f0	All C files should a newline at the end	2019-08-07 12:39:51 -04:00
Alam Ed Arias	4e78617c29	fix PARANOIA builds	2019-08-07 12:39:04 -04:00
mazmazz	688fdf35f9	Use strtok instead of strtok_r	2019-08-07 01:29:05 -04:00
MascaraSnake	aac9592e31	Set Fang's minimum bounce strength to 1.5 times jump strength	2019-08-06 23:35:20 +02:00
MascaraSnake	842b503d90	Don't zero out momz when landing on slopes. ... This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.	2019-08-06 23:18:53 +02:00
mazmazz	e1e2572357	More post-merge fixes	2019-08-04 21:49:31 -04:00
mazmazz	84c9633579	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b	2019-08-04 21:33:13 -04:00
mazmazz	b1f402538f	Post-merge fixes (todo: spr2)	2019-08-04 21:32:41 -04:00
mazmazz	46993268ae	* Added FORCERESETMUSIC level header ... * cv_resetmusicbyheader toggle to disable said override * Never reset music during time attack * Change cv_resetmusic default back to off	2019-08-04 20:02:38 -04:00
toaster	3add792986	Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing. ... (MI said I could commit to master since it was only a single line.)	2019-08-04 19:11:58 +01:00
toaster	b06af59907	Merge branch 'revert_revert_musicplus' into 'master' ... Revert "Revert MusicPlus" See merge request STJr/SRB2Internal!282	2019-08-04 13:58:01 -04:00
Steel Titanium	dacee0665d	More menu stuff	2019-08-04 13:26:25 -04:00
toaster	5585059f6b	Merge branch 'ringsparkle' into 'master' ... New ring sparkles See merge request STJr/SRB2Internal!271	2019-08-04 11:46:40 -04:00
Steel Titanium	153ed82849	Last min changes	2019-08-04 11:34:55 -04:00
toaster	1fbd3eff40	* Fix the thing where you "roll" in run/walk frames if you hold spin after jumping. ... * Fix the thing where you don't go through super transformation frames when starting NiGHTS.	2019-08-04 15:25:13 +01:00
toaster	015abfc970	Revert "Revert "Fix MIDI Soundfont code shadowing a global variable."" ... This reverts commit 99dbcb9f65.	2019-08-04 12:04:01 +01:00
toaster	384dc0674e	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" ... This reverts commit 603d5805f7.	2019-08-04 12:03:57 +01:00
toaster	603d5805f7	Revert "Merge branch 'musicplus-aug2019-b' into 'master'" ... This reverts commit 56bfdb7113, reversing changes made to c29cfbef9b.	2019-08-04 11:32:55 +01:00
toaster	99dbcb9f65	Revert "Fix MIDI Soundfont code shadowing a global variable." ... This reverts commit 3591e3d092.	2019-08-04 11:28:04 +01:00
toaster	3591e3d092	Fix MIDI Soundfont code shadowing a global variable.	2019-08-04 10:28:10 +01:00
toaster	a87e1b8aa6	Fix inadvertent fallthrough and associated whitespace.	2019-08-04 10:27:36 +01:00
toaster	48e09d56bf	Fix HWR_DrawConsoleFill.	2019-08-04 10:27:09 +01:00
mazmazz	cdb7250da4	Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b	2019-08-04 03:22:36 -04:00
mazmazz	ce39341c31	Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019	2019-08-04 02:52:33 -04:00
mazmazz	bddafbeece	Merge branch 'internal-musicplus-jingle' into musicplus-aug2019	2019-08-04 02:41:37 -04:00
mazmazz	fd4d3a6a69	Mixer X menu touchup	2019-08-04 02:30:34 -04:00
mazmazz	fbaf5106fd	Revert djgppdos fade function inadvertent merge	2019-08-04 02:09:35 -04:00
mazmazz	91265379df	Revert MUSSERV code removal from S_LoadMusic ... (but we'll probably purge it later, anyway...)	2019-08-04 02:04:02 -04:00
mazmazz	6f50faf161	Fix HWR_DrawConsoleFill call extra input	2019-08-04 01:33:06 -04:00
mazmazz	d373b101fc	Merge branch 'gcc7-fixes-aug2019' into musicplus-sdlmixerx	2019-08-04 01:10:34 -04:00
mazmazz	b99f06c0c9	Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx	2019-08-04 01:10:21 -04:00
mazmazz	353fefbd42	Slight refactor for jingle resume lapse time	2019-08-04 00:59:32 -04:00
mazmazz	81d0840301	Jingle resume: Don't set music position when music is replaced	2019-08-04 00:56:17 -04:00
mazmazz	da55b4b82a	Fix 1up intermission jingle not playing	2019-08-04 00:15:31 -04:00
mazmazz	6ecc062c6a	Fix HWR_DrawConsoleFill call extra input	2019-08-04 00:15:15 -04:00
mazmazz	8a41b530b3	Merge branch 'gcc7-fixes-aug2019' into internal-musicplus-jingle	2019-08-03 23:44:06 -04:00
mazmazz	dd9efebab5	Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle	2019-08-03 23:38:49 -04:00
mazmazz	5b284c8170	gcc7 compile fixes (Fall through; spr2 var comparison)	2019-08-03 23:01:10 -04:00
mazmazz	07d1363da9	gcc7 compile fixes (Fall through; spr2 var comparison)	2019-08-03 23:00:21 -04:00
mazmazz	5f2a45befd	Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp	2019-08-03 22:49:20 -04:00
mazmazz	a9b66109fc	Fix titlemap music bug	2019-08-03 22:49:12 -04:00
mazmazz	efc8e42083	Fix titlemap music bug	2019-08-03 22:48:40 -04:00
mazmazz	1b59b224c0	Merge branch 'master' into musicplus-feature-dying-fp	2019-08-03 22:22:39 -04:00
Steel Titanium	00b73e2209	Stuff	2019-08-03 21:21:01 -04:00
Steel Titanium	00c3329ba9	Ring sparkle mirroring	2019-08-03 18:28:53 -04:00
Steel Titanium	26689e168e	Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle	2019-08-03 17:33:28 -04:00
Steel Titanium	9ea7a6dfca	Work on menus	2019-08-03 17:30:51 -04:00
toaster	8a0f1e7ed4	Merge branch 'ending' into 'master' ... ENDINGS See merge request STJr/SRB2Internal!264	2019-08-03 16:23:51 -04:00
toaster	9f34a7aa82	Merge branch 'bossenable' into 'master' ... Boss enable linedef (type 449) See merge request STJr/SRB2Internal!272	2019-08-03 16:23:22 -04:00
toaster	97072d9faa	Merge branch 'snaptoground-fix' into 'master' ... Snap to ground fix Closes #165 See merge request STJr/SRB2Internal!274	2019-08-03 16:22:47 -04:00
toaster	5ef190fc69	Merge branch 'mpspec_cleanup' into 'master' ... MP/Old Special Stage ring stuff See merge request STJr/SRB2Internal!276	2019-08-03 16:22:23 -04:00
toaster	8f729c33d3	Merge branch 'linedef-award-rings' into 'master' ... New award rings linedef executor See merge request STJr/SRB2Internal!263	2019-08-03 16:21:58 -04:00
Monster Iestyn	f9037509a1	Remove commented out P_CheckSector calls and add extra comments explaining the situation	2019-08-03 19:06:45 +01:00
Monster Iestyn	dff544404d	Merge branch 'master' into snaptoground-fix	2019-08-03 18:23:09 +01:00
Monster Iestyn	38ecd00ac9	Merge branch 'speciallosesound' into 'master' ... Fix old Special Stage failure sounds not always playing See merge request STJr/SRB2Internal!275	2019-08-03 13:18:40 -04:00
Monster Iestyn	c82c2ee815	Merge branch 'titlemaplua' into 'master' ... Titlemap Lua See merge request STJr/SRB2Internal!270	2019-08-03 13:14:46 -04:00
toaster	f3baac8577	Fix the minor issues since steel's busy	2019-08-03 08:04:02 -04:00
toaster	544a160fc3	Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1.	2019-08-03 12:25:46 +01:00
toaster	105df2395d	MI made a good argument for bossdisabled not being conditional on fromnetsave.	2019-08-03 12:09:18 +01:00
toaster	876f87e793	Have the ring bonus in MP Special Stages be based on the shared sum of all players'.	2019-08-02 23:56:25 +01:00
toaster	16c541ef1b	Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k	2019-08-02 23:51:22 +01:00
toaster	c4f0fdb783	Perfect bonus support for non-NiGHTS special stages	2019-08-02 22:52:53 +01:00
toaster	8d56133425	Fix old Special Stage failure sounds not always playing.	2019-08-02 20:02:55 +01:00
Monster Iestyn	af38c0e227	Merge branch 'bustables_misc' into 'master' ... Bustables and landing events Closes #157 and #162 See merge request STJr/SRB2Internal!262	2019-08-02 13:16:53 -04:00
Monster Iestyn	94c1873b8c	Merge branch 'anglestuff' into 'master' ... Spring angles and ring angles See merge request STJr/SRB2Internal!266	2019-08-02 13:10:23 -04:00
Monster Iestyn	8520243ab6	Merge branch 'emeraldfixes' into 'master' ... Special stage related fixes See merge request STJr/SRB2Internal!269	2019-08-02 13:08:20 -04:00
Monster Iestyn	146271e49d	Merge branch 'maniaspheresfix' into 'master' ... MANIASPHERES de-hardcode See merge request STJr/SRB2Internal!268	2019-08-02 13:06:52 -04:00
Monster Iestyn	ee64d98e39	Merge branch 'spring-things' into 'master' ... Additional spring flags See merge request STJr/SRB2Internal!256	2019-08-02 13:06:38 -04:00
Monster Iestyn	2503c2f392	Merge branch 'followmobj_scale' into 'master' ... Smiles tail scale See merge request STJr/SRB2Internal!273	2019-08-02 13:05:50 -04:00
Monster Iestyn	aab3a029f2	Merge branch 'diagonalrings' into 'master' ... Diagonal spring ring fixes See merge request STJr/SRB2Internal!267	2019-08-02 13:03:11 -04:00
Monster Iestyn	42a36de459	Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. ... This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.	2019-08-02 16:51:44 +01:00
sphere	d2c3b88020	Merge remote-tracking branch 'origin/master' into spring-things	2019-08-02 15:11:13 +02:00
toaster	f2349c5ce4	fixed sphere's CA2_MELEE stasis issue	2019-08-02 13:18:57 +01:00
Steel Titanium	e8caa8538d	Merge branch 'master' into newmenus	2019-08-01 18:36:42 -04:00
Monster Iestyn	ac058529c5	Whoops the second	2019-08-01 20:48:24 +01:00
Monster Iestyn	67f7c9d7d9	Whoops, forgot this part	2019-08-01 20:17:15 +01:00
Monster Iestyn	0821f7fb21	Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening ... ...which should hopefully stop that issue where you just teleport back to the ground. Assuming this works as expected. Also this is untested lol.	2019-08-01 18:56:00 +01:00
toaster	8fa0641e99	Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too)	2019-08-01 18:12:26 +01:00
toaster	39c15e71b0	Was reviewing old merge requests as a procrastination technique, and discovered that the followmobj's scale was being inaccurately handled for Smiles' tails! Fixed that...	2019-08-01 08:01:29 -04:00
toaster	f0fd9f7656	Ok, now the MobjThinker Lua hook is neutralised properly as well.	2019-08-01 11:35:04 +01:00
Steel Titanium	e2cd85d4da	I dunno how that got here	2019-07-31 20:57:08 -04:00
Steel Titanium	3177b27a11	Changes ... Kill off the hack	2019-07-31 20:51:55 -04:00
toaster	7cb02985f4	* Added boss enable linedef (type 449). ... - Frontside x offset = boss ID (determined via parameter for all bosses) - Noclimb flag = disable mode - Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced. - The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated. - All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled. * Add multi-boss support via parameter for: - All bosses' MT_BOSSFLYPOINT search - Boss 5's waypoint search - Oldbrak's waypoint search (this one's for you, jood)	2019-07-31 23:17:17 +01:00
Steel Titanium	d6dacaaab2	ALL CAPS ... Woops forgot to do this	2019-07-31 00:49:14 -04:00
Steel Titanium	58b56b2867	New ring sparkles	2019-07-31 00:47:42 -04:00
Steel Titanium	c93fb440e5	use VERSIONSTRING	2019-07-30 20:56:03 -04:00
toaster	2ae07bdf3b	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc ... # Conflicts: # src/p_user.c	2019-07-30 18:14:52 +01:00
toaster	7bff305672	* Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. ... * Move it into lua_script.h, so it's available to everything that needs it.	2019-07-30 17:57:57 +01:00
toaster	69e573517f	Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168).	2019-07-30 17:48:13 +01:00
toaster	d541bb7ead	* Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated.	2019-07-30 17:24:21 +01:00
toaster	18e43a5cef	* Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage. ... * Correct a potential source of desync in P_GiveEmerald.	2019-07-30 16:44:40 +01:00
Alam Ed Arias	a8637d034e	SDL2: more consts	2019-07-29 19:22:14 -04:00
Alam Ed Arias	1a643b1bd9	SDL2: more const in xpm code	2019-07-29 19:08:55 -04:00
Alam Ed Arias	ed0754382f	Merge remote-tracking branch 'private/master' into newicon	2019-07-29 19:04:19 -04:00
Alam Ed Arias	b77780e1e7	Fix building with MSVC	2019-07-29 19:02:45 -04:00
Alam Ed Arias	e50dc7c779	Merge branch 'public_next' into private	2019-07-29 18:31:01 -04:00
Alam Ed Arias	963d2f5da3	Merge branch 'master' into next	2019-07-29 18:05:33 -04:00
Alam Ed Arias	66f84efd02	SDL2: fixed compiling mixer interface with MSVC	2019-07-29 17:56:35 -04:00
toaster	f141220e82	Added escape pod. Okay, now I'm truly done with this branch. https://cdn.discordapp.com/attachments/249925765423038464/605506507345362964/srb20033.gif	2019-07-29 22:13:24 +01:00
toaster	deaee586ed	Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it.	2019-07-29 21:06:17 +01:00
toaster	a6a3048c8f	* Fix diagonal spring ring assortments being forced up/down with slopes.	2019-07-29 21:03:28 +01:00
toaster	62c708e64a	Two one liners related to angles, so doin' em in a single branch. ... * If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it. * If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.	2019-07-29 20:29:02 +01:00
toaster	47554b57e4	* Made the evaluation screen even more attractive. ... * Fixed an unused variable warning in lua_skinlib.c. - fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic) Also with apologies to MI: - golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green - fixed closed captions for replaced player sounds being incorrect - fixed closed captions overlapping tutorial text	2019-07-29 14:55:36 +01:00
Steel Titanium	98adcb1de3	Change it back to const char	2019-07-28 18:19:00 -04:00
toaster	5dc095a47d	Further improvements on MI's request, just to be safe.	2019-07-28 22:53:27 +01:00
toaster	1d799630af	Made it possible to just call EV_CrumbleChain(rover) in Lua	2019-07-28 22:45:20 +01:00
Steel Titanium	74cbf2b4f3	Update mac icon	2019-07-28 17:06:01 -04:00
Steel Titanium	e5b8bb52ef	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into newicon	2019-07-28 16:04:46 -04:00
Monster Iestyn	18e2c2461f	Merge branch 'wavingflag' into 'master' ... New CEZ scenery See merge request STJr/SRB2Internal!257	2019-07-28 15:44:00 -04:00
toaster	384533165c	* Fix crash error in GL. ... * Re-enable the perplayer stuff in V_DrawFadeFill - not worth having it disabled when it'll just have to be re-enabled later. * Remove some "consistency with software" stuff in hw_draw.c that already has equivalents	2019-07-28 17:47:57 +01:00
toaster	f47c3f40d1	Smoothen emerald rotation a tad. (Not gonna upload a new test exe, it's basically identical...)	2019-07-28 14:59:42 +01:00
toaster	bebaf6f984	* Add comments for maintenence. ... * Fix not-guaranteed-to-be-set-to-zero-ness of sparklloop * Add blackrock sparkles to good ending. * Don't have emerald sparkles be randomised. * Adjust credits to include Sal (credits sprites + four merged internal MRs and a bunch of public ones) and a few other known contributors, plus remove oni's name (he requested i do it a whiiile ago)	2019-07-28 11:40:19 +01:00
toaster	7569e0b184	Good morning, fix three little things. ... * Made the black rock animate backwards through its anim again, to match the 2.1 and earlier intro. * Rid branch of mixed code declaration warnings. * Other cleanup.	2019-07-28 10:41:00 +01:00
toaster	063e350c63	A good and bad ending cutscene now exist. ... Also: * SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in). * Minor oversights in SPR2 support corrected. * Better evaluation, featuring ending assets. * Intro has warping-in blackrock, reusing ending assets. * Cutscene text now supports lowercase (intro and custom). * Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.) * Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column) Bugs: * OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.	2019-07-28 00:32:57 +01:00
Steel Titanium	9813cbc857	More icon stuff	2019-07-27 01:13:54 -04:00
Steel Titanium	64bb70bef4	Fix crash with GME sounds when being freed	2019-07-27 01:13:54 -04:00
Steel Titanium	39f348f853	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into linedef-award-rings	2019-07-24 21:18:45 -04:00
Steel Titanium	60ffef9830	More simplified code ... Also delay is in tics, per MS' request.	2019-07-24 21:18:07 -04:00
Alam Ed Arias	f67f9405bc	Merge remote-tracking branch 'origin/master' into flats-png	2019-07-24 19:07:36 -04:00
Alam Ed Arias	0eb6b24415	Merge commit '45922f80d1e35aadc9da6e20fa32fa78c1044dfd' into flats-png	2019-07-24 18:17:01 -04:00
Steel Titanium	2075b525a9	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx	2019-07-22 22:22:12 -04:00
Steel Titanium	c35afa2c96	Merge branch 'master' into musicplus-sdlmixerx	2019-07-22 22:20:08 -04:00
Steel Titanium	af959ee309	Some fixup	2019-07-22 22:01:05 -04:00
Monster Iestyn	cb278388f0	Merge branch 'recordattack-bg-fixes' into 'master' ... Record Attack bg fixes See merge request STJr/SRB2Internal!259	2019-07-20 11:33:06 -04:00
Monster Iestyn	0f8c046c6f	On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway	2019-07-20 16:30:30 +01:00
Steel Titanium	6c2ef839c1	New award rings linedef executor	2019-07-18 22:42:46 -04:00
toaster	64517a1362	Fix !150, too	2019-07-18 00:16:01 +01:00
toaster	1d5e8e249e	Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground.	2019-07-17 23:25:49 +01:00
toaster	82acf2de6b	Fix Knuckles-in-quicksand messup.	2019-07-17 23:24:44 +01:00
toasterbabe	385d34e67e	* Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector. ... * Make CA2_GUNSLINGER not get overridden by being in quicksand.	2019-07-17 21:34:04 +01:00
toaster	438c4d1d51	Fix spindash being broken in quicksand ... # Conflicts: # src/p_mobj.c # src/p_user.c	2019-07-17 21:33:18 +01:00
Steel Titanium	181ecee202	Let's not use this	2019-07-16 19:26:16 -04:00
Steel Titanium	3ffb7b6192	New icons ... Also update IMG_xpm.c	2019-07-16 19:20:00 -04:00
Monster Iestyn	c8cfc3110f	Merge branch 'public_next'	2019-07-16 18:28:49 +01:00
Monster Iestyn	6eaf7625a9	Merge branch 'master' into next	2019-07-16 18:26:46 +01:00
Monster Iestyn	e50147f7f0	Merge branch 'master' into recordattack-bg-fixes	2019-07-16 17:04:42 +01:00
Steel Titanium	147815b87c	menu stuff	2019-07-16 00:07:55 -04:00
James R	91502f1499	Don't send login final hashes to everyone ... Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds are sent to everyone however. Thankfully logins are two passes. And the second pass uses a salt based on the playernum. Therefore, in order to actually make use of the final hash, you'd have to be the same playernum as who originally sent it. Still a stupid exploit. P.S. The netcode is LOL XD by VincyTM -Telos	2019-07-15 16:14:00 -07:00
Monster Iestyn	5ef4dda9b9	Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead. ... (I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)	2019-07-15 20:25:57 +01:00
Monster Iestyn	d44a8ab78e	Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks	2019-07-14 22:36:14 +01:00
Monster Iestyn	a1e6f5bdb3	remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/	2019-07-14 22:28:19 +01:00
Monster Iestyn	f6842a80b4	Fixes for menus: ... * add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds * increase bgname to 9 to include the extra NULL byte? (is this a good idea actually) * make M_IterateMenuTree ignore menu levels without a menutype value	2019-07-14 21:58:48 +01:00
Steel Titanium	4e839596a1	Fix crash with GME sounds when being freed	2019-07-14 14:55:04 -04:00
Monster Iestyn	fac6de9c2e	The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol. ... (Neither were the CTF starts but those didn't directly cause any problems luckily)	2019-07-14 18:10:03 +01:00
sphere	79cf8eb08d	Add a blue variant of the pole banner & change some doomednums.	2019-07-14 17:30:33 +02:00
Monster Iestyn	5c54022a89	Add static keyword to these variables for correctness	2019-07-14 16:23:01 +01:00
Monster Iestyn	794235a848	Fix mixed code-and-declaration error	2019-07-14 16:19:48 +01:00
Monster Iestyn	6cf82fbb43	Merge branch 'libopenmpt-fixes' into 'master' ... Improved libopenmpt loading See merge request STJr/SRB2Internal!251	2019-07-14 11:03:14 -04:00
MascaraSnake	ca7de207d4	Merge branch 'wallspike-fix' into 'master' ... Fix wall spikes that start retracted See merge request STJr/SRB2Internal!255	2019-07-14 10:55:10 -04:00
Monster Iestyn	d30af084d7	Merge branch 'thinkerlists-fix' into 'master' ... Thinkerlists fix Closes #161 See merge request STJr/SRB2Internal!253	2019-07-14 10:52:56 -04:00
sphere	ee937c4df0	Add a blue variant of the waving flags.	2019-07-14 16:50:45 +02:00
sphere	cfc56c9541	Don't upscale the waving flags, make them twice as large instead	2019-07-14 15:30:00 +02:00
toaster	b3e953c8c3	Correct some extant fuckups.	2019-07-14 14:21:32 +01:00
sphere	911b0262ee	Whoops, forgot to revert this.	2019-07-14 02:31:33 +02:00
sphere	9c73424b4b	Add spring flags: float for horizontal & no gravity for diagonal.	2019-07-14 02:17:44 +02:00
sphere	106f6498e2	Add meleestate to MT_WALLSPIKE.	2019-07-14 01:29:36 +02:00
sphere	e68e510ca2	Assign sound to the wood debris object.	2019-07-13 23:15:56 +02:00
toaster	323d5d61d3	Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^)	2019-07-13 14:07:40 +01:00
toaster	47f138ac34	I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here.	2019-07-13 13:43:22 +01:00
Jonas Sauer	166f1fac66	Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. ... Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.	2019-07-13 01:42:03 +02:00
MascaraSnake	1e5682d4a2	Used toaster's new P_PlayerCanDamage function for the barrel collision	2019-07-10 09:08:57 +02:00
MascaraSnake	77476d27e5	Merge branch 'master' into acz-fixes	2019-07-10 08:47:22 +02:00
Monster Iestyn	35adf2ce4a	fix leftshift of negative value MascaraSnake also gets	2019-07-09 21:48:18 +01:00
Monster Iestyn	f62087ef30	Fix MascaraSnake's issues with sign-compare (hopefully)	2019-07-09 21:43:38 +01:00
Monster Iestyn	63d337211e	Merge branch 'eggcolosseum' into 'master' ... Egg Colosseum (CEZ3 remaster) See merge request STJr/SRB2Internal!248	2019-07-09 16:32:24 -04:00
Monster Iestyn	11a24b88ee	Merge branch 'seaegg_tweaks' into 'master' ... Sea Egg See merge request STJr/SRB2Internal!244	2019-07-09 16:25:07 -04:00
Monster Iestyn	dc71e297bb	Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well	2019-07-09 21:15:12 +01:00
Steel Titanium	60cb2de6a0	Seperate declarations from code	2019-07-09 15:51:11 -04:00
Steel Titanium	c1c6656b54	Merge branch 'master' into libopenmpt-fixes	2019-07-09 15:44:58 -04:00
Steel Titanium	848061d517	Fix compiling on Linux	2019-07-09 15:42:14 -04:00
toaster	2df90888bb	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum ... # Conflicts: # src/p_mobj.c # src/sounds.c # src/sounds.h	2019-07-09 19:52:52 +01:00
Monster Iestyn	3e305c0993	Merge branch 'toast_cleanup' into 'master' ... PITY IN PINK and everything associated (formerly toast_fixes) See merge request STJr/SRB2Internal!232	2019-07-09 14:31:25 -04:00
Monster Iestyn	ef984eb336	Merge branch 'metalfixes' into 'toast_cleanup' ... Metal Sonic Boss fixes (again) See merge request STJr/SRB2Internal!245	2019-07-09 14:29:42 -04:00
Monster Iestyn	c1bea02f03	Merge branch 'rainfixesmkII' into 'master' ... Accidentially broke rain in the rainfixes branch (oh, the irony!) See merge request STJr/SRB2Internal!249	2019-07-09 14:24:14 -04:00
MascaraSnake	574cf2609f	Merge branch 'remove-character-flags' into 'master' ... Remove character flags Closes #27 See merge request STJr/SRB2Internal!246	2019-07-09 14:18:27 -04:00
Steel Titanium	21c6836fe0	Some few comments	2019-07-09 00:56:22 -04:00
Steel Titanium	e112856265	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into libopenmpt-fixes	2019-07-09 00:17:27 -04:00
Steel Titanium	9c2c81ba4e	Merge branch 'master' into libopenmpt-fixes	2019-07-08 23:37:56 -04:00
Monster Iestyn	b571be865b	Merge branch 'sound-menu-fix' into 'master' ... Sound options menu fixes Closes #160 See merge request STJr/SRB2Internal!250	2019-07-08 19:42:47 -04:00
MascaraSnake	d3d24bc0bd	Removed the "disable" linedef effect, since it's useless now that the character flags are gone	2019-07-08 22:58:31 +02:00
MascaraSnake	5b741d8232	Simplified checks for ML_NETONLY and ML_NONET	2019-07-08 22:56:00 +02:00
Monster Iestyn	4da108748b	Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks. ... If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)	2019-07-08 21:17:40 +01:00
GoldenTails	cfc9e23c43	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem	2019-07-08 08:45:24 -05:00
GoldenTails	e9771cd7d0	Make FixedRem less laggy by just using the modulo operator.	2019-07-08 08:39:31 -05:00
toaster	98b6280d03	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup ... # Conflicts: # src/p_mobj.c	2019-07-08 13:53:31 +01:00
toaster	1f15209eb5	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks ... # Conflicts: # src/p_enemy.c # src/p_mobj.c	2019-07-08 13:52:11 +01:00
toaster	a65925aeca	Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. ... If you must, I can cherrypick this into another branch - but it's required for this one, at least.	2019-07-08 13:39:21 +01:00
toaster	5e0d18be2d	Before I forget...	2019-07-08 13:36:02 +01:00
toaster	867f7ecfca	ha ha ha how can i possibly describe this commit ... Just wait for the MR, it won't be far behind.	2019-07-08 13:26:40 +01:00
MascaraSnake	906103a184	Fixed teetering on TNT barrels	2019-07-07 17:02:10 +02:00
MascaraSnake	c1f51094bf	TNT barrels are no longer enemies, but still aimable for Fang	2019-07-07 12:06:45 +02:00
Steel Titanium	d2adb5e829	Update info.h ... Also add a case for MT_BRICKDEBRIS to P_MobjThinker	2019-07-06 18:11:49 -04:00
Steel Titanium	ef05d81a4c	Change this, not that it really matters but	2019-07-06 00:39:36 -04:00
Steel Titanium	ec8f64100e	Hardcode brick debris	2019-07-06 00:36:02 -04:00
toaster	5baaba1d9e	Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. ... If you must, I can cherrypick this into another branch - but it's required for this one, at least.	2019-07-04 14:44:09 +01:00
toaster	b78fac66c4	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum	2019-07-04 14:09:56 +01:00
toaster	3efb49487e	Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. ... Just making this commit now so I can merge in master...	2019-07-04 14:09:38 +01:00
MascaraSnake	a5074a846b	Implemented a skin-based linedef executor trigger	2019-07-03 09:19:29 +02:00
toaster	4ad1703ae3	Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" ... This reverts commit c04b560e92.	2019-07-03 00:58:02 +01:00
MascaraSnake	c04b560e92	Revert "Merge branch 'metalfixes' into 'toast_cleanup'" ... This reverts merge request !239	2019-07-02 23:49:10 +00:00
MascaraSnake	5cec737985	Remove character-specific flags, replace them with net-only/no-net flags	2019-07-03 00:10:22 +02:00
MascaraSnake	e9978b2955	Merge branch 'master' into thinkerlists ... # Conflicts: # src/f_finale.c # src/p_enemy.c	2019-07-02 23:08:37 +02:00
toaster	a3f758f34f	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks ... # Conflicts: # src/p_mobj.c	2019-07-02 14:19:36 +01:00
Monster Iestyn	726b0f6c83	correctly use P_UnsetThingPosition, P_SetThingPosition + P_DelSeclist around MF_NOBLOCKMAP addition in the TNT explosion code	2019-06-30 22:22:12 +01:00
Monster Iestyn	658a3f2eea	comment out unused variable	2019-06-30 19:33:41 +01:00
toaster	f9f92abc44	ha ha ha ha ha ha ha ha ... Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs). Specifically: * Faster paced fight. * Instantly travels horizontal distance. * Fakes no longer hurt papa, and spin out like a deflating balloon when he dies. * New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena. * Support for multiple bosses in the same map distinguished by parameter. Will upload map to fight the new battle in on the MR.	2019-06-30 15:37:33 +01:00
Steel Titanium	164e797670	Better loading code for modules	2019-06-29 20:35:31 -04:00
mazmazz	2c9170fa95	Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx	2019-06-29 19:41:06 -04:00
mazmazz	5b0f7d2850	Merge branch 'master' into musicplus-sdlmixerx	2019-06-29 19:31:01 -04:00
mazmazz	0c96c5404c	2.2 jingle name fixes	2019-06-29 18:44:45 -04:00
mazmazz	923dc34215	Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle	2019-06-29 18:33:45 -04:00
mazmazz	6244489fd0	Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle	2019-06-29 18:10:44 -04:00
mazmazz	dc0a92ea62	Merge remote-tracking branch 'origin/master' into internal-md3-vanilla	2019-06-29 17:51:30 -04:00
mazmazz	22629cccbe	Merge branch 'public_next' into internal-md3-vanilla	2019-06-29 16:23:19 -04:00
Monster Iestyn	9913cc39a1	Merge branch 'public_next' ... # Conflicts: # src/g_game.c # src/p_setup.c # src/p_user.c # src/r_data.c	2019-06-29 20:55:58 +01:00
mazmazz	654e07e84a	Merge branch 'md3-vanilla' into internal-md3-vanilla	2019-06-29 15:02:50 -04:00
mazmazz	521d8fd8c1	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-06-29 15:02:07 -04:00
MascaraSnake	e5a0bd8be3	Merge branch 'wooddebris-fix' into 'master' ... Wood debris fix See merge request STJr/SRB2Internal!240	2019-06-29 03:21:15 -04:00
Jaime Passos	afa6afa593	something something memory leaks	2019-06-28 19:43:37 -03:00
Monster Iestyn	3a9ce483f5	Merge branch 'master' into next ... # Conflicts: # src/r_data.c	2019-06-28 23:24:36 +01:00
Steel Titanium	2c906e9c29	Merge branch 'jimita-unfuck-awayview' into 'next' ... unfuck awayview See merge request STJr/SRB2!493	2019-06-28 18:21:52 -04:00
Steel Titanium	47eb711097	Merge branch 'public-musicplus-feature-endoflevel' into 'next' ... Fade out music at end of level, before intermission See merge request STJr/SRB2!472	2019-06-28 18:21:07 -04:00
MascaraSnake	836d3d3186	Fixed Canarivore gas going through the floor	2019-06-29 00:19:46 +02:00
Monster Iestyn	3e404051c9	Merge branch 'console-colors-touchup' into 'master' ... Console color shenanigans Closes #156 See merge request STJr/SRB2Internal!238	2019-06-28 18:16:12 -04:00
Monster Iestyn	e2859aab5d	Merge branch 'titlemap-fix' into 'master' ... Fix Titlemap with mazmazz's fancy menu stuff See merge request STJr/SRB2Internal!228	2019-06-28 18:15:46 -04:00
Monster Iestyn	88dc34818e	Give MT_WOODDEBRIS the MF_SCENERY flag, so it can be made to join its MT_ROCKCRUMBLEn friends in dying after hitting the ground. ... (Untested)	2019-06-28 21:40:20 +01:00
toaster	faebe0f9af	Metal Sonic fixes! ... * Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup. * Make missiles able to vectorise him. * Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1. * Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing. * Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.	2019-06-28 20:48:14 +01:00
Steel Titanium	251494c3c8	Fix console back color not being correct. ... This also adds support for using such colors in a text prompt	2019-06-26 22:08:17 -04:00
toaster	8f6973cb51	Now it's CA_TWINSPIN's turn to get the improvements! ... * Remove PF_THOKKED every time a successful damage bounce occours. * When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.) * Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound. Also, some other related tweaks: * Optimisations to A_VultureBlast, which was used as a base for the particle creation. * Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism. * P_SpawnGhostMobj takes colorized into account. * Fold Tails propeller damage into P_PlayerCanDamage. * When performing an Attraction Blast, place the player in roll frames. * Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well. * Buff MT_LHRT travel distance at slow speeds.	2019-06-26 23:26:05 +01:00
toaster	d5988c4f8c	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup ... # Conflicts: # src/p_mobj.c	2019-06-26 20:43:37 +01:00
Monster Iestyn	e63e36f5e4	Merge branch 'levelselect-tweaks' into 'master' ... Some small tweaks to level select See merge request STJr/SRB2Internal!230	2019-06-25 16:50:44 -04:00
Monster Iestyn	ac669d77c4	Merge branch 'levelheader-startrings' into 'master' ... Startrings level header option Closes #155 See merge request STJr/SRB2Internal!237	2019-06-25 16:43:16 -04:00
Monster Iestyn	8aeee22529	Merge branch 'bossfixes' into 'master' ... Boss fixes See merge request STJr/SRB2Internal!235	2019-06-25 16:36:23 -04:00
Jaime Passos	8362710e50	Merge remote-tracking branch 'origin/flats' into flats-png	2019-06-25 16:04:24 -03:00
Jaime Passos	28566008b4	Merge remote-tracking branch 'upstream/master' into flats-png	2019-06-25 16:02:35 -03:00
Jaime Passos	5047f4e7f0	Fix slope flat offsets	2019-06-25 14:58:34 -03:00
Jaime Passos	0af9e865f9	Delete R_CropFlat	2019-06-25 14:41:07 -03:00
Jaime Passos	02c3710211	hHA	2019-06-25 14:40:00 -03:00
Jaime Passos	a39c52708c	Merge remote-tracking branch 'upstream/master' into flats	2019-06-25 12:56:03 -03:00
Monster Iestyn	88f7ff06d8	Merge branch 'HUDfixes' into 'master' ... HUD fixes See merge request STJr/SRB2Internal!234	2019-06-24 17:47:44 -04:00
Steel Titanium	8026fe0d4b	Some few changes. ... The amount of rings you start with also applies when you respawn from a starpost. Startrings counts the ring total requirement for a perfect bonus.	2019-06-24 16:21:03 -04:00
Nev3r	14a1af9396	Merge branch 'rainfixes' into 'master' ... Rain fixes and associated See merge request STJr/SRB2Internal!233	2019-06-24 15:07:35 -04:00
Steel Titanium	a801efa946	Forgot to do this.	2019-06-23 18:51:42 -04:00
Steel Titanium	2e200a784c	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into levelheader-startrings	2019-06-23 18:24:15 -04:00
Steel Titanium	7a23b19be8	Add startrings level header option	2019-06-23 18:15:40 -04:00
Monster Iestyn	f8087565b7	Merge branch 'drawanglefixes' into 'master' ... Drawangle fixes Closes #153 See merge request STJr/SRB2Internal!236	2019-06-23 17:33:40 -04:00
Monster Iestyn	826e8e1aaf	Fixed goofups I missed back 3 months ago	2019-06-23 17:51:58 +01:00
Monster Iestyn	d9ca8b45d3	Saving work so far, UNTESTED ... # Conflicts: # src/r_data.c	2019-06-23 17:51:36 +01:00
Sryder	8a778a4070	Simply truncate the per-map COLORMAP lump instead of not reading it at all. ... Keep the warning though.	2019-06-23 15:02:32 +01:00
Sryder	5f339fc2a9	Don't overlap strncpy in WAD file load	2019-06-23 14:52:49 +01:00
Sryder	bb9b1b3b1f	Change COLORMAP lump size check to be exact ... A lower size could technically be valid, but could easily run into strange issues.	2019-06-23 13:49:39 +01:00
Sryder	bc254d9cf7	Kill Texture SOC feature. ... As far as I know it's basically unused, and the strstr is inherently unsafe because there's no guarantee that a patch's contents are NULL terminated.	2019-06-23 13:48:29 +01:00
Sryder	45922f80d1	Don't read from a per-map COLORMAP if it is too big. ... Could this be changed to only read the first so many bytes?	2019-06-23 12:47:20 +01:00
Monster Iestyn	ce6db1cc9c	Merge branch 'public_next'	2019-06-22 22:44:42 +01:00
Monster Iestyn	c9456e141d	Merge branch 'master' into next	2019-06-22 22:42:13 +01:00
Monster Iestyn	755e4a8b2c	Merge branch 'make-credits-great-again' into 'next' ... Prevent just anyone from skipping credits but allow admins See merge request STJr/SRB2!478	2019-06-22 16:13:04 -04:00
toaster	5c54c4f922	Remove some more 2.1-related ringslinger offsets to the chat.	2019-06-22 20:17:09 +01:00
toaster	b02c21b818	Remove some more 2.1-related ringslinger offsets to the chat.	2019-06-22 20:15:57 +01:00
toaster	29c4fa306a	Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V	2019-06-22 17:33:37 +01:00
toaster	3e14ab4e03	Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V	2019-06-22 17:23:04 +01:00
toaster	28a61f2f3c	Correct some oversights where drawangle was incorrectly ignored.	2019-06-22 17:07:18 +01:00
toaster	3021116797	Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100. ... Also: Making sure every single reserved tag is recorded as an LE_ constant.	2019-06-22 17:03:39 +01:00
toaster	c8d145e474	Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena.	2019-06-22 17:03:28 +01:00
toaster	81882b63b8	As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE. ... # Conflicts: # src/p_mobj.c	2019-06-22 17:03:10 +01:00
toaster	64827348c7	HUD stuff. ... * Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1). * Fix HU_drawPing for the new palette. * Change the condition for greying out players, since the current one was buggy. * Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them. * Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).	2019-06-22 16:54:05 +01:00
toaster	e6ce55f7b5	Do some minor HUD fixes. ... * Move HUD text's anchoring to underneath STR instead of above Lives. * Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal). * Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.	2019-06-22 16:53:38 +01:00
toaster	6cf376a9b5	Support backspace for resetting various menu values, just like Kart.	2019-06-22 16:50:46 +01:00
toaster	6371de806b	Improve rain/weather. ... * Like Kart, remove cv_precipdensity. * Like Kart, replace "Infinite" draw distance value with "None". * Better thinker with more return optimisation. * Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.	2019-06-22 16:50:30 +01:00
toaster	02e315a4ee	Add HUD icon for Pink shield. (Don't worry, this is my last expected commit in this branch. Gonna cherry pick everything unrelated to the Pink shield into a bunch of other branches now.)	2019-06-22 16:44:32 +01:00
Sryder13	8444379d53	Free the zentries	2019-06-22 00:52:28 +01:00
Sryder13	83da71f809	Merge branch 'master' into pk3_leak	2019-06-22 00:28:14 +01:00
Sryder13	dcd4995eb3	Remember to end inflating	2019-06-22 00:19:34 +01:00
MascaraSnake	e20949ef77	Merge branch 'new-acz-minecarts' into 'master' ... ACZ hardcoding (including minecarts) See merge request STJr/SRB2Internal!231	2019-06-21 17:45:03 -04:00
MascaraSnake	287c25b8f9	Forgot to copy something over from the CR_ROPEHANG case	2019-06-21 23:42:48 +02:00
MascaraSnake	4385e07c0b	Always use the white sidemark sprite, since track switching is no longer "activated"	2019-06-21 23:40:28 +02:00
MascaraSnake	ed7a109ce9	Also back by popular demand: Restricting the camera angle during a minecart ride	2019-06-21 23:34:49 +02:00
Monster Iestyn	149a8bb760	Merge branch 'public_next'	2019-06-21 22:13:39 +01:00
Monster Iestyn	f84c898040	Merge branch 'master' into next	2019-06-21 22:10:32 +01:00
Steel Titanium	fe7b041346	Merge branch 'public-notpublic-libopenmpt' into 'master' ... libopenmpt support See merge request STJr/SRB2Internal!229	2019-06-21 17:03:53 -04:00
MascaraSnake	28abc883be	By popular demand: Track switching only requires strafe instead of jump+strafe	2019-06-21 20:13:30 +02:00
toaster	50e4a65f99	Correct some more oversights of switching to revitem for CA2_MELEE's particles.	2019-06-21 12:51:55 +01:00
toaster	d5e91ed8d7	Don't give SH_PINK in Race/Competition. They're your opponents!	2019-06-21 12:35:37 +01:00
toaster	3597b1c485	Make minor adjustments to the CA2_MELEE and CA_TWINSPIN stuff.	2019-06-21 00:43:03 +01:00
toaster	f7fe418f7c	Slight buff to MT_LHRT.	2019-06-20 23:43:05 +01:00
toaster	f182bb867f	HUD stuff. ... * Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1). * Fix HU_drawPing for the new palette. * Change the condition for greying out players, since the current one was buggy. * Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them. * Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).	2019-06-20 22:57:47 +01:00
Monster Iestyn	f7a32835d5	Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety	2019-06-20 20:05:07 +01:00
Monster Iestyn	bc2804d383	Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone	2019-06-20 13:24:54 +01:00
Nev3r	0e162f8f61	Add Sryder's orbital camera thing as an option.	2019-06-20 13:33:31 +02:00
toaster	eac36e73a3	Correct some oversights where drawangle was incorrectly ignored.	2019-06-20 00:43:55 +01:00
toaster	460632ad3b	Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100. ... Also: Making sure every single reserved tag is recorded as an LE_ constant.	2019-06-20 00:24:13 +01:00
toaster	f9e09ec31f	Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena.	2019-06-19 23:35:18 +01:00
toaster	84ff2a57a1	As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE.	2019-06-19 23:29:39 +01:00
toaster	2e6898f29e	PITY IN PINK! ... * Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites. * Added LHRT object, designed to be summoned with CA2_MELEE. * Gives a pink Pity Shield (SH_PINK) on same-team player contact. * Deals damage to non-player enemies. * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods). * Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.	2019-06-19 23:20:24 +01:00
toaster	6a58ae34d1	In order to make P_PlayerCanDamage more flexible, I ended up bundling the invincibility/super checks into there. ... Also, the start of my improvements to CA2_MELEE. Users of that abiliy can only damage enemies/monitors if they touch the front of the player object, but to make up for it, the player is no longer forced away from the direction of the screen at bigger movement speeds.	2019-06-19 13:20:34 +01:00
toaster	3eb9b85fd4	"PlayerCanDamage" hook! ... * Takes function(player, mo) input. * Return TRUE for stating that yes, the player is in a state that can cause contact damage, do with that what you will. * Return FALSE for stating that no, the player is weak and vulnerable and cannot cause contact damage, do with that what you will. * Return NIL for allowing the function to continue regular operation. Fills a different ideological niche than ShouldDamage - that's for determining whether damage dished between two objects should happen, this is for determining which way around damage should be dished when considering a player-object interaction. Or, in other words, think of it as "ShouldDamage is whether damage that has been requested should be granted, for object-object interaction, while PlayerCanDamage is for whether global player properties should cause damage to enemies and monitors in the first place, like spinning, hammering or stomping."	2019-06-19 12:55:05 +01:00
toaster	28dfeb344b	Instead of only performing a hook if the Lua Hook loop determines its type to be the one we want, actively continue through the loop if it's NOT. This optimisation was performed while preparing the following commit; I have generously split them out for less shitty commit-by-commit review.	2019-06-19 12:28:57 +01:00
toaster	ef6e00e8a2	P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua. ... (Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)	2019-06-19 12:09:02 +01:00
MascaraSnake	d388547021	Some more minecart fixes	2019-06-19 00:10:28 +02:00
toaster	b0326b6dec	Do some minor HUD fixes. ... * Move HUD text's anchoring to underneath STR instead of above Lives. * Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal). * Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.	2019-06-18 18:51:24 +01:00
MascaraSnake	c11a3010d9	Fixed the Canarivore gas slowdown being much too weak	2019-06-18 19:29:53 +02:00
MascaraSnake	3634321f43	...	2019-06-18 19:06:05 +02:00
toaster	1d65caa250	With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it): ... * Port across the additional colour translation maps, including mobj-level support for "colorized" objects. * Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character. * Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.	2019-06-18 17:55:57 +01:00
toaster	96d6cea569	Support backspace for resetting various menu values, just like Kart.	2019-06-18 14:36:06 +01:00
toaster	861d0d0b0a	Improve rain/weather. ... * Like Kart, remove cv_precipdensity. * Like Kart, replace "Infinite" draw distance value with "None". * Better thinker with more return optimisation. * Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.	2019-06-18 14:22:10 +01:00
Monster Iestyn	62ed90b252	fix type mismatch by typecasting	2019-06-17 20:54:06 +01:00
MascaraSnake	95a0b3fc86	Merge branch 'master' into new-acz-minecarts	2019-06-17 20:43:21 +02:00
Monster Iestyn	1638fad75e	Part 2 of fix, make sure copied slopes also pass on hasslope status to attached target sectors for FOFs ... Also fix whitespace to use tab-style spaces instead of regular spaces, ew	2019-06-17 19:00:04 +01:00
Monster Iestyn	50e8f13c03	Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation	2019-06-17 18:46:51 +01:00
MascaraSnake	647520e067	Adjusted the height difference for track switching	2019-06-17 08:41:51 +02:00
MascaraSnake	096bad14fb	Minecart stopper itself also needs MF_NOCLIPHEIGHT and MF_NOGRAVITY	2019-06-16 22:26:52 +02:00
MascaraSnake	e23ef050d5	Repaired the height difference check during track switching	2019-06-16 22:00:50 +02:00
MascaraSnake	cf7e618b2f	Fixed a bug with the Canarivore gas	2019-06-16 21:36:22 +02:00
MascaraSnake	68060b731f	Fixed a sound bug	2019-06-16 19:08:20 +02:00
MascaraSnake	db7bd4d35a	Fixed the cacti heights	2019-06-16 18:14:15 +02:00
MascaraSnake	fbd7a5ae59	Finetuned the saloon door swinging	2019-06-16 17:57:03 +02:00
MascaraSnake	7e0c9d9398	(Hopefully) fixed the player sometimes landing on the solid part of the minecart stopper after being launched out of the minecart	2019-06-16 17:07:13 +02:00
MascaraSnake	c5a2d33d4e	Added minecart support to A_MixUp	2019-06-16 16:49:18 +02:00
MascaraSnake	622a44f551	Fixed a bug involving players being thrown out of minecarts	2019-06-16 16:39:06 +02:00
MascaraSnake	b6790c7f35	Snapper head/legs and minecart segments flash when they're destroyed	2019-06-16 15:35:32 +02:00
MascaraSnake	774ccad401	Do death animation even when MF2_DONTDRAW is set	2019-06-15 22:29:30 +02:00
MascaraSnake	71a25eef92	Don't jump repeatedly when holding jump	2019-06-15 21:58:58 +02:00
MascaraSnake	39deb64e4f	Streamlined the minecart death handling	2019-06-15 21:43:36 +02:00
MascaraSnake	8e61cc6d13	Kill minecarts that fall into death pits	2019-06-15 20:59:56 +02:00
MascaraSnake	24c6dd1a68	Many more bugfixes	2019-06-15 20:21:18 +02:00
MascaraSnake	91c1e13273	Simplified the setup for the Snapper/minecart death animations	2019-06-15 17:33:07 +02:00
MascaraSnake	33ed2924e9	Fixed minecart not exploding on death	2019-06-15 14:21:27 +02:00
MascaraSnake	a3784850b7	Removed an unnecessary tracer check	2019-06-15 13:52:27 +02:00
MascaraSnake	943ddeeabf	You can now jump onto tracks that are running antiparallel to yours	2019-06-15 13:49:30 +02:00
MascaraSnake	cede95fc21	Some more bugfixes	2019-06-15 00:59:13 +02:00
MascaraSnake	981443c826	Another bugfix	2019-06-15 00:12:58 +02:00
MascaraSnake	cc9d7bee80	A bunch of bugfixes	2019-06-15 00:04:50 +02:00
MascaraSnake	018fb9b461	"Finished" minecart hardcoding (still untested and buggy)	2019-06-14 21:19:52 +02:00
Jaime Passos	c591633733	Update m_misc.c	2019-06-14 14:13:41 -03:00
MascaraSnake	db66f58f2b	Merge branch 'acz-hardcode' into new-acz-minecarts	2019-06-13 21:52:08 +02:00
MascaraSnake	43f28b8f56	Set tracers via P_SetTarget and not directly	2019-06-13 21:51:31 +02:00
MascaraSnake	ba9c7d9310	More incomplete minecart hardcoding	2019-06-13 21:45:30 +02:00