7413 commits

Author	SHA1	Message	Date
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	fe60902df5	Merge remote-tracking branch 'origin/master' into renderswitch	2019-09-27 22:53:57 -03: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	00f5cbb185	Fix titlemap* crash	2019-09-10 18:34:29 -03:00
Jaime Passos	347f9cda8b	Fix title screen crash	2019-09-10 18:33:06 -03:00
Jaime Passos	f0019f2b2a	Oops.	2019-09-10 18:17:02 -03:00
Jaime Passos	8057eeaaca	Merge remote-tracking branch 'jimita/renderswitch' into renderswitch	2019-09-10 18:12:01 -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	6ab20060a7	Disable LUA_PATCH_SAFETY because I trust Lua scripters enough ... haha........ha.................	2019-09-10 16:59:37 -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
Jaime Passos	1a9191dcd7	Attempt to fix warnings	2019-09-09 19:34:51 -03:00
Jaime Passos	0a973af5b8	Comments	2019-09-09 19:27:08 -03:00
Jaime Passos	6f4dadaa12	menu changes	2019-09-09 17:53:34 -03:00
Jaime Passos	02e327a4e4	D_SRB2Loop: Draw CONSBACK even in OpenGL	2019-09-09 17:35:38 -03:00
Jaime Passos	26569f494b	lua stuff	2019-09-09 17:24:13 -03:00
Jaime Passos	ebc22b9df8	yet even more cleanup here	2019-09-09 16:31:30 -03:00
Jaime Passos	da93e0f1f5	I am the CEO of renderers	2019-09-09 16:20:17 -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
Jaime Passos	dc93cafda9	can i push this already?	2019-09-08 22:25:18 -03:00
Jaime Passos	725d0b4c44	still making things better	2019-09-08 21:37:24 -03: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
Jaime Passos	19e50062cc	more stuff. i hope i didnt mess this up.	2019-09-08 18:59:49 -03:00
Jaime Passos	c7e01a558e	initial stuff	2019-09-08 18:44:40 -03:00
Jaime Passos	2863ede7bf	initial stuff	2019-09-08 18:27:35 -03: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
MascaraSnake	1ff64baf8b	Merge branch 'acz-hardcode' into new-acz-minecarts	2019-06-12 21:28:39 +02:00
MascaraSnake	fae4dc3f21	Forgot to hardcode the mobj.valid checks	2019-06-12 21:28:09 +02:00
MascaraSnake	fafabaae2b	Hardcoded the saloon door	2019-06-12 21:20:14 +02:00
Steel Titanium	5ee6c5095d	Merge remote-tracking branch 'remotes/origin/master' into levelselect-tweaks	2019-06-11 20:06:02 -04:00
Steel Titanium	58bb05be00	Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt ... # Conflicts: # .travis.yml # src/m_menu.c # src/sdl/Srb2SDL-vc10.vcxproj # src/sdl/Srb2SDL.props	2019-06-11 17:48:00 -04:00
Nev3r	a1b2a0a344	Properly take skybox viewpoint angle into account.	2019-06-11 14:47:58 +02:00
toaster	6c6ed6a349	Fix Titlemap with mazmazz's fancy menu stuff ... Handled by changing some defaults. Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please	2019-06-10 15:43:47 -04:00
MascaraSnake	6a46fc76b8	Fixed some angle business in the BASH code	2019-06-10 20:40:12 +02:00
MascaraSnake	068e07974d	Hardcoded the new Snapper behavior	2019-06-10 20:32:50 +02:00
Nev3r	ae6997621d	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2	2019-06-10 18:14:03 +02:00
Nev3r	c014235ad3	Fix 1 extra column rendering on portal-clipped vissprites.	2019-06-10 17:59:12 +02:00
MascaraSnake	0e80d2ec5d	Hardcoded the new Minus behavior	2019-06-10 17:42:37 +02:00
Nev3r	d2605e0314	Remove remnants of portalcullsector.	2019-06-10 17:13:04 +02:00
MascaraSnake	85eece29d3	Fixed the bug	2019-06-10 16:19:58 +02:00
MascaraSnake	b98de5d362	Hardcoded the new BASH behavior (there's still a bug lurking somewhere)	2019-06-10 16:09:15 +02:00
MascaraSnake	4d0b0f84b1	Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.	2019-06-10 14:10:37 +02:00
MascaraSnake	98ea229680	Hardcoded the Canarivore	2019-06-10 13:58:16 +02:00
Nev3r	581e80ed69	Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.	2019-06-09 22:48:54 +02:00
Monster Iestyn	e7e3b0ef38	Merge branch 'public_next' ... # Conflicts: # src/doomdef.h # src/hardware/hw_draw.c # src/m_misc.c # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj	2019-06-09 20:04:08 +01:00
Nev3r	f536ab3467	Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out. ... I carelessly changed the line's drawsegs to curdrawsegs without researching what that piece of code did.	2019-06-09 20:04:07 +02:00
MascaraSnake	3a16a7d7d4	Hardcoded train dust and steam spawner	2019-06-09 17:16:07 +02:00
MascaraSnake	6df14492a5	Hardcoded train cameo	2019-06-09 13:48:07 +02:00
MascaraSnake	ca4ab06abf	Hardcoded wood debris	2019-06-09 12:27:09 +02:00
MascaraSnake	7b603f4ac8	Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)	2019-06-09 10:51:33 +02:00
MascaraSnake	546af19c82	Hardcoded oil lamp	2019-06-08 15:50:01 +02:00
MascaraSnake	3d65ec7426	Changed cacti widths	2019-06-08 14:45:01 +02:00
MascaraSnake	5ac594abf5	Fixed dust scaling, changed sound captions	2019-06-08 14:12:39 +02:00
MascaraSnake	1aaccfcd5c	Hardcoded dust devil	2019-06-08 09:51:46 +02:00
Monster Iestyn	f5d883bd12	Merge branch 'next' into 2.1.24-prep ... # Conflicts: # debian-template/control # debian/changelog	2019-06-07 23:18:31 +01:00
Alam Ed Arias	ea08ba3fba	Merge branch 'master' into next	2019-06-07 18:07:32 -04:00
Alam Ed Arias	83b8a98df4	Merge branch 'gme-msvc' into 'master' ... Add GME to MSVC 10 solution See merge request STJr/SRB2!448	2019-06-07 18:06:51 -04:00
Steel Titanium	c0c1e5416f	Merge branch 'next' into 2.1.24-prep	2019-06-07 18:02:09 -04:00
Steel Titanium	3c08ee1313	Merge branch 'master' into travis-deployer ... # Conflicts: # .travis.yml	2019-06-07 16:56:19 -04:00
Steel Titanium	eb99ad0437	Merge branch 'more-limits' into 2.1.24-prep	2019-06-07 11:28:43 -04:00
Monster Iestyn	6f6d912fa6	Update version to 2.1.24	2019-06-07 15:48:33 +01:00
Nev3r	0795c7811a	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2	2019-06-07 13:11:51 +02:00
Nev3r	8c3ddd61d5	Refactored a bit of code regarding visplane bound trimming for portals; reset ffloor's f_clip/c_clip so that FOFs on portals don't interfere with previously acquired bounds.	2019-06-07 13:10:12 +02:00
Nev3r	d2692ddd24	viewx/viewy also need to be stored/restored.	2019-06-06 13:31:48 +02:00
Nev3r	0d77e8afaf	Add pad checks for visplanes; invalidate invalid columns from visplanes (visplane renderer and column renderers don't speak exactly the same language). ... The visplane portal top boundary offset has been restored since all known bugs involving it have been fixed.	2019-06-06 11:26:13 +02:00
Nev3r	5284817259	Fix sigsegv when there is no main skybox viewpoint.	2019-06-05 18:45:36 +02:00
Nev3r	1c14062e8b	Vissprite clipping improvements. ... Vissprites are now only clipped against their respective portal's geometry obtained from their BSP run. Additionally, if a portal is provided, they're clipped to the portal's clip boundaries. The work on this branch should conclude after a pair of remaining glitches are fixed.	2019-06-05 18:07:08 +02:00
Nev3r	25b56ffecd	Masked elements are now fully grouped individually for each portal/view; fixed viewz-related glitches,. ... The drawnodes are now fully grouped in separate lists, and then sorted individually. This fixes sorting problems caused by portals belonging to differently perceived scales (skyboxes for example). Drawsegs and vissprite/drawnode sorting require the viewz, so the viewz is stored for each portal/view, and then restored when needed; without this, the rendering process erroneously sorts the elements, and draws some at wrong positions.	2019-06-05 12:10:59 +02:00
Nev3r	b22aa784fb	Set a default frontscale for visplane portals. ... I don't know whether this is necessary or not but I'm poking blindly trying to fix the sorting issues for now.	2019-06-04 21:04:35 +02:00
Nev3r	8abecc7f86	Created drawnode lists for each view/portal. ... Each shall eventually have its specific vissprites/drawsegs; currently only drawsegs are stored in their correct list, vissprites are stored in the first list as a placeholder. The idea is to sort each list individually, and then render their masked elements, starting from the last drawnode list. This retains a non-recursive function calling method while still rendering things in order.	2019-06-04 20:15:42 +02:00
Monster Iestyn	0fd3668111	Revert "Merge branch '144-scrolltweaks' into 'master'" ... This reverts merge request !213	2019-06-04 17:34:59 +00:00
Steel Titanium	742c43cf1c	Some small tweaks	2019-06-03 17:34:51 -04:00
Steel Titanium	81dec89aeb	Merge branch 'next' into public-musicplus-libopenmpt	2019-06-03 15:36:50 -04:00
Steel Titanium	d4dac52766	Upped freeslots limit	2019-06-03 15:23:48 -04:00
Nev3r	2aabf6ffd5	Moving away more portal-related global vars to r_portal.	2019-06-03 13:33:12 +02:00
Nev3r	942c34a6af	Moved validcount++ to where it used to be. ... It seems to screw up the portal rendering in odd ways if it's in the wrong position. I apologize for not even knowing what it's meant to do nor how it works.	2019-06-03 13:04:27 +02:00
Monster Iestyn	b7f75246e4	Merge branch 'master' into checksight-fixes ... # Conflicts: # src/p_sight.c	2019-06-02 18:13:02 +01:00
Nev3r	264386f842	Add visplane portal creation functionality and use it to replace the skybox rendering. ... The skybox rendering process has been replaced with portals instead. Those are generated after the first BSP tree pass by looking for existing sky visplanes at the time, and their windows are used to define new portals. The skybox portals are still incomplete and cause visual glitches when masked elements are involved.	2019-06-02 00:07:55 +02:00
Nev3r	df0a40b3c2	Code refactoring to turn portal struct into a more generalized shape. ... Split portal-related code to its own source files. Most of the 2-line-specific setup has been moved to the function which adds a 2-line case. The portals should render as they used to so far, anyway.	2019-06-01 13:07:23 +02:00
Monster Iestyn	571c5b89b5	Whoops, forgot to make P_CheckSight support slopes for same-sector FOF plane checking.	2019-05-27 21:18:02 +01:00
Monster Iestyn	abfdac15a8	Fixed P_CheckSight to support slopes, both for normal planes and FOF planes ... (Untested)	2019-05-27 20:36:35 +01:00
Monster Iestyn	ad4006712e	fix P_CheckSight to consider FOFs that completely block the view ... (this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)	2019-05-27 19:32:05 +01:00
Jaime Passos	39857a846a	PNG support	2019-05-26 23:37:23 -03:00
Jaime Passos	0bcf89679e	Hardware renderer: Fix polyobjects	2019-05-26 18:16:13 -03:00
Jaime Passos	a4a529bdb5	Hardware renderer: Disable Glide-specific texture handling	2019-05-26 17:41:10 -03:00
Jaime Passos	dfd8beae27	Merge remote-tracking branch 'upstream/jimita-flats' into flats	2019-05-26 16:43:33 -03:00
Jaime Passos	93f60267c1	Minor fixes	2019-05-26 16:22:33 -03:00
Nev3r	36036b6cfd	Permit textures to use the "TEXTURE" tag in addition to "WALLTEXTURE". ... It's pointless to make any distinctions anymore IMO, given flats can load them just fine now.	2019-05-26 12:02:43 +02:00
Steel Titanium	34ce368895	Merge branch 'next' into jimita-unfuck-awayview	2019-05-25 19:47:45 -04:00
Steel Titanium	dc273d3f23	Merge branch 'next' into jimita-flashpals-on-screenshots	2019-05-25 19:37:17 -04:00
Steel Titanium	c8a5597492	Update libopenmpt to 0.4.4	2019-05-23 22:05:28 -04:00
Monster Iestyn	677801f5ff	Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both	2019-05-23 21:51:58 +01:00
Monster Iestyn	e60b0b1a80	Update hw_light.c ... (though I'm not sure why we bother, since coronas have been disabled for a decade now)	2019-05-23 21:08:27 +01:00
Monster Iestyn	7d0509f1cb	Merge branch 'master' into acz-boss-hardcode	2019-05-23 20:38:25 +01:00
Monster Iestyn	742b11c0ff	Hardcoded ACZ3.wad's version of A_TNTExplode under the name of A_Boss5BombExplode. After a lot of confusion and silly misunderstandings on my part (as well as a lot of mess cleaning), I've finally got there! ... The states for the actual bomb explosion effect itself are yet to be hardcoded, but that I'll do tomorrow afternoon probably.	2019-05-21 21:51:19 +01:00
Jaime Passos	dbb1575a6d	Animations, better flat management.	2019-05-21 15:24:26 -03:00
Jaime Passos	869f1e4e8d	Fix warnings	2019-05-21 11:03:53 -03:00
Jaime Passos	35d6da159d	HOLD UP	2019-05-21 09:50:39 -03:00
Steel Titanium	ce1c1d8c88	Forgot some references	2019-05-20 23:31:23 -04:00
Jaime Passos	714c997aac	Support for patches and textures to be used in place of sector flats ... Still a work in progress.	2019-05-21 00:28:52 -03:00
Steel Titanium	bf3d5f4188	circleci: Fix compiling error	2019-05-20 23:22:23 -04:00
Steel Titanium	91767a7740	Merge branch 'master' into public-musicplus-libopenmpt	2019-05-20 21:33:10 -04:00
Monster Iestyn	ec0719f74f	Merge branch 'steelt-acz-things-hardcode' into 'master' ... Hardcode some ACZ things See merge request STJr/SRB2Internal!220	2019-05-17 12:22:21 -04:00
Monster Iestyn	572328a4fa	Merge branch 'public_flatsprite'	2019-05-16 16:00:24 +01:00
Monster Iestyn	66bc287688	Merge branch 'public_next'	2019-05-16 15:58:17 +01:00
Monster Iestyn	600a373739	Merge branch 'master' into next	2019-05-13 16:07:30 +01:00
Monster Iestyn	2a9019c15e	Merge branch 'archiveworld-sigsegv-fix' into 'next' ... Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines. See merge request STJr/SRB2!490	2019-05-13 07:02:48 -04:00
Alam Ed Arias	addf2bb3c4	Fix NONET build	2019-05-13 01:51:36 -04:00
Steel Titanium	8a14427420	Merge branch 'perpetual-modifier-updates' into 'master' ... Set modifiers in a non-reactive manner See merge request STJr/SRB2!456	2019-05-13 00:36:06 -04:00
Steel Titanium	06961a8f5e	Merge branch 'no-frameskip' into 'next' ... Don't skip frames when connecting or paused See merge request STJr/SRB2!489	2019-05-13 00:35:11 -04:00
Steel Titanium	cad65ad5e9	Properly fix crash due to duplicated lines.	2019-05-13 00:23:43 -04:00
Steel Titanium	4e0cc2505a	Revert "Check that lumps are okay" ... This reverts commit 7ac0a8b4d2.	2019-05-13 00:20:39 -04:00
Steel Titanium	b34aa86403	Hardcode some ACZ things	2019-05-11 22:56:23 -04:00
James R	7ac0a8b4d2	Check that lumps are okay	2019-05-08 20:30:19 -04:00
mazmazz	f30d91ee75	Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla	2019-05-08 17:59:49 -04:00
mazmazz	6d803decb6	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-05-08 17:56:05 -04:00
Monster Iestyn	f0e16cad32	Merge branch 'master' into next	2019-05-08 16:31:05 +01:00
Monster Iestyn	8ea9d0e95c	Merge branch 'alias_recursion_hotfix_2' into 'master' ... Alias recursion hotfix 2 See merge request STJr/SRB2!482	2019-05-08 11:25:15 -04:00
wolfy852	8f05d75926	Don't skip frames when connecting or paused	2019-05-08 09:39:45 -05:00
wolfs	e394f41c52	Merge branch 'public-musicplus-tagfix' into 'next' ... Fix music load lag by reverting tag changes See merge request STJr/SRB2!486	2019-05-07 22:42:13 -04:00
Sryder	b304b268c8	No sprite billboarding on papersprites	2019-05-06 20:24:26 +01:00
Sryder	1f1d67cd7e	Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite ... # Conflicts: # src/p_user.c	2019-05-06 20:20:57 +01:00
Monster Iestyn	406c3619d7	Merge branch 'master' into next	2019-05-06 19:38:53 +01:00
Nev3r	aab2f55aec	Merge branch 'banip-command' into 'next' ... Ban IP command See merge request STJr/SRB2!460	2019-05-06 13:09:14 -04:00
Nev3r	ae25e8ea07	Merge branch 'console-wait-fix' into 'master' ... Don't count down wait timer when executing a command line See merge request STJr/SRB2!483	2019-05-06 12:56:07 -04:00
Nev3r	8b8e165d19	Merge branch 'opengl-sprite-billboarding' into 'master' ... OpenGL Sprite Billboarding See merge request STJr/SRB2!485	2019-05-06 12:45:53 -04:00
Sryder	8273534967	Add a cvar for sprite billboarding, off by default.	2019-05-06 16:57:32 +01:00
Monster Iestyn	ea951eef78	fix an inconsistency I introduced between counting the waypoints and finding them again	2019-05-05 21:16:44 +01:00
Monster Iestyn	ee0c4b42a6	fix P_CheckSight to consider FOFs that completely block the view ... (this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)	2019-05-05 21:03:15 +01:00
Monster Iestyn	b9611c3a81	Hardcoded the cork's stun-you-even-while-flashing behaviour	2019-05-05 19:16:30 +01:00
Monster Iestyn	b0087616c7	Hardcoded the boss's TouchSpecial hook. ... Also cleaned up this part of P_TouchSpecialThing a bit while I'm here	2019-05-05 18:22:19 +01:00
Monster Iestyn	373d12cb82	Hardcode "slapstick"	2019-05-05 17:36:55 +01:00
Monster Iestyn	f7fbf40437	Hardcoded MT_FSGNA's MobjThinker hook function	2019-05-05 16:42:50 +01:00
Monster Iestyn	9c0c0ad3dc	hardcoded the boss's A_BossDeath behaviour. ... (also turned this part of the function into a switch case to make things neater)	2019-05-05 16:03:34 +01:00
Monster Iestyn	289a412377	Hardcode the boss thinker function	2019-05-05 15:34:06 +01:00
Monster Iestyn	9e26d7bdaa	I just checked how P_LookForPlayers works, and it turns out it doesn't modify the target *unless* it returns true. So I guess we've no need to account for a change in target in A_LookForBetter after all?	2019-05-05 14:09:09 +01:00
Monster Iestyn	09368963dd	hardcode MT_FBOMB's MobjSpawn hook function	2019-05-04 22:46:27 +01:00
Monster Iestyn	d44265a217	Mystery solved, he was turning "invisible" because of this mistake in A_DoNPCSkid	2019-05-04 22:38:14 +01:00
Monster Iestyn	691ae982e7	S_FANG_SLIDE wasn't defined in the Lua script, despite being declared :| ... Also Fang seems to turn invisible after his first jump for some reason, and I can't figure out why???	2019-05-04 21:31:46 +01:00
Monster Iestyn	7b6b34212b	Swap "S_TNTBARREL_EXPL1" for S_NULL as a temporary measure until I actually hardcode the explosion states. ... As of now, you can now compile this branch with no issues. But Fang won't work properly for a while yet, we'll get there don't worry.	2019-05-04 20:20:34 +01:00
Monster Iestyn	445709037d	Fix some compiler complaints about A_Boss5FindWaypoint	2019-05-04 20:17:00 +01:00
Monster Iestyn	b205602db6	DO NOT USE FRACUNIT AS A LAZY WAY TO DO UPPER 16 BITS FOR ACTION VARS	2019-05-04 19:43:14 +01:00
Monster Iestyn	a5331f8024	Fix A_LookForBetter to not leave a stray thinker reference lingering potentially forever, as toaster pointed out it might do.	2019-05-04 17:15:59 +01:00
Monster Iestyn	54fea4d0b9	AND I forgot these checks, confound it	2019-05-03 23:16:11 +01:00
Monster Iestyn	ee1fd72f9f	ah, forgot to do this	2019-05-03 23:12:03 +01:00
Monster Iestyn	df99e93288	Hardcoded A_Boss5FindWaypoint ... ...that took a while x_x	2019-05-03 22:58:54 +01:00
Monster Iestyn	0d7cd34882	Hardcoded A_Boss5MakeItRain	2019-05-03 20:52:56 +01:00
Monster Iestyn	b03bfbabe4	Hardcode A_DoNPCSkid	2019-05-03 20:00:31 +01:00
Monster Iestyn	b4d8c2fa29	Hardcoded A_Boss5PinchShot	2019-05-03 19:46:41 +01:00
Monster Iestyn	6cd2b73273	Hardcoded A_LookForBetter	2019-05-03 19:14:17 +01:00
Monster Iestyn	a0220454fd	Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)	2019-05-03 18:51:17 +01:00
Monster Iestyn	1b2afea091	Merge branch 'public_next'	2019-05-03 16:42:42 +01:00
Monster Iestyn	454306cf86	Merge branch 'master' into next	2019-05-03 16:40:13 +01:00
Monster Iestyn	a5dfbe7eff	add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason ... not making a merge request because this is so laughably stupidly simple	2019-05-03 16:38:59 +01:00
Monster Iestyn	d4ab2837bb	Merge branch 'master' into next	2019-05-03 16:00:45 +01:00
Steel Titanium	6aac014608	Generic model terminology	2019-05-02 22:55:45 -04:00
mazmazz	904b00e921	Remove song_length tag search ... Because songs without this tag will skiplag when loading.	2019-05-02 19:14:23 -04:00
mazmazz	3e5b0c4531	Remove MP3 widechar tag searching ... 1. It's slow, 2. It's incorrect	2019-05-02 19:13:56 -04:00
mazmazz	89ab777c40	Merge remote-tracking branch 'origin/master' into menu-execs	2019-05-02 18:47:43 -04:00
mazmazz	05b576dde8	Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla	2019-05-02 17:56:49 -04:00
Jaime Passos	39c422506e	Unbind VBO from model during mid-frame ... https://git.magicalgirl.moe/STJr/SRB2/merge_requests/397?commit_id=79fed1e954ce77fabb2f09573e2fcd00d6326cef#note_11536	2019-05-02 17:56:06 -04:00
mazmazz	0bbdfa8bef	Merge remote-tracking branch 'public-gl/md3-vanilla' into md3-vanilla	2019-05-02 17:50:38 -04:00
Jaime Passos	79fed1e954	Unbind VBO from model during mid-frame	2019-05-02 17:49:10 -04:00
mazmazz	3d90488d17	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-05-02 17:43:40 -04:00
Monster Iestyn	266fa05e15	fix a slipup in A_DoNPCPain I just noticed I made, whoops	2019-05-02 21:34:00 +01:00
Monster Iestyn	61eb05eab2	Hardcoded A_Boss5CheckFalling	2019-05-02 21:32:28 +01:00
Monster Iestyn	953a0c2967	Hardcoded A_Boss5ExtraRepeat	2019-05-02 21:21:15 +01:00
Monster Iestyn	fb17c1ac5a	Hardcoded A_Boss5CheckOnGround	2019-05-02 19:09:40 +01:00
Monster Iestyn	3bbc5d0b08	hardcoded A_DoNPCPain	2019-05-02 18:32:43 +01:00
Monster Iestyn	75701294ea	Hardcode Fang waypoint object type (turns out no state is needed)	2019-05-02 18:11:44 +01:00
Monster Iestyn	d92ccf6823	Hardcoded all the main Fang-specific object types, states and sprites. ... This cannot be compiled as-is right now for the following reasons: * Numerous actions still need to be hardcoded. * MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it. Also missing: * Fang waypoint object type+states. * Fang's good looks (to be put in the resource files obviously). * Fang's brain.	2019-05-02 18:01:18 +01:00
Sryder	4d77ed925e	OpenGL sprite billboarding ... Should work on both normal and precipitation sprites. Sprites that are split by lighting should work correctly.	2019-05-01 20:15:00 +01:00
Nev3r	a56e8e4f8b	Merge branch 'further-mace-advancements' into 'master' ... Further Mace Advancements See merge request STJr/SRB2Internal!147	2019-04-30 15:15:35 -04:00
Nev3r	5c240eb9db	Add back the p_slopes.h header guard ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 18:05:16 +02:00
Nev3r	62875d6728	Send the slope thinkers list after the mobj list ... Keeping the sector list before the mobj list stops the objects from "entering" or "floating" on slopes. However this induces a new slope adhesion problem in fast-moving slopes, so it is more desirable to leave the "indent/float-on" behavior for now since fixing this one seems like a big can of worms and falls off this branch's scope. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 17:16:35 +02:00
Nev3r	a9110c0645	Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks ... Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list. So it's safe to assume all thinkers inside the mobj list must be mobjs. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 16:39:57 +02:00
Nev3r	a3174fb56f	Add a temporary limbo list for thinkers that need to be freed, in order to keep other lists clean, especially the mobj list. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 16:17:47 +02:00
Nev3r	fc9e141460	Give precip. its own thinker list ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 14:58:18 +02:00
Monster Iestyn	8cb0f55a90	Rename thinkers.iterate to mobjs.iterate, kill the "mobjs" arg (though you still need the parentheses). Done a bit messily/lazily, I'll clean up if we can confirm this works ... I do wonder whether this library can be extended for all of thlist's lists... but for now it's mobj-only, since we only have the ability to mess with mobjs anyway.	2019-04-21 13:52:55 +01:00
Nev3r	696ccbd943	Fix mobj list iteration oversights. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 12:58:22 +02:00
Nev3r	aad78d4985	Give slope thinkers their own list right before mobjs'. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 12:00:10 +02:00
Nev3r	11dba34f43	Remove dynamic slope queue list due to now being unnecessary. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 11:52:18 +02:00
Nev3r	d264d06879	Merge branch 'slopethinkers' into thinkerlists ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 11:47:34 +02:00
Nev3r	134679c287	Fix some of the polyobject thinkers being removed via P_RemoveThinkerDelayed() directly ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-21 11:08:24 +02:00
Nev3r	b60c66325c	Added a mobj-only list entry for mobj thinkers ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-20 23:29:20 +02:00
Nev3r	39ba20be6b	Basic multiple thinker list implementation ... Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-20 22:39:22 +02:00
Nev3r	7c17ed0aa6	Things spawning over copied slopes now properly align on the new plane ... While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-20 19:03:50 +02:00
Nev3r	b3ac590e5e	Add a slope thinker queue. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-20 13:06:06 +02:00
Nev3r	83001a5bc9	Fix line-based slopes' normals. ... The game never uses the normals directly yet so it's been left unnoticed ever since. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-19 20:34:22 +02:00
Nev3r	8a2e11ffa9	Small code cleanup ... - Removed unused vars from the slope struct. I'm pretty sure they were meant for something at some point, but right now there's nothing using them and frankly I find it hard to understand what they were meant for. - Removed unused slope flags. - Flipped dynamic slope flag naming convention. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-19 20:30:13 +02:00
Nev3r	5401e9560f	Dynamic slopes now use thinkers. ... * Moved dynamic slope-related data into its own thinker. * Vertex slopes no longer use the mapthings directly. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-19 14:14:43 +02:00
Nev3r	f7d1515888	Perform dynamic slope thinking before other thinkers. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-18 14:43:34 +02:00
Monster Iestyn	3203dc5d4b	Remove old code altogether at Nev3r's request	2019-04-17 16:46:32 +01:00
Monster Iestyn	6bddd131da	Undefine toaster's old define to flip full-brightness default status for planes	2019-04-17 14:51:48 +01:00
Steel Titanium	26fdee8217	Don't enable UPnP support if NONET is defined.	2019-04-16 15:05:09 -04:00
James R	36e678b292	Don't count down wait timer when executing a command	2019-04-14 15:17:47 -07:00
Monster Iestyn	797ca99f42	Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a. ... (Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)	2019-04-14 16:39:14 +01:00
Monster Iestyn	8a2f8a441b	Merge branch 'master' into opengl-new-patch-features-support	2019-04-11 20:09:57 +01:00
Monster Iestyn	212be85655	added "checkmobjs" boolean to both Polyobj_moveXY and Polyobj_rotate, so we can disable interaction with mobjs for netgames	2019-04-05 12:03:03 +01:00
Nev3r	1d401d8481	Merge branch '144-scrolltweaks' into 'master' ... Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0" Closes #144 See merge request STJr/SRB2Internal!213	2019-04-05 06:41:11 -04:00
Nev3r	fec991dedb	Implement displacement-based polyobject rotation. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-04-05 11:50:59 +02:00
Monster Iestyn	07a66e5355	Merge branch 'public_next'	2019-04-02 15:49:15 +01:00
Monster Iestyn	ab0fe6b164	Merge branch 'master' into next	2019-04-02 15:47:07 +01:00
James R	42d25f67ca	Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes	2019-03-31 12:29:55 -07:00
Monster Iestyn	27147a9e0b	fix slipup of mine that would have prevented this thing compiling	2019-03-31 14:11:27 +01:00
Monster Iestyn	7ae6d5ee8c	Merge branch 'public_next' ... # Conflicts: # src/doomstat.h # src/g_game.c	2019-03-28 14:19:02 +00:00
James R	917edf720d	Don't close console when starting title screen	2019-03-26 13:05:19 -07:00
James R	9a350eb879	Don't close console when changing map	2019-03-26 13:04:11 -07:00
James R	69d7e98f34	Remove redundant CON_ClearHUD calls	2019-03-26 12:59:13 -07:00
James R	e8071e66e4	Resize console upon resolution change ... Basically, changing to a lower resolution won't cause your console to extend past the screen anymore.	2019-03-26 12:30:02 -07:00
jameds	b9b36a44a8	Keep color across wrapped lines ... And this works by inserting the same color code on each wrapped line.	2019-03-26 12:07:11 -07:00
jameds	587586f4bb	Scroll console immediately upon pressing PageUp	2019-03-26 12:05:23 -07:00
Monster Iestyn	a01a0a3dc3	Merge branch 'master' into next	2019-03-26 13:46:15 +00:00
Monster Iestyn	9ef98471a4	Merge branch 'buildbot' into 'master' ... Buildbot changes See merge request STJr/SRB2!477	2019-03-26 09:44:56 -04:00
Monster Iestyn	8e78369f83	Merge branch 'dedicated-server-credits-fix' into 'master' ... Dedicated server credits fix See merge request STJr/SRB2!476	2019-03-26 09:44:21 -04:00
Monster Iestyn	67874180b2	Merge branch 'gametype-strings-backport' into 'next' ... Gametype strings backport See merge request STJr/SRB2!473	2019-03-26 09:42:52 -04:00
James R	d00cc7cddb	Prevent just anyone from skipping credits but allow admins ... exitlevel works too	2019-03-25 16:19:40 -07:00
Monster Iestyn	8c1c0875a2	Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way	2019-03-25 21:35:04 +00:00
Alam Ed Arias	fe22fdc5a3	P_SuperDamage() is too big for inlining	2019-03-25 15:30:25 -04:00
Monster Iestyn	147221cf6e	R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.	2019-03-25 18:54:47 +00:00
Monster Iestyn	7441dd7d9b	Merge branch 'master' into next	2019-03-25 18:08:36 +00:00
James R	ed0f8fd967	Actually allow connecting to "localhost" ... Because IPv6 doesn't seem to work anyway.	2019-03-20 20:37:00 -07:00
James R	f139ffd1dc	Let localhost connections	2019-03-20 20:37:00 -07:00
Monster Iestyn	ecb6322a52	Merge branch 'sdl-noxinput-nohidapi' into 'master' ... -noxinput and -nohidapi command line parameters. See merge request STJr/SRB2!468	2019-03-20 17:33:04 -04:00
Monster Iestyn	2fb569857a	Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa ... gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names # Conflicts: # src/doomstat.h # src/m_menu.c	2019-03-18 22:00:23 +00:00
Nev3r	aa43f8b3bf	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks	2019-03-16 08:14:29 +01:00
Steel Titanium	6d751ff302	Remove the define.	2019-03-15 18:46:25 -04:00
mazmazz	8317155c40	Merge branch 'public-gl-next' into public-musicplus-jingle	2019-03-15 18:42:19 -04:00
Steel Titanium	5a170b9e4e	Merge branch 'master' into errorifpng	2019-03-15 16:40:47 -04:00
Steel Titanium	67a80ba311	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command	2019-03-15 16:13:31 -04:00
Jimita	6e4b42fc97	Merge branch 'next' into flashpals-on-screenshots	2019-03-15 16:38:33 -03:00
mazmazz	f18103a473	Declare exitfadestarted properly	2019-03-15 11:01:41 -04:00
mazmazz	ad50fa4d9e	Fix MIDI crash bug when changing music between levels ... This happened when the old music was ERZ2 native midi, then warping to any other level.	2019-03-15 10:02:50 -04:00
mazmazz	7346684bd8	Fade out music upon dying or level change: 2.1 frontport	2019-03-15 04:21:17 -04:00
mazmazz	587a51a957	Fix end-of-level fading for cv_playersforexit ... (Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)	2019-03-15 03:47:30 -04:00
mazmazz	8afaaa80a1	lclear -> _clear typo	2019-03-15 03:15:20 -04:00
mazmazz	a1ccb8512d	Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel	2019-03-15 02:07:53 -04:00
mazmazz	f163633591	Merge branch 'public_next'	2019-03-15 01:43:03 -04:00
mazmazz	6b93ca9221	Intermission: Don't fade out level music when using win32 midi volume hack	2019-03-15 01:26:13 -04:00
mazmazz	e098d6a8b8	Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel	2019-03-15 01:09:12 -04:00
mazmazz	6cf05a4613	Implement MUSICINTERFADEOUT level header	2019-03-15 01:05:52 -04:00
mazmazz	ba77dfd546	Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel	2019-03-15 01:01:24 -04:00
mazmazz	b5fc27c545	Implement MUSICINTERFADEOUT level header	2019-03-15 01:00:50 -04:00
mazmazz	773f9dc2ba	Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel	2019-03-15 00:39:26 -04:00
mazmazz	9064a0b33a	Merge remote-tracking branch 'origin/master'	2019-03-15 00:33:12 -04:00
mazmazz	4377386153	Merge branch 'public_next'	2019-03-15 00:33:06 -04:00
mazmazz	bd9e42ce6e	Merge branch 'public-gl-next' into public-musicplus-inter	2019-03-14 23:42:16 -04:00
mazmazz	3b6be9b419	Remove redundant music reset block for MIXNIGHTSCOUNTDOWN	2019-03-14 23:21:52 -04:00
mazmazz	469ed9cbe3	Implement MIXNIGHTSCOUNTDOWN ... An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.	2019-03-14 23:10:14 -04:00
mazmazz	9ec98c588f	Merge branch 'public_next'	2019-03-14 22:15:34 -04:00
mazmazz	fdde5f13c5	When resetting volume on same music, make it fade instead of a hard change	2019-03-13 23:55:30 -04:00
mazmazz	67e2857303	When changing to same music, reset the internal volume	2019-03-13 23:41:35 -04:00
mazmazz	c021e29835	Restore MUSIC_RELOADRESET if block in g_game	2019-03-13 21:18:23 -04:00
mazmazz	2c75d4da69	Fix custom fade source bug for Change Music linedef	2019-03-13 19:53:16 -04:00
mazmazz	aea18f36ba	Remove MP3 warning	2019-03-13 19:51:45 -04:00
mazmazz	93626c2293	Merge remote-tracking branch 'public-gl/next' into public-musicplus-core	2019-03-13 19:45:07 -04:00
Nev3r	ae9f8856ac	Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-03-13 12:24:47 +01:00
Nev3r	cd3ea897c3	Dealt with no-tag business: ... * Wind/current pushers affect front sector if left untagged. * Plane scrollers affect front sector if left untagged. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-03-13 11:13:54 +01:00
Alam Ed Arias	08784ce58d	Merge branch 'master' into next	2019-03-09 20:37:17 -05:00
Alam Ed Arias	60ca6ae06b	TravisCI: add option for GCC 8.1	2019-03-09 19:41:56 -05:00
Nev3r	83f953edb8	Make FOFs extend to infinity when in contact with a horizon line. ... Make FOFs extend to infinity when in contact with a horizon line. Signed-off-by: Nev3r <apophycens@gmail.com>	2019-03-07 19:01:02 +01:00
Jimita the Cat	0186f6784b	a	2019-03-06 21:40:38 -03:00
Alam Ed Arias	747995ae6a	Merge branch 'master' into next	2019-03-04 17:15:04 -05:00
Alam Ed Arias	67e246cd53	No more errors for VC6 support	2019-03-04 16:46:14 -05:00
Alam Ed Arias	145ccfd405	no more floating constants warnings, and disable bad array bounds warnings	2019-03-04 16:46:14 -05:00
Steel Titanium	9542a47f7f	New -noxinput and -nohidapi command line parameters.	2019-03-03 22:57:09 -05:00
Steel Titanium	15323328c5	Check using memcmp()	2019-03-03 22:43:21 -05:00
Steel Titanium	34645238d4	Fix MF_NOCLIPTHING	2019-03-03 20:08:11 -05:00
Steel Titanium	3d5d02fc15	Error if the lump is a PNG lump	2019-03-03 19:58:01 -05:00
Monster Iestyn	a93e96c75b	Merge branch 'public_next' ... # Conflicts: # src/sdl12/Srb2SDL-vc10.vcxproj # src/sdl12/Srb2SDL-vc9.vcproj # src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj	2019-03-02 20:51:15 +00:00
Alam Ed Arias	c2618fd987	Merge branch 'master' into next	2019-03-01 17:32:17 -05:00
Alam Ed Arias	f823768699	Fix building without BLUA support	2019-03-01 17:31:32 -05:00
Monster Iestyn	008b0bf560	Merge branch 'master' into next	2019-03-01 16:23:51 +00:00
Monster Iestyn	67e721e983	Merge branch 'need-more-time' into 'master' ... Stop Linux servers from hanging every 34 hours See merge request STJr/SRB2!465	2019-03-01 11:22:32 -05:00
Monster Iestyn	4459ecdd90	Merge branch 'master' into next	2019-03-01 16:05:49 +00:00
wolfy852	97de2ae4f6	Stop Linux servers from hanging every 34 hours	2019-03-01 00:07:58 -06:00
Monster Iestyn	8920693159	Saving work made so far improving and optimizing addons menu code, also adding some macros and comments for readability	2019-02-28 21:52:01 +00:00
Alam Ed Arias	7cd60a544a	Merge branch 'apng-oh-shit-fixes' into 'master' ... Compiling errors for apng fixed See merge request KartKrew/Kart-Public!69	2019-02-28 12:00:58 -08:00
wolfs	5620d0188e	Merge branch 'apng' into 'master' ... Support aPNG in new versions of libpng See merge request KartKrew/Kart-Public!63	2019-02-28 12:00:58 -08:00
Monster Iestyn	ae244d2af3	Fix goofup with addonsp patch unlock for loop from 2.1.13 merge	2019-02-28 15:48:27 +00:00
Monster Iestyn	7a0d8b408e	Merge branch 'public_next' ... # Conflicts: # src/d_main.c # src/dehacked.c # src/m_menu.c # src/m_menu.h	2019-02-27 22:36:01 +00:00
Steel Titanium	fa990e8603	Remove double define	2019-02-27 16:05:43 -05:00
Steel Titanium	e71977fe6a	Merge branch 'next' into banip-command	2019-02-27 16:03:01 -05:00
Steel Titanium	15b27bb7d7	Upped MAXNETNODES	2019-02-27 15:59:50 -05:00
Monster Iestyn	0340eb0b99	Merge branch 'master' into next	2019-02-27 20:35:07 +00:00
Monster Iestyn	d76e946b3e	Merge branch 'sdl-new-windowicon' into 'master' ... SDL:Update XPM icon See merge request STJr/SRB2!441	2019-02-27 13:34:24 -05:00
Monster Iestyn	a25f4b8194	Make sure that B_CheckRespawn can be called even if Tails is dead	2019-02-26 21:14:22 +00:00
Alam Ed Arias	e36193e44e	Merge branch 'hide-error-devmode' into 'next' ... Show line number on error, also hide under devmode See merge request STJr/SRB2!458	2019-02-21 23:05:09 -05:00
Alam Ed Arias	2f8eadd211	Merge branch 'master' into next	2019-02-21 22:42:26 -05:00
Steel Titanium	bfbb83df23	Save when quitting the game. ... Also use default reason if not custom reason is given.	2019-02-21 19:48:15 -05:00
Steel Titanium	bf2f6ebc09	Save ban list right after banning.	2019-02-21 19:47:00 -05:00
Steel Titanium	c9d90f7688	Add command to ban an IP address.	2019-02-21 19:44:18 -05:00
Steel Titanium	c1deea0714	Disable multi statement macros errors.	2019-02-21 18:48:42 -05:00
Monster Iestyn	cb986bf1c0	added support for both horizontal and vertical flipping (not sure if complete or not atm, but I've done enough for tonight I think)	2019-02-13 22:40:48 +00:00
Monster Iestyn	7321df8015	some more mucking about with function arguments (preparing for alpha/flip support adding particularly), also fixed a slipup I made when I first made HWR_DrawColumnInCache	2019-02-13 20:56:59 +00:00
Monster Iestyn	d2c6b995d3	split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else	2019-02-13 20:12:10 +00:00
Monster Iestyn	497e79d1de	Turns out the consts ARE needed after all, also fix some other errors the compiler reported	2019-02-13 18:20:26 +00:00
Monster Iestyn	55e3e99a94	Merge branch 'master' into opengl-new-patch-features-support	2019-02-13 18:08:17 +00:00
Monster Iestyn	8f667906eb	Fix compiler warnings	2019-02-13 18:06:56 +00:00
Monster Iestyn	ff2ebf20fb	blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache	2019-02-13 17:27:20 +00:00
Monster Iestyn	efa042a995	whoops, removed some variables I shouldn't have, so I've added them back	2019-02-13 16:52:51 +00:00
Monster Iestyn	30a00c812c	Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully. ... I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though. (Note: I have not tested if this compiles yet)	2019-02-13 16:39:37 +00:00
Steel Titanium	76724c9c13	Show line number on error, also hide under devmode	2019-02-11 16:39:58 -05:00
Monster Iestyn	e6cb47e2f2	Merge branch 'fix_skins_overflow' into 'next' ... Fix skin overflow error See merge request STJr/SRB2!455	2019-02-11 15:05:00 -05:00
MascaraSnake	5eb089cc14	Forgot the continue statements	2019-02-03 17:07:13 +01:00
MascaraSnake	00cad05550	Emblem number in emblem definition is optional. If none is supplied, place in first free slot.	2019-02-03 17:03:33 +01:00
MascaraSnake	bc30bd06df	In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC	2019-02-03 14:32:07 +01:00
MascaraSnake	8c345b87ca	Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD	2019-02-03 11:05:22 +01:00
MascaraSnake	0dd8779b91	Hardcoded emblems of the first four special stages	2019-01-30 23:01:58 +01:00
MascaraSnake	88a6dbae9b	Spring Hill -> Christmas Chime	2019-01-29 22:26:15 +01:00
MascaraSnake	f6dd521fd0	Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ	2019-01-28 21:28:38 +01:00
Steel Titanium	0aa965c59f	How did I forget about this	2019-01-26 23:22:30 -05:00
Steel Titanium	bce093fd06	Setup the tables even eariler. ... I really hate that PlayerMenu status hack, but that's really the only way I could think off to show the entires for Tails, Knuckles and the Sonic&Tails pair.	2019-01-26 23:16:49 -05:00
Steel Titanium	74bf3164f8	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia	2019-01-26 00:51:39 -05:00
TehRealSalt	0d1c501664	Update the SP menu stuff to use MAXSKINS ... Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>	2019-01-26 00:22:05 -05:00
Alam Ed Arias	74850fea17	Merge branch 'master' into next	2019-01-20 17:01:01 -05:00
Sryder	b18a8dbc8d	Disable the APNG code if the version of libpng is greater than 1.4. ... Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have. It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people. I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.	2019-01-20 18:50:28 +00:00
james	356249dade	Set modifiers in a non-reactive manner	2019-01-17 16:47:01 -08:00
Jimita	424b2b1aaf	Merge branch 'next' into flashpals-on-screenshots	2019-01-16 05:59:05 -02:00
Steel Titanium	fad341b0e9	Fix skins overflow	2019-01-15 14:29:43 -05:00
fickleheart	7e026824a4	Fix rendering gaps on polys with upper/lower textures	2019-01-12 20:15:58 -05:00
Monster Iestyn	f3796dc7f6	revert to LF_SAVEGAME system code, removing all traces of saveoverride ... (I believe Sal wanted us to do this anyway, so...)	2019-01-08 17:14:21 +00:00
Digiku	d05caf5963	Update hw_md2.c -- add comment about anglef player->frameangle from Kart	2019-01-08 11:26:39 -05:00
mazmazz	a050ed956a	Fixed Addons Menu icons for search bar	2019-01-08 01:31:44 -05:00
mazmazz	47bd042a7e	Misssed alwaysfreelook defaults (first person)	2019-01-08 01:29:12 -05:00
mazmazz	d5de5e9f49	Fix player.dta SIGNA0 overwriting regular end sign frame	2019-01-08 00:19:42 -05:00
mazmazz	e02fd489a7	GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)	2019-01-07 23:06:47 -05:00
mazmazz	8ea8bf2587	Chat arrow offsets	2019-01-07 22:34:48 -05:00
mazmazz	5066e340f4	Update SRB2-CHAT nickname colors to 2.2 skincolors	2019-01-07 22:26:39 -05:00
mazmazz	e403d1bacc	Correct addons menu back color	2019-01-07 21:58:42 -05:00
mazmazz	dfc427e81a	Dummy out SRB2-CHAT console colors ... Pending translation to 2.2 palette indexes	2019-01-07 21:54:38 -05:00
mazmazz	411b1b4f54	Addons menu merge fixes	2019-01-07 21:45:41 -05:00
mazmazz	a775a63dfd	WIP hu_stuff merge fixes	2019-01-07 17:56:55 -05:00
mazmazz	875aee60a0	Menu merge fixes	2019-01-07 17:56:43 -05:00
mazmazz	b3f7b169b2	Merge errors for compile	2019-01-07 17:05:20 -05:00
Digiku	4f0be1b064	Update f_finale.c - Small credits update	2019-01-07 16:50:59 -05:00
mazmazz	7aa55f24f5	Resolve r_data.c colormap conflict	2019-01-07 15:29:37 -05:00
Nev3r	7d09149b04	Solved conflicts related to PK3s ... Signed-off-by: Nev3r <apophycens@gmail.com>	2019-01-07 19:00:31 +01:00
Monster Iestyn	9effa134d2	resolve the conflict in p_spec.c	2019-01-07 17:02:05 +00:00
Monster Iestyn	96ad8dd81a	resolve conflict in r_main.c	2019-01-07 16:52:46 +00:00
mazmazz	66e6a6f940	Merge remote-tracking branch 'public-gl/master' into md3-vanilla	2019-01-07 04:06:45 -05:00
Digiku	1c1331199d	Update f_finale.c - Remove Torgo's real name by request	2019-01-07 03:41:25 -05:00
mazmazz	015e7b9862	Resolve p_setup and d_netcmd conflicts (20190101 public merge)	2019-01-07 03:07:24 -05:00
mazmazz	e18eb69a0b	Resolved filesrch.c conflicts (20190101 public merge)	2019-01-07 02:54:26 -05:00
mazmazz	e9150b6645	Resolve m_menu.c conflicts (20190101 public merge)	2019-01-07 02:31:45 -05:00
mazmazz	24e37a23a5	Merge branch 'musicplus-core' into musicplus-feature-postboss	2019-01-07 01:17:07 -05:00
mazmazz	36f802eb15	Merge remote-tracking branch 'origin/master' into musicplus-core	2019-01-07 01:15:08 -05:00
mazmazz	1e702443e3	Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss	2019-01-07 01:10:54 -05:00
Steel Titanium	7d1e59d4ba	Some few changes	2019-01-05 23:42:25 -05:00
mazmazz	578a4fe80d	Merge remote-tracking branch 'public-gl/master' into travis-deployer	2019-01-05 09:08:34 -05:00
Marco Z	882355d24b	Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC	2019-01-04 21:18:55 -05:00
Marco Z	09ed8bd046	Add LibGME to DD vc10 project	2019-01-04 20:43:45 -05:00
Marco Z	88c4a54cea	Add GME to VC10 SRB2SDL project	2019-01-04 20:43:42 -05:00
Digiku	d5870e6f8a	Merge branch 'changecontrol-text-overflow-fix' into 'master' ... Resolve buffer overflow crash when configuring System Menu and GIF controls See merge request STJr/SRB2!445	2019-01-04 19:39:17 -05:00
Digiku	c97dc5d3c4	Increase M_ChangecontrolResponse message buffer by 25 chars	2019-01-04 19:38:36 -05:00
mazmazz	87c015e340	MUS_MODPLUG fix	2019-01-04 18:39:09 -05:00
mazmazz	a3fd5e7247	Revert "Un-dummy md5 checks" ... This reverts commit 908a6d321d.	2019-01-04 11:31:20 -05:00
mazmazz	69965b8d98	Flip HAVE_OPENMPT on by default for non-Windows makefile	2019-01-04 01:48:04 -05:00
mazmazz	1bfc4c02e4	CMake fixes for OpenMPT	2019-01-03 21:17:18 -05:00
mazmazz	4a17e9ed9b	Remove dynamic openmpt loading	2019-01-03 20:52:09 -05:00
Marco Z	caab60e9f0	Fix MSVC compile errors	2019-01-03 20:34:10 -05:00
Marco Z	6d2ef74b21	Add libopenmpt to VC10 project	2019-01-03 20:28:00 -05:00
mazmazz	d1534257dd	Add mingw-compiled libopenmpt 0.4.0 DLLs	2019-01-03 16:07:32 -05:00
mazmazz	bbcc82e9b4	Fix blinking MD2 models ... MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.	2019-01-03 00:57:14 -05:00
mazmazz	908a6d321d	Un-dummy md5 checks	2019-01-02 23:31:29 -05:00
mazmazz	2e4c139551	DD Compile fixes	2019-01-02 06:48:06 -05:00
mazmazz	2bd794c006	Remove S_MusicExists lua	2019-01-02 06:26:18 -05:00
Steel Titanium	827461cc36	Support for per-map intermission music	2019-01-02 05:15:23 -05:00
mazmazz	dd856a8c89	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 05:06:09 -05:00
mazmazz	e2e345988a	Add safe lua music functions ... S_MusicExists S_SetInternalMusicVolume S_StopFadingMusic S_FadeMusic S_FadeOutStopMusic	2019-01-02 04:58:03 -05:00
mazmazz	c8d338ca35	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 04:02:13 -05:00
mazmazz	1aacfee80c	Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core	2019-01-02 03:47:51 -05:00
mazmazz	a851c5d7da	Add libopenmpt to cmake	2019-01-02 03:45:40 -05:00
mazmazz	08812b1501	Revised MinGW Makefile logic for OpenMPT	2019-01-02 02:37:48 -05:00
mazmazz	953f5b6297	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 02:15:29 -05:00
mazmazz	109dd70a53	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-02 02:15:16 -05:00
mazmazz	6166fad045	Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt	2019-01-02 02:14:49 -05:00
mazmazz	075f28b7c8	WIP 20190101 merge ... d_netcmd.c filesrch.c m_menu.c p_setup.c p_spec.c r_data.c r_main.c r_things.c w_wad.c w_wad.h	2019-01-02 01:09:15 -05:00
Jimita the Cat	c3d69a8a04	Merge branch 'flashpals-on-screenshots' of https://github.com/monster-psychic-cat/SRB2 into flashpals-on-screenshots	2019-01-02 01:02:14 -03:00
Jimita the Cat	892e650712	dumb	2019-01-02 01:01:57 -03:00
Alam Ed Arias	819e4ef2ae	Merge branch 'master' into next	2019-01-01 23:00:39 -05:00
Jimita	8fdff96733	Merge branch 'next' into flashpals-on-screenshots	2019-01-02 01:55:59 -02:00
Jimita the Cat	e765b9400c	Add support for flashpals in screenshots	2019-01-02 00:41:52 -03:00
Digiku	393c64b8bc	Merge branch 'expanded-nmuslist' into 'next' ... Expand NMUSList to include HUD changes See merge request STJr/SRB2!388	2019-01-01 15:06:04 -05:00
Digiku	5278d1ca20	Merge branch 'caps-lock-consistency-fix' into 'master' ... Update capslock state on window re-focus See merge request STJr/SRB2!436	2019-01-01 15:05:20 -05:00
Digiku	bbd878e520	Merge branch 'mingw-64bit-cpu-target-revise' into 'master' ... MinGW64:Target nocona for 64-bit builds [revision] See merge request STJr/SRB2!440	2019-01-01 11:15:34 -05:00
mazmazz	7916e020d2	Fix loop_point and song_length floating point comparisons	2019-01-01 10:47:16 -05:00
mazmazz	b7bb570f97	Merge remote-tracking branch 'public-gl/master' into public-musicplus-core	2019-01-01 10:41:40 -05:00
mazmazz	d61eb7edee	Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config	2018-12-31 01:43:47 -05:00
mazmazz	78fa72514f	Implement deployer scripts for Travis -- OSX and Linux package building	2018-12-30 15:22:50 -05:00
Steel Titanium	0ebe5b258c	Inclue PNG file	2018-12-29 23:10:45 -05:00
Steel Titanium	a7b96ab83d	Update XPM icon	2018-12-29 22:52:04 -05:00
mazmazz	3d2e58861d	Rename M5 to ARCHOPTS; allow override by command line	2018-12-29 21:55:35 -05:00
mazmazz	4cfacf5cde	Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile	2018-12-29 21:14:50 -05:00
mazmazz	1a4f1e54f3	Merge branch 'timedemo-revise' into md3-vanilla	2018-12-29 12:09:32 -05:00
mazmazz	b3908755af	Add CSV functionality to timedemo ... * Append timedemo trials to timedemo.csv * Specify -csv <trialid> to toggle CSV behavior * Specify -quit to immediately quit after timedemo * Add ticrate, rendermode, video mode, demo name, bits to CSV timedemo row	2018-12-29 04:51:00 -05:00
mazmazz	56892c13ab	Add framecount to timedemo message	2018-12-28 22:59:54 -05:00
Digiku	80e30c6aaa	Merge branch 'MSVC-ARM' into 'master' ... ARM and ARM64 support with MSVC toolchain See merge request STJr/SRB2!412	2018-12-28 01:05:40 -05:00
mazmazz	89c12a4ee8	Reset timedemo counters after wipe	2018-12-27 23:23:09 -05:00
mazmazz	1d9b8d357b	Add framecount increment to HWR_RenderPlayerView ... Analogue to R_RenderPlayerView; used for timedemo FPS reading	2018-12-27 23:05:06 -05:00
mazmazz	34915f0508	Compile fix -- remove (void)alpha from DoScreenWipe	2018-12-27 22:29:12 -05:00
Arthur	4f1f315563	Eliminate some old GL functions so we don't slide back into bad habits!	2018-12-27 22:10:10 -05:00
Arthur	b83790260f	Fix screen transitions	2018-12-27 22:09:00 -05:00
Steel Titanium	d048e7cbec	Don't set if LINUX64 is defined	2018-12-27 21:17:02 -05:00
Steel Titanium	5ba0863876	Stupid restrictions	2018-12-27 19:00:18 -05:00
Steel Titanium	4a05fd5f26	More explict check	2018-12-27 18:54:10 -05:00
mazmazz	f7a01c60a4	Buildbot fixes	2018-12-27 01:00:09 -05:00
Steel Titanium	6dddf61265	Target nocona for 64-bit builds	2018-12-27 00:56:33 -05:00
mazmazz	f6e8b26af1	Compile fixes -- specify GLubyte for pglColor4ubv	2018-12-27 00:50:43 -05:00
Arthur	587ffa9ada	Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation ... No longer using byte2float in DrawPolygon -- use the surface color data directly Vertex Buffer Objects for non-interpolated model frames Removed some old unused paletted texture stuff	2018-12-27 00:35:29 -05:00
Arthur	a812acc3d4	Removed unused PF_Md2 flag ... More OpenGL performance increase by making assumptions about client state	2018-12-27 00:30:07 -05:00
Arthur	0978732ecd	boolean fix for VS ... add GL_NORMALIZE	2018-12-27 00:24:21 -05:00
mazmazz	8c3e6642a7	Ignored fread fix	2018-12-27 00:01:51 -05:00
mazmazz	5ec40cf906	More mixed d&c fixes	2018-12-26 23:50:35 -05:00
mazmazz	52f668e9b0	byte -> char	2018-12-26 23:40:29 -05:00
mazmazz	036e44aa21	Mixed D&C fixes	2018-12-26 23:39:34 -05:00
mazmazz	b175629748	Fix floating point comparisons	2018-12-26 23:15:28 -05:00
mazmazz	74d6921f47	Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn	2018-12-26 22:55:25 -05:00
james	0b857f127f	Update capslock state on window re-focus	2018-12-26 15:49:57 -08:00
Digiku	da9447342c	Merge branch '2123-version' into 'master' ... Update code versions to 2.1.23 See merge request STJr/SRB2!435	2018-12-26 17:14:58 -05:00
Digiku	ebb4c65d92	Merge branch 'srb2-chat-nonet' into 'master' ... Hide SRB2-CHAT behind #ifndef NONET See merge request STJr/SRB2!434	2018-12-26 17:13:23 -05:00
mazmazz	60bdc056f8	Also hide Chat Options if NONET	2018-12-26 16:41:39 -05:00
mazmazz	894c139bf1	Update code versions to 2.1.23	2018-12-26 16:31:43 -05:00
mazmazz	814db7e371	Hide SRB2-CHAT behind #ifndef NONET	2018-12-26 16:20:17 -05:00
Steel Titanium	4f18ec60bc	Fix saving progress on vanilia	2018-12-26 15:47:12 -05:00
mazmazz	fa6f791ec3	Fix -ANGLE_180 because MSVC complains ... -ANGLE_180 evaluates equal to ANGLE_180.	2018-12-25 01:14:05 -05:00
mazmazz	73a67fc9f5	Merge branch 'ctf-enemy-flag-sound' into 2122-version	2018-12-25 00:27:08 -05:00
mazmazz	842bcfc8a0	Merge remote-tracking branch 'public-gl/master' into 2122-version	2018-12-25 00:19:45 -05:00
mazmazz	a626660564	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-25 00:19:42 -05:00
mazmazz	0b81debf94	Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix	2018-12-25 00:09:24 -05:00
mazmazz	82a40f0dba	Support Look Up/Down keys for NiGHTS movement	2018-12-24 23:48:03 -05:00
mazmazz	b7edc7f870	Revert "Merge branch 'side-discolor-fix' into 'master'" ... This reverts commit e721a3d882, reversing changes made to 4656a0d02c.	2018-12-24 20:58:26 -05:00
mazmazz	bfc501a271	Revert default console backcolor to green; changed from CHAT commit	2018-12-24 20:57:11 -05:00
Digiku	cb42702e6b	Merge branch 'float-compare-colormap-fix' into 'master' ... Fix float comparison for colormap maskamt See merge request STJr/SRB2!428	2018-12-24 20:55:06 -05:00
mazmazz	10a3e3fec9	Define EPSILONs only if not already defined ... Fixes OSX buildbot	2018-12-24 20:36:28 -05:00
mazmazz	c65f44e805	Remove log message	2018-12-24 20:33:59 -05:00
mazmazz	e9e5128754	Use DBL_EPSILON for colormap comparison	2018-12-24 20:22:10 -05:00
Alam Ed Arias	4651eddc36	Merge branch 'master' into next	2018-12-24 20:15:45 -05:00
mazmazz	58728ec358	Fix float comparison for colormap maskamt	2018-12-24 19:58:05 -05:00
mazmazz	32697ddf61	Fix gcc 8 compile by using strcpy instead of memcpy for PM	2018-12-24 18:51:11 -05:00
mazmazz	7fc79f0b88	Merge remote-tracking branch 'public-gl/master' into 2122-version	2018-12-24 17:31:03 -05:00
mazmazz	c2dc5788bf	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-24 17:30:59 -05:00
Jimita	4c6334f459	cleanup	2018-12-24 17:21:33 -05:00
Digiku	f06fd4149d	Merge branch 'polyobject-crush-fix-waypoint' into 'next' ... Polyobject crush fix by waypoints [by TehRealSalt] See merge request STJr/SRB2!426	2018-12-24 17:01:06 -05:00
Alam Ed Arias	c8f4d125b4	Merge branch 'master' into next	2018-12-24 16:56:29 -05:00
Digiku	be9a04e489	Merge branch 'disablespeedadjust-fix' into 'next' ... Disablespeedadjust fix See merge request STJr/SRB2!425	2018-12-24 16:31:19 -05:00
TehRealSalt	878b1b2d16	Fix move by waypoints not checking for sector changes ... It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked. If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.	2018-12-24 14:39:07 -05:00
Monster Iestyn	31c6b6ef77	remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway	2018-12-24 19:37:52 +00:00
Monster Iestyn	936b9ecebc	Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean	2018-12-24 19:29:54 +00:00
Monster Iestyn	01588ea967	Fix bot players using the respawning code meant only for real players to use	2018-12-24 17:59:12 +00:00
Nev3r	caaacf3f76	Fixed the shield spawn/special hook cases on the hook add switch. ... They basically work now. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-12-24 17:31:00 +01:00
Digiku	47a810decb	Merge branch 'EOL' into 'master' ... fix EOL on src/p_enemy.c See merge request STJr/SRB2Internal!208	2018-12-24 01:33:03 -05:00
mazmazz	e708f750a0	Remove inline from ST_drawWeaponSelect() to fix 32-bit compile ... large-function-growth limit reached	2018-12-24 01:26:22 -05:00
mazmazz	ac9cb59de9	Do not increment mainwads for music.dta	2018-12-23 23:54:26 -05:00