6409 commits

Author	SHA1	Message	Date
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
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
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
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	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
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
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	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	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
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
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
Steel Titanium	6dddf61265	Target nocona for 64-bit builds	2018-12-27 00:56:33 -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
mazmazz	9d1bc3063f	Play flag-returned SFX for the opposing team	2018-12-23 22:57:14 -05:00
Steel Titanium	cb13ace77e	Merge branch 'master' into sdl-autograb	2018-12-23 22:35:44 -05:00
mazmazz	ed410575d6	Only SetWindowGrab if !disable_mouse; toggle cursor visibility	2018-12-23 22:09:16 -05:00
Steel Titanium	46d1a866d8	Another attempt to lock the mouse	2018-12-23 18:54:15 -05:00
mazmazz	cb01ebebed	Merge remote-tracking branch 'public-gl/2122-version' into 2122-version	2018-12-23 18:09:54 -05:00
mazmazz	83a6f5d6ae	Merge remote-tracking branch 'public-gl/master' into 2122-version	2018-12-23 18:09:17 -05:00
mazmazz	c0a0c5ac5d	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-23 18:09:14 -05:00
Digiku	d72e3fe71c	Merge branch '2122-patch-dta-update' into '2122-version' ... Changes related to 2.1.22 patch.dta update See merge request STJr/SRB2!417	2018-12-23 18:08:38 -05:00
Digiku	8d56c2f486	Merge branch 'addons-backport' into '2122-version' ... Addons Menu backport to vanilla See merge request STJr/SRB2!384	2018-12-23 18:08:06 -05:00
Digiku	fa36b8f5a2	Merge branch 'menu-mpjoy-fix' into '2122-version' ... Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version] See merge request STJr/SRB2!420	2018-12-23 18:06:27 -05:00
mazmazz	2b8cdc0381	Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" ... This reverts commit c0c05043e6.	2018-12-23 18:04:01 -05:00
mazmazz	c0c05043e6	Revert "Merge branch 'menu-mpjoy-fix' into 'next'" ... This reverts commit b5d4bb3530, reversing changes made to 2d675750cf.	2018-12-23 17:57:50 -05:00
Digiku	b5d4bb3530	Merge branch 'menu-mpjoy-fix' into 'next' ... Menu: Fix joystick events causing the player to move during multiplayer system menu See merge request STJr/SRB2!414	2018-12-23 17:55:02 -05:00
Digiku	7a64e3d1a8	Merge branch 'SRB2-CHAT' into '2122-version' ... Chat and other multiplayer quality of life improvements. See merge request STJr/SRB2!398	2018-12-23 17:53:54 -05:00
Digiku	402860dc06	Merge branch 'loadconfig-defaultcontrols' into 'master' ... Reset default controls for LOADCONFIG command See merge request STJr/SRB2!403	2018-12-23 17:14:34 -05:00
Latapostrophe	b7d7472a88	Merge branch 'next' into SRB2-CHAT	2018-12-23 22:53:24 +01:00
Monster Iestyn	2d675750cf	fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c	2018-12-23 21:52:49 +00:00
mazmazz	f55623ef9c	Clear all control keys before loading defaults in LoadConfig	2018-12-23 14:59:26 -05:00
Steel Titanium	40a037f603	A more through out attempt to lock the mouse	2018-12-23 14:54:14 -05:00
mazmazz	f600c5fee0	Credits update	2018-12-23 14:41:41 -05:00
mazmazz	8f596376a9	Merge branch '2122-version' into execversion-filtercontrols	2018-12-23 14:30:24 -05:00
mazmazz	3277cf6976	Add JOY10 default to gc_centerview	2018-12-23 14:29:54 -05:00
mazmazz	dd4c7b539f	Fix joy button default override when filling keynum2 with default	2018-12-23 14:29:10 -05:00
Latapostrophe	db8e1c0393	Fix the chat being displayed in singleplayer if there are stillmessages	2018-12-23 10:50:36 +01:00
Latapostrophe	11f44f7ce9	Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT	2018-12-23 10:30:37 +01:00
Latapostrophe	1b61e15b1b	Merge branch 'master' into SRB2-CHAT	2018-12-23 10:26:08 +01:00
mazmazz	3703a032f0	Buildbot fixes	2018-12-23 03:39:27 -05:00
mazmazz	7fb73cf2da	New patch.dta hash for 2.1.22	2018-12-23 03:22:32 -05:00
mazmazz	aa77038dfc	Add chat_on to non-key move event checks	2018-12-23 03:21:32 -05:00
mazmazz	6ebc41a554	Check target < MAXPLAYERS before PM	2018-12-23 02:25:58 -05:00
mazmazz	ec53032310	Fix mainwads check in d_main	2018-12-23 00:29:59 -05:00
mazmazz	31cfa255f2	Merge branch '2122-version' into 2122-patch-dta-update	2018-12-22 23:50:31 -05:00
mazmazz	e3d106d527	Merge remote-tracking branch 'public-gl/2122-version' into 2122-version	2018-12-22 23:42:25 -05:00
mazmazz	b49cf11fb6	Merge remote-tracking branch 'public-gl/next' into 2122-version	2018-12-22 23:41:55 -05:00
mazmazz	33434395f7	Add SRB2 Community Contributors to Special Thanks	2018-12-22 23:41:43 -05:00
mazmazz	8723eb9aa2	Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update	2018-12-22 23:34:24 -05:00
Steel Titanium	66e13cf1cc	SDL:Auto grab input	2018-12-22 23:28:59 -05:00
mazmazz	94858aedfe	Extend HU_FONTSTART to STCFN022 (from 2.2)	2018-12-22 23:20:01 -05:00
mazmazz	a9fb17dab1	Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)" ... This reverts commit 6400729034.	2018-12-22 22:40:58 -05:00
mazmazz	56320a35ce	Use TinyFont for chat arrows	2018-12-22 22:40:04 -05:00
mazmazz	6400729034	Extend HU_FONTSTART to STCFN022 (from 2.2)	2018-12-22 21:48:24 -05:00
mazmazz	e0176670f4	Correct splitscreen check in OLDCHAT	2018-12-22 21:30:39 -05:00
mazmazz	7e9411f320	Minor code cleanup, CHAT	2018-12-22 21:17:01 -05:00
Alam Ed Arias	7285f9ff1d	Netcode: handle NULL in addrinfo lookup	2018-12-22 21:06:13 -05:00
mazmazz	a66a2021ba	Draw up and down arrows by string	2018-12-22 20:57:53 -05:00
mazmazz	fb3722a6f3	Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN	2018-12-22 20:52:32 -05:00
Alam Ed Arias	0ed9665a79	Added static library of SDL2 and SDL2_mixer for ARM systems	2018-12-22 20:48:15 -05:00
mazmazz	0f0e30924f	One more free(nodenum)	2018-12-22 20:35:12 -05:00
mazmazz	5badc11159	Fix integer overflow on for loop decrements	2018-12-22 20:18:25 -05:00
Alam Ed Arias	102fd11cb4	More work to cleanup the ARM builds	2018-12-22 19:50:32 -05:00
Alam Arias	c5ec1e30a4	Merge pull request #391 from monster-psychic-cat/sw_largeroomfix ... Large room fix	2018-12-22 19:48:08 -05:00
Alam Ed Arias	4265be776c	Merge branch 'master' into next	2018-12-22 19:36:32 -05:00
Alam Arias	194f9ea8c0	Merge branch 'next' into sw_largeroomfix	2018-12-22 19:34:22 -05:00
Latapostrophe	c7060aa5ad	Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.	2018-12-22 16:44:58 +01:00
Latapostrophe	619dd9d08a	Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.	2018-12-22 12:34:17 +01:00
mazmazz	8707b2f40a	Center window on current monitor during vidmode change	2018-12-22 01:43:58 -05:00
mazmazz	cb619e0353	Don't create movement events from joy or mouse when menu is active	2018-12-22 01:20:24 -05:00
TehRealSalt	1291d35e08	Don't allow non-keyboard keys to screenshot/gif in menus	2018-12-22 00:39:32 -05:00
Steel Titanium	10521d161c	Fix various bugs with the chat.	2018-12-21 22:28:28 -05:00
Steel Titanium	e42bcd5b68	Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat	2018-12-21 20:29:33 -05:00
Alam Arias	b6a917cda1	Added ARM/ARM64 to whole vc10 sln ... Added ARM/ARM64 to zlib, libpng Added ARM/ARM64 to srb2dd/srb2sdl	2018-12-21 16:47:10 -05:00
Monster Iestyn	a72d79da54	Merge branch 'master' into next	2018-12-21 17:41:19 +00:00
mazmazz	90832938c9	Re-order Special Thanks -- groups first, then names in ABC order	2018-12-21 11:40:35 -05:00
mazmazz	06ff171e19	Adjust vid.width floating point comparson for CHAT	2018-12-21 11:37:22 -05:00
mazmazz	e20c70d5fb	Skip setting control if keynum is -1 (for KEY_PAUSE) handling	2018-12-20 18:27:44 -05:00
Digiku	41a25a68c9	Merge branch '2122-credits-update' into 'next' ... Add sirjuddington and CodeImp to Special Thanks credits See merge request STJr/SRB2!409	2018-12-20 18:06:08 -05:00
mazmazz	f1fea30045	Properly restrict EXECVERSION from cvar updates	2018-12-20 17:56:51 -05:00
mazmazz	f66ee8c4cd	Add sirjuddington and CodeImp to Special Thanks credits	2018-12-20 17:27:25 -05:00
mazmazz	9be1ee4ac7	Hardcode define MAJOREXECVERSION to MODVERSION	2018-12-20 17:16:04 -05:00
mazmazz	6affe807e8	Merge branch '2122-version' into 2122-execversion	2018-12-20 17:14:53 -05:00
Digiku	58a2cec70f	Merge branch 'float_equal' into 'master' ... Clear Float equal warnings See merge request STJr/SRB2!383	2018-12-20 16:58:37 -05:00
Jimita	2b59cfa63f	Merge branch 'next' into sw_largeroomfix	2018-12-20 19:58:16 -02:00
Jimita	b68e01cb2b	Merge branch 'next' into sw_largeroomfix	2018-12-20 19:57:38 -02:00
Digiku	9525de2d83	Merge branch 'camera-backport' into 'next' ... Suggestion: 2.2 camera changes backport See merge request STJr/SRB2!393	2018-12-20 16:57:23 -05:00
Digiku	28c8ad3dbb	Merge branch 'jump-spin-axes' into 'next' ... Feature: Jump/Spin axes See merge request STJr/SRB2!389	2018-12-20 16:57:05 -05:00
Digiku	75e570f2b4	Merge branch 'joy-jump-defaults' into 'next' ... Assign joy button defaults for 1 and 2 player See merge request STJr/SRB2!400	2018-12-20 16:56:09 -05:00
Digiku	50221c47e9	Merge branch 'menu-2pcontrols-fix' into 'master' ... Fix 2p control menu graying out See merge request STJr/SRB2!407	2018-12-20 16:54:52 -05:00
Jimita	2bdf56804c	Merge branch 'next' into sw_largeroomfix	2018-12-20 19:53:24 -02:00
Digiku	f405f1ae30	Merge branch 'cmake-dllpath-fix' into 'master' ... Update CMake paths for Windows DLLs See merge request STJr/SRB2!406	2018-12-20 16:53:06 -05:00
MPC	9d93f54b67	bland	2018-12-20 18:52:51 -03:00
mazmazz	0519d8c52d	Update CMake paths for Windows DLLs	2018-12-20 16:46:40 -05:00
mazmazz	fe5001a38a	Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu	2018-12-20 16:40:59 -05:00
mazmazz	b57204fc12	Fix 2p control menu graying out	2018-12-20 16:38:58 -05:00
mazmazz	6f8b126586	Add G_FilterKeyByVersion() to setcontrol	2018-12-20 16:30:37 -05:00
MPC	fcb65951b8	change implementation of square root	2018-12-20 17:37:06 -03:00
Jimita	5b285a60a2	Update r_segs.c	2018-12-20 16:15:19 -03:00
Jimita	ffd5061531	Merge branch 'next' into sw_largeroomfix	2018-12-20 16:56:05 -02:00
Monster Iestyn	76fe78571e	fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic	2018-12-20 16:47:17 +00:00
Monster Iestyn	dfbbab35f4	Merge branch 'master' into next	2018-12-20 16:41:21 +00:00
mazmazz	e2b8ff26db	Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua	2018-12-20 10:56:36 -05:00
Digiku	dd107724de	Merge branch 'lua-nextmapoverride' into 'next' ... Lua: nextmapoverride & skipstats changing outside of G_ExitLevel See merge request STJr/SRB2!396	2018-12-20 10:55:30 -05:00
mazmazz	71da6836c0	Reset default controls for LOADCONFIG command	2018-12-20 10:13:43 -05:00
mazmazz	04916edc07	Update EXECVERSION to MODVERSION 27	2018-12-20 04:03:35 -05:00
mazmazz	9d212b340b	Update code versions to 2.1.22	2018-12-20 02:35:27 -05:00
Digiku	25f0dc7eae	Merge branch 'version-string-develop' into 'master' ... Add DEVELOP build flag to version string See merge request STJr/SRB2!401	2018-12-20 02:28:21 -05:00
mazmazz	7f8d16d3cd	Add DEVELOP build flag to version string	2018-12-20 02:27:30 -05:00
mazmazz	60bcf92525	Adjust execversion retrieval in CV_FilterVarByVersion	2018-12-20 02:18:59 -05:00
mazmazz	969960a1eb	Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro	2018-12-20 02:18:11 -05:00
mazmazz	ed7178bca4	Assign joy button defaults for 1 and 2 player	2018-12-20 01:47:35 -05:00
Digiku	722ceb5285	Merge branch 'pk3-stray-blockmap-msg' into 'master' ... Comment out stray PK3 blockmap message See merge request STJr/SRB2!399	2018-12-20 01:11:44 -05:00
mazmazz	78501dcd0c	Comment out stray PK3 blockmap message	2018-12-20 01:11:07 -05:00
Digiku	223257e237	Merge branch 'using-offsetof' into 'next' ... Use the `offsetof` function See merge request STJr/SRB2!394	2018-12-19 21:53:37 -05:00
Alam Ed Arias	e5e978f8bd	Merge branch 'master' into next	2018-12-19 13:20:54 -05:00
Digiku	7982b1695a	Merge branch 'ogl-zfighting-fix' into 'master' ... OpenGL z-fighting fix [by Azeonus] Closes #43 See merge request STJr/SRB2!395	2018-12-19 13:05:04 -05:00
Digiku	bea76aa4bf	Merge branch 'save-override' into 'next' ... Feature: Save override for level header See merge request STJr/SRB2!392	2018-12-19 13:04:41 -05:00
Digiku	4c69fe23f6	Merge branch 'kart-luatextures-backport' into 'next' ... Lua: Kart textures backport (non-foolish vers) See merge request STJr/SRB2!391	2018-12-19 13:04:24 -05:00
Latapostrophe	387173ea89	Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT	2018-12-19 16:50:49 +01:00
Latapostrophe	a31b85e124	Some messages relevant to discussions now go in the chat.	2018-12-19 16:44:57 +01:00
mazmazz	96cad09db6	Change 0.05 to 0.05f	2018-12-18 16:59:59 -05:00
Azeonus	67cd6dcdd2	dispoffset OGL fix [by Azeonus]	2018-12-18 16:50:03 -05:00
TehRealSalt	42a9e66883	Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.	2018-12-18 15:03:54 -05:00
TehRealSalt	0e34e7f32f	G_SetCustomExitVars for setting nextmapoverride & skipstats ... This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.	2018-12-18 14:48:04 -05:00
Alam Arias	b62e6ee909	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-18 14:11:43 -05:00
Alam Ed Arias	d5c7ca1d23	Merge branch 'master' into next	2018-12-18 14:05:07 -05:00
Alam Arias	056cfe71a4	Merge pull request #373 from monster-psychic-cat/sw_planefixes ... Software plane fixes	2018-12-18 14:02:21 -05:00
Alam Arias	afecb2fc85	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-18 13:57:48 -05:00
TehRealSalt	03a4bd8f53	Revert default changes ... Digiku said they'd handle the new button defaults so \m/	2018-12-18 12:55:05 -05:00
Latapostrophe	9f17039e2e	Merge branch 'srb2chat' into 'SRB2-CHAT' ... fix my fucking code See merge request SinnamonLat/SRB2!1	2018-12-18 11:51:18 -05:00
mazmazz	1fcf607b41	Fix strncpy nodenum length overflow	2018-12-17 21:31:00 -05:00
mazmazz	876ddd48f1	Change int to INT32	2018-12-17 19:09:05 -05:00
mazmazz	bf21b7c483	Mixed D&C fixes for HU_DrawTeamTabRankings	2018-12-17 19:03:09 -05:00
mazmazz	7a92c9d3d0	Mixed D&C fixes; replace a couple int's with INT32	2018-12-17 19:02:22 -05:00
mazmazz	245a125551	Fix compile errors	2018-12-17 18:55:21 -05:00
Monster Iestyn	bd58ff8c49	Merge branch 'frame-backslash-fix' into 'next' ... Accept '+' as substitute for '\' for sprite frames (PK3) See merge request STJr/SRB2!380	2018-12-17 17:34:41 -05:00
MPC	ca4329bcb6	fix the fucking warning	2018-12-17 18:09:29 -03:00
MPC	82601e881b	fix my fucking code	2018-12-17 17:57:53 -03:00
Latapostrophe	2fdf27c507	make sure to change p_dispy and not y for /pm list. Also make MPC happy.	2018-12-17 21:39:49 +01:00
Latapostrophe	ff957baae3	Don't overlap ringslinger HUD	2018-12-17 21:31:31 +01:00
Jimita	1d40676f3a	Merge branch 'master' into automap_fix	2018-12-17 17:46:29 -02:00
Jimita	3329c10b60	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-17 17:46:17 -02:00
Jimita	f3956ffb4c	Merge branch 'master' into sw_planefixes	2018-12-17 17:45:36 -02:00
Latapostrophe	45aba493c7	2.1.21 and all of the kart additions. Woo.	2018-12-17 20:43:59 +01:00
mazmazz	b64dd82034	Attempt to fix cv_execversion being accessible by console	2018-12-17 13:39:24 -05:00
mazmazz	657e7321f6	Decouple execversion from MODVERSION; add scheme for MINORMODVERSION	2018-12-17 13:38:23 -05:00
Jimita	362fb491f7	Merge branch 'next' into the_second_remote_view_camera_fix	2018-12-17 15:40:20 -02:00
Monster Iestyn	e9be5e895e	Merge branch 'master' into next	2018-12-17 17:34:41 +00:00
mazmazz	b958f00f17	Better rewrite for addons draw adjustment	2018-12-17 10:59:27 -05:00
TehRealSalt	bef3bb23f8	Undo dc92bb49	2018-12-16 21:36:54 -05:00
TehRealSalt	97639848e1	Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport	2018-12-16 21:22:06 -05:00
TehRealSalt	9e596d15af	Save override for level header ... Kind of like 2.2's, but with backwards-compatability with 2.1	2018-12-16 20:09:59 -05:00
mazmazz	6dbe930997	Use labs for long value	2018-12-16 19:47:02 -05:00
mazmazz	2d2bd59099	Remove FIXUPO0 GCC pragma	2018-12-16 19:39:16 -05:00
mazmazz	296b678d7e	Wstrict-overflow adjustment	2018-12-16 19:38:46 -05:00
TehRealSalt	ec53e12294	Foolish	2018-12-16 18:19:53 -05:00
TehRealSalt	e763eab6cd	2.2 camera changes backport ... - Very slightly less claustrophobic camera defaults - Changed camera settings are saved - Camera distance increases relatively with splitscreen & analog mode. These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration	2018-12-16 18:18:59 -05:00
Alam Ed Arias	14e98df69b	Revert "Merge branch 'kart-luatextures-backport' into 'next'" ... This reverts merge request !387	2018-12-16 22:57:39 +00:00
TehRealSalt	c69cfefb6d	2.2 backport of jump/spin axes ... Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.	2018-12-16 17:45:49 -05:00
Monster Iestyn	6b1b11441d	Merge branch 'sdl-sound-fix' into 'master' ... SDL: Force use DirectSound driver to fix wrong-pitch sound effects See merge request STJr/SRB2!375	2018-12-16 17:16:49 -05:00
mazmazz	1b7a9aaa01	2.1 Score/Time/Rings lump name	2018-12-16 16:53:13 -05:00
mazmazz	899120e475	Revert NMUSlist to original 2.1	2018-12-16 16:42:57 -05:00
mazmazz	d7321fd8c4	Pull expanded NMUSlist from 2.2	2018-12-16 16:40:40 -05:00
mazmazz	046d36a657	Remove Kart entries from NMUSlist	2018-12-16 16:08:31 -05:00
mazmazz	6d94568f4b	Hide kart-specific addons behavior behind USE_KART	2018-12-16 16:07:47 -05:00
TehRealSalt	cc22ef3f05	Add deprecation warning to admin	2018-12-16 16:05:18 -05:00
TehRealSalt	4ba23e1028	Expose R_TextureNumForName ... Backport from SRB2Kart	2018-12-16 15:58:47 -05:00
mazmazz	c3ff0b6d16	Uncomment Secrets menu toggle when exiting Addons	2018-12-16 15:52:01 -05:00
Alam Ed Arias	6e79722437	Fix float-equal warning in Win32 interface	2018-12-16 14:01:28 -05:00
Alam Ed Arias	11aef0b3f1	Merge branch 'master' into float_equal	2018-12-16 13:52:45 -05:00
Latapostrophe	25e6d5388c	merge conflict	2018-12-16 16:48:15 +01:00
mazmazz	f0967520ed	Compile fixes; enable PK3 support in addons menu ... * Add missing vars highlightflags, recommendedflags, warningflags from Kart * V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us * V_GetStringColormap() made non-static	2018-12-15 21:44:39 -05:00
mazmazz	37950341ec	Merge remote-tracking branch 'public-gitlab/next' into addons-backport	2018-12-15 20:52:46 -05:00
mazmazz	0a3b3736bf	Handle Kart-specific changes; add PK3 to exttable	2018-12-15 20:50:33 -05:00
mazmazz	b32f50648d	Merge branch 'addons_menu' into 'master' ... Addons menu See merge request KartKrew/Kart!8	2018-12-15 20:46:42 -05:00
Alam Ed Arias	15d0673685	fix compiling for clang	2018-12-14 21:31:37 -05:00
Alam Ed Arias	78634679f1	fix compiling for MSVC	2018-12-14 20:42:37 -05:00
Alam Ed Arias	6fd66bdb49	Clear float equal warnings	2018-12-14 20:34:06 -05:00
Monster Iestyn	f4ce770c1c	try out using offsetof for these three macros in d_clisrv.h	2018-12-14 23:56:11 +00:00
Monster Iestyn	e0079ea1a2	remove NearVertice (which was unused anyway), clean up maz's changes	2018-12-14 23:28:07 +00:00
mazmazz	de96fe8e7b	Revert "compiler SSE tweak for 32-bit" ... This reverts commit 09d9a555c6.	2018-12-14 16:47:38 -05:00
mazmazz	abae63a64b	SameVertice floating point match; fixes 64-bit OGL holes	2018-12-14 16:47:24 -05:00
mazmazz	66efc7ea7f	Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup	2018-12-14 16:23:42 -05:00
Monster Iestyn	c1e0041a0b	copy doom legacy's replacement for the den == 0.0 calc in fracdivline	2018-12-14 21:22:13 +00:00
mazmazz	09d9a555c6	compiler SSE tweak for 32-bit	2018-12-14 16:21:07 -05:00
Monster Iestyn	623d1574ce	minor cleanup	2018-12-14 21:00:53 +00:00
MPC	9c04a066d9	Update r_plane.h	2018-12-14 15:49:32 -03:00
Monster Iestyn	b42c306ef3	remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway	2018-12-14 18:14:08 +00:00
Monster Iestyn	52fd3dcbed	split loading status code into a separate function	2018-12-14 18:11:30 +00:00
Monster Iestyn	02fc845a72	Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all	2018-12-14 18:01:18 +00:00
Monster Iestyn	4089b6b8e9	use continue if NULL instead of a big if block if ...not NULL ... also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards	2018-12-14 18:00:08 +00:00
Monster Iestyn	3a125dbbd5	compare with actual doubles, not ints	2018-12-14 17:14:03 +00:00
Jimita	cf792ef4f3	Merge branch 'master' into the_second_remote_view_camera_fix	2018-12-14 15:09:24 -02:00
MPC	9c2197db17	Software plane fixes	2018-12-14 14:08:25 -03:00
Jimita	d70dbada1c	Merge branch 'master' into automap_fix	2018-12-14 15:07:53 -02:00
mazmazz	c49a5ed8d2	Better I_InitJoystick log message	2018-12-14 06:14:21 -05:00
mazmazz	d094a70ec3	Allow use_joystick/2 to be saved once again	2018-12-14 06:07:20 -05:00
mazmazz	fa63ddda86	Fix cv_usejoystick being reset to None when cv_usejoystick was > NumJoys and changing to already-used joystick	2018-12-14 06:05:31 -05:00
mazmazz	70d6845d6c	Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously	2018-12-14 05:57:10 -05:00
mazmazz	b2c02838c4	Display "joystick used" prompt correctly if setting use_joystick from an old value > I_NumJoys()	2018-12-14 05:31:47 -05:00
mazmazz	e548f6f139	Don't override an already-active controller ... * Menu improvements to tell the user that they can't set a controller if it's already active	2018-12-14 05:02:41 -05:00
mazmazz	3b6de810e1	Lots of changes to better support hotplugging and unstable device indexes ... * Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run * Properly set cv_usejoystick/2 for menu toggling * Force-disable a player's joystick if setting another player's joystick to the same device * Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging	2018-12-14 03:58:07 -05:00
mazmazz	6b9fe87b60	Properly handle unstable device indexes for hotplug	2018-12-14 01:45:18 -05:00
mazmazz	44d6a1d236	Attempt to handle unstable device IDs	2018-12-14 00:22:25 -05:00
mazmazz	216e710b87	Improve hotplug edge case with changing device indexes; return proper joy_open output on error	2018-12-13 23:52:04 -05:00
mazmazz	14cde2d227	Change joystick log messages to DBG_GAMELOGIC	2018-12-13 23:26:07 -05:00
mazmazz	e81f05c496	Handle unstable device index when hotplugging controller	2018-12-13 23:09:05 -05:00
mazmazz	bcd747c1cd	Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly	2018-12-13 22:26:13 -05:00
mazmazz	a3063ce89f	Merge tag 'SRB2_release_2.1.21' into vanilla-hotplug	2018-12-13 22:16:48 -05:00
Monster Iestyn	ef6533fb83	Merge branch 'master' into next	2018-12-13 22:21:31 +00:00
Monster Iestyn	880c017f8f	Merge branch 'cfg-srb2home-fix' into 'master' ... Apply srb2home path to EXEC, SAVECONFIG, and debugfile See merge request STJr/SRB2!379	2018-12-13 16:16:52 -05:00
mazmazz	dc7992a815	R_Char2Frame special case for backslash: accept plus as substitute	2018-12-13 14:59:12 -05:00
mazmazz	d18b2cda59	Apply srb2home to saveconfig ONLY if srb2home isn't already there	2018-12-13 13:32:38 -05:00
mazmazz	93f7f0a8df	Apply srb2home to debugfile	2018-12-13 13:23:09 -05:00
mazmazz	b1641aa8e9	Apply srb2home to SAVECONFIG	2018-12-13 13:17:56 -05:00
mazmazz	93eda4e7c9	EXEC: Search for CFG by file path	2018-12-13 13:11:25 -05:00
mazmazz	b84470ec51	Fix savegamename being improperly built due to missing null char after copying timeattackfolder	2018-12-13 12:01:07 -05:00
Jimita	e628d98f20	Update am_map.c	2018-12-12 19:59:21 -02:00
Jimita	a5874019cb	Update am_map.c	2018-12-12 19:57:52 -02:00
MPC	649b6c9ca1	Remove MINIAUTOMAP code	2018-12-12 18:53:13 -03:00
MPC	6b22dc183b	Fix the automap	2018-12-12 18:01:52 -03:00
Jimita	966afb6017	Update p_user.c	2018-12-12 13:09:47 -02:00
MPC	c68875ad93	Fix remote viewpoint cameras for real ... I'm so sorry	2018-12-11 20:48:45 -03:00
Monster Iestyn	582c5332f4	Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens	2018-12-11 18:39:58 +00:00
MPC	348ed1e43f	Large room fix	2018-12-09 19:34:17 -03:00
mazmazz	47ee3525af	Indentation	2018-12-08 14:10:56 -05:00
mazmazz	01f1933f69	Force directsound to fix wrong-pitch sound effects	2018-12-08 14:05:58 -05:00
mazmazz	df89781623	Windows string adjustment	2018-12-06 15:42:58 -05:00
mazmazz	ba60989c00	Adjust version strings	2018-12-06 15:39:19 -05:00
mazmazz	60afce5771	Disable XINPUT before initing the joy subsystem	2018-12-06 14:03:46 -05:00
Digiku	17e9188c89	Merge branch 'execversion' into '21-version' ... Block previous versions' config defaults with EXECVERSION consvar See merge request STJr/SRB2!371	2018-12-06 12:41:20 -05:00
mazmazz	3ceeb6a205	Register execversion and remove CV_SAVE because we write manually	2018-12-06 12:28:30 -05:00
mazmazz	0be61e8830	a stray if block	2018-12-06 12:03:53 -05:00
mazmazz	a5eb62b73e	alwaysfreelook -> alwaysmlook string	2018-12-06 12:02:45 -05:00
mazmazz	70aa4ce18e	Add alwaysfreelook2 and mousemove2 to config versioning ... * Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)	2018-12-06 11:59:34 -05:00
mazmazz	6694b7d679	Controller hotplugging by always keeping joy subsystem on (thanks WOLFS) ... (with log messages)	2018-12-06 10:54:58 -05:00
mazmazz	f0c7848e50	Use proper DD define for use_joystick	2018-12-06 06:50:18 -05:00
mazmazz	5b3a1e0c55	Implement EXECVERSION consvar to invalidate previous versions' default config values	2018-12-06 06:28:34 -05:00
mazmazz	a802069313	Move joyaxis_fire default to right trigger	2018-12-06 05:55:56 -05:00
mazmazz	aaf5d2e1dc	Change 2p controller defaults	2018-12-06 05:26:28 -05:00
mazmazz	9055c9aeab	Hex instead of octal colors	2018-12-05 13:08:25 -05:00
mazmazz	c5b349ddc4	More concise bitness check	2018-12-05 13:06:56 -05:00
mazmazz	1ea2fa447a	Make the ifdefs cleaner	2018-12-05 13:00:42 -05:00
mazmazz	389c2d4ea1	_WINDOWS instead of _WIN32 for DD	2018-12-05 12:55:05 -05:00
mazmazz	6d9fb0d3fd	Merge remote-tracking branch 'public-gitlab/21-version' into versionflags	2018-12-05 12:49:21 -05:00
Monster Iestyn	aee8dcdff8	Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server ... it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck	2018-12-05 17:39:02 +00:00
mazmazz	a6dcd5555e	Add various flags to version string	2018-12-05 11:43:33 -05:00
Monster Iestyn	ae14fd2f85	Fix motd being broken for admins ... It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands	2018-12-04 21:09:28 +00:00
Monster Iestyn	b4b82e681c	Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart	2018-12-04 18:54:36 +00:00
Monster Iestyn	e353e2ef70	Merge branch 'next' into 21-version	2018-12-04 17:19:36 +00:00
Monster Iestyn	f2b0db5a1c	Merge branch 'master' into next	2018-12-04 17:18:19 +00:00
Digiku	e6e5856fd8	Merge branch 'auto-joystick' into 'master' ... Use Joystick 1 and Joystick 2 by default if plugged in See merge request STJr/SRB2!364	2018-12-04 11:53:58 -05:00
Digiku	631f6ed406	Merge branch 'joystick-juggling' into 'master' ... Joystick juggling See merge request STJr/SRB2!355	2018-12-04 11:51:55 -05:00
Monster Iestyn	d1a8e3acdb	Merge branch 'tiny-makefile-fix' into 'master' ... Tiny Makefile Fix See merge request STJr/SRB2!289	2018-12-04 08:09:27 -05:00
mazmazz	c799584f3d	Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)	2018-12-03 23:36:36 -05:00
mazmazz	60feae1014	Update OSX icon	2018-12-03 23:09:54 -05:00
Digiku	ba81e26f71	Merge branch 'controller-menu-touchup' into 'master' ... Controller select menu improvements. See merge request STJr/SRB2!354	2018-12-03 23:00:36 -05:00
Digiku	42cb597731	Merge branch 'joystick-juggling-two' into 'next' ... Joystick additions for menu, axis defaults, and vertical look toggle See merge request STJr/SRB2!359	2018-12-03 22:59:19 -05:00
Steel Titanium	fbb2cde800	Make this be consistent with non-CMake builds	2018-12-03 15:42:37 -05:00
Steel Titanium	168647275c	One small change	2018-12-03 13:32:24 -05:00
mazmazz	6ca1130551	Hardcode Screenshot, GIF, and Viewpoint to their F keys	2018-12-03 13:21:16 -05:00
mazmazz	205e52f6d4	thisjoyaiming fix for chasefreelook	2018-12-03 13:13:01 -05:00
mazmazz	7ce092128b	Revert "Make pause key bring up the menu if it's a joy button" ... This reverts commit 9de31cf2e7.	2018-12-03 13:11:48 -05:00
mazmazz	6730c6c765	Menu for joy first/third person vertical look	2018-12-03 13:10:49 -05:00
mazmazz	ed57d0d9f9	Add Joy2 for network abort	2018-12-03 13:10:47 -05:00
mazmazz	9de31cf2e7	Make pause key bring up the menu if it's a joy button ... * Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames	2018-12-03 13:10:27 -05:00
mazmazz	7e523a1e35	Reset vertical look when toggling joyaiming	2018-12-03 13:10:24 -05:00
mazmazz	0bb113130b	Add alwaysfreelook to joystick menu	2018-12-03 13:10:20 -05:00
mazmazz	59cabea8bd	Add joyaiming qualifier for joystick look up/down	2018-12-03 13:10:19 -05:00
mazmazz	3134d72c12	Preserve event ch for other responders	2018-12-03 13:10:18 -05:00
mazmazz	6bf31492b7	Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)	2018-12-03 13:10:16 -05:00
mazmazz	6dd44ca1de	Change PC axis defaults to 360-friendly values	2018-12-03 13:10:15 -05:00
mazmazz	78dde93f3e	Remap menu actions to better joy keys	2018-12-03 13:10:12 -05:00
mazmazz	06faf6ffe4	Unneeded input header in st_stuff	2018-12-03 12:36:42 -05:00
mazmazz	8851f39b84	Use static joyname instead of malloc	2018-12-03 12:35:12 -05:00
mazmazz	6c78af3542	Missed (unused?) viewpoint strings	2018-12-03 12:20:19 -05:00
mazmazz	3d8bc85494	Forgot config strings for menu keys	2018-12-03 12:19:41 -05:00
mazmazz	5314c0e36b	Make F12 spectator string constant because of wrapping issues	2018-12-03 12:13:36 -05:00
mazmazz	60b16289e5	Change spectator string for "Press F12 to watch"	2018-12-03 12:11:03 -05:00
mazmazz	31f23fda8d	Add gc_viewpoint from Kart	2018-12-03 11:50:57 -05:00
mazmazz	2a87093ece	Add gc_screenshot and gc_recordgif from Kart	2018-12-03 11:31:48 -05:00
mazmazz	8e190932e7	Add gc_systemmenu from Kart	2018-12-03 11:21:25 -05:00
mazmazz	d8e70c32e0	Remove console messages for joynames	2018-12-03 05:39:10 -05:00
mazmazz	19d19543b7	Copy string from SDL_JoystickNameForIndex before the subsystem is shut down	2018-12-03 05:37:07 -05:00
Monster Iestyn	978a28004d	add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus	2018-12-02 21:52:30 +00:00
Monster Iestyn	13b0e9c3c5	make menu respond to joystick axis events without joyscale having to be 0	2018-12-02 21:18:28 +00:00
MonsterIestyn	10832db244	Merge branch 'next' into lua_mapchange	2018-12-02 20:54:32 +00:00
Monster Iestyn	a63ba7084a	Disable the axis parts of I_GetJoystickEvents and its player2 counterpart. ... (This is what I should have done in the first place)	2018-12-02 17:42:51 +00:00
Monster Iestyn	ce4e63a366	Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet	2018-12-02 17:12:05 +00:00
Monster Iestyn	33c1ac33f5	Merge branch 'next' into 21-version ... # Conflicts: # src/d_netcmd.c	2018-12-02 15:45:07 +00:00
wolfy852	e12890c84e	s	2018-12-02 09:08:05 -06:00
wolfy852	2af04203ea	Fix a dumb mistake	2018-12-02 08:57:35 -06:00
Steel Titanium	0f11116e7b	Fix up controller menu support	2018-12-01 20:13:14 -05:00
Monster Iestyn	11cb163435	Backport the Blockmap library I made two years ago	2018-11-30 17:11:11 +00:00
Jimita	6d7689c1a7	Merge branch 'next' into lua_mapchange	2018-11-30 15:10:59 -02:00
MPC	54cae84849	Change MapChange so Lua returns the map number you change	2018-11-30 14:01:40 -03:00
Monster Iestyn	e0a1c43813	Free lump names *before* either lumpinfo or the WAD itself!	2018-11-30 14:19:47 +00:00
Sryder	bc1f08f89d	Fix 2 of the Unsuffixed Float Constant warnings ... The other one is related to M_PI for me, which I'm still not sure about where it's getting it from	2018-11-29 22:12:14 +00:00
Sryder	c5e8e0badb	Merge branch 'master' into tiny-makefile-fix	2018-11-29 21:57:47 +00:00
Monster Iestyn	305ad4f73e	backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading	2018-11-29 14:16:02 +00:00
wolfy852	c517862f7e	I must be some kind of idiot.	2018-11-29 07:34:05 -06:00
wolfy852	d294be2054	Fix a quick merge mistake.	2018-11-29 07:15:54 -06:00
TehRealSalt	c70cf5908d	IsPlayerAdmin support, since admin was removed ... # Conflicts: # src/lua_baselib.c	2018-11-29 07:12:15 -06:00
Wolfy	b59718d3ad	Remove hardcoded limit on admins ... # Conflicts: # src/d_netcmd.c	2018-11-29 07:05:49 -06:00
Wolfy	b8ce51bff2	Multiple admins ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h	2018-11-29 06:46:59 -06:00
Alam Ed Arias	7bd0900fad	Merge remote-tracking branch 'private/master' into EOL	2018-11-27 23:36:09 -05:00
Alam Ed Arias	e39e689aeb	fix EOL on src/p_enemy.c	2018-11-27 21:32:15 -05:00
Monster Iestyn	e158206e55	backport string len tweaks I made to LUA_LoadLump in internal	2018-11-27 23:06:31 +00:00
Monster Iestyn	cb53bc8afe	remove redundant wadfile loop within wadfile loop for ANIMDEFS code	2018-11-27 23:05:33 +00:00
mazmazz	97ea4086a5	Redundant type 1800 check for MT_COIN	2018-11-27 14:10:55 -05:00
Monster Iestyn	cd57be640c	Merge branch '21-controls' into 'next' ... Default control changes for 2.1.21 See merge request STJr/SRB2!343	2018-11-27 11:50:42 -05:00
Monster Iestyn	3e6388c183	use UINT8 * instead of void or Bytef *	2018-11-27 15:49:41 +00:00
Monster Iestyn	6e839d30a2	Merge branch 'master' into next	2018-11-27 15:31:28 +00:00
Monster Iestyn	95e13d9ad3	Merge branch 'save-soundmenu-toggles' into 'master' ... Save sound toggles to config See merge request STJr/SRB2!348	2018-11-27 10:07:06 -05:00
Monster Iestyn	1889c36dea	add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)	2018-11-27 13:57:32 +00:00
Alam Ed Arias	b7f7c2ecf7	PK3: fixup support for newer version of zlib	2018-11-26 20:08:26 -05:00
Alam Ed Arias	9a042cd5e2	Merge branch 'master' into next	2018-11-26 19:49:19 -05:00
Alam Ed Arias	78a1931bdf	Makefile: disable implicit-fallthroug warnings	2018-11-26 19:38:14 -05:00
Alam Ed Arias	5a3f469593	Makefile: skip implicit-fallthroug warnings	2018-11-26 19:28:55 -05:00
Alam Ed Arias	ac2ec6c982	Makefile: disable some warnings for GCC 8.x	2018-11-26 19:01:40 -05:00
Alam Ed Arias	4e332b3848	Fix MSVC build	2018-11-26 18:27:07 -05:00
Digiku	a2678dcb2e	Merge branch 'public-nights-invertloopfix' into 'next' ... NiGHTS fix lap detection on inverted axis See merge request STJr/SRB2!300	2018-11-26 16:08:24 -05:00
Digiku	fd891aa21d	"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk	2018-11-26 15:48:08 -05:00
Monster Iestyn	4b0d45afd8	Merge branch 'opengl-noloading' into 'master' ... Hide OpenGL loading screen See merge request STJr/SRB2!349	2018-11-26 15:30:45 -05:00
MonsterIestyn	b53cd70201	Merge branch 'next' into PK3-BackportNext	2018-11-26 18:56:51 +00:00
Monster Iestyn	a71ca1d259	Merge branch 'fof-slope-skew-backport' into 'master' ... FOF wall slope skewing backport See merge request STJr/SRB2!341	2018-11-26 08:54:29 -05:00
Steel Titanium	ba111d42ca	Last minute changes.	2018-11-26 00:24:11 -05:00
Steel Titanium	cf01e820c4	Take the command line params into account ... Really I'm just making it return early if either of the parms are used.	2018-11-25 22:39:11 -05:00
mazmazz	930835f1a2	Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show	2018-11-25 21:47:56 -05:00
mazmazz	900f7e3dc9	FORCEWIPEOFF define in place of wipegamestate = -2	2018-11-25 19:40:18 -05:00
mazmazz	ab47e83939	Merge remote-tracking branch 'origin/master' into menu-execs	2018-11-25 19:03:22 -05:00
Monster Iestyn	1b2aea81dc	Merge branch 'master' into next	2018-11-25 20:39:17 +00:00
mazmazz	73be0c33ae	Use get_number in dehacked readmenu	2018-11-25 15:16:53 -05:00
mazmazz	e2ca92a3db	Remove unused menu hierarchy methods	2018-11-25 15:09:25 -05:00
mazmazz	0439479b3e	Remove M_ApplyMenuPresState	2018-11-25 15:08:36 -05:00
mazmazz	eb95289ea4	Rearranged menu presentation methods ... * Menu parameter retrieval and hierarchy in m_menu * Presentation logic (background display) in f_finale	2018-11-25 15:08:12 -05:00
Steel Titanium	7d4c9dda91	Add newline to end of file	2018-11-25 14:24:50 -05:00
Steel Titanium	981a1192fb	Save sound toggles to config	2018-11-25 14:22:52 -05:00
Monster Iestyn	aaabf062b8	Merge branch 'ms-cvars-fix' into 'master' ... Update server name insantly See merge request STJr/SRB2!344	2018-11-25 14:04:12 -05:00
Monster Iestyn	5069acb110	Merge branch 'mpc-software-yslope-fix' into 'master' ... Fix glitches with flats visible when looking up/down in 1st person (software renderer fix) See merge request STJr/SRB2!282	2018-11-25 11:51:54 -05:00
Monster Iestyn	028236006b	Merge branch '21-copyright-followup' into 'master' ... Print copyright notice in stdout console on program start See merge request STJr/SRB2!347	2018-11-25 11:07:34 -05:00
Monster Iestyn	8b4a64ac05	Merge branch 'last-min-cleanup' into 'master' ... Last min cleanup See merge request STJr/SRB2!342	2018-11-25 10:14:34 -05:00
Monster Iestyn	11cb2e05ba	Merge branch 'cmake-use-internal-libs' into 'master' ... CMake: Use internal libs. See merge request STJr/SRB2!325	2018-11-25 09:33:50 -05:00
Monster Iestyn	85305791d8	Merge branch 'objectplace-skybox-fix' into 'next' ... Objectplace skybox fix. See merge request STJr/SRB2!319	2018-11-25 09:30:16 -05:00
mazmazz	e4d7ba39a9	Whitespace	2018-11-25 08:17:57 -05:00
mazmazz	83531469d7	Print GPL license notice and SEGA disclaimer in console on start	2018-11-25 08:12:19 -05:00
Digiku	40dfe89273	Merge branch '21-source-copyright' into 'master' ... Update source copyrights to 2018 See merge request STJr/SRB2!346	2018-11-25 07:36:41 -05:00
mazmazz	bd4743007e	Update source copyrights to 2018, outdated targets	2018-11-25 07:35:53 -05:00
mazmazz	ea7162a76a	Update source copyrights to 2018	2018-11-25 07:35:38 -05:00
Digiku	62443c9090	Merge branch '21-credits-update' into 'master' ... Extra credits update .21 See merge request STJr/SRB2!345	2018-11-25 07:21:31 -05:00
Nev3r	d7b3cf9314	Forgot the alignment for compact structs. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-25 11:35:19 +01:00
Nev3r	b48c1d1ce6	Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext ... # Conflicts: # src/w_wad.c	2018-11-25 11:18:28 +01:00
Nev3r	32a9e40baa	Progress? ... Get all IO outputs used for possible errors. Attempt to fix errors from travis-ci. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-25 11:11:50 +01:00
Nev3r	7c44054aa3	Take out the ifdef? ... Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-25 09:48:52 +01:00
Steel Titanium	f3ea628fea	Update server name instantly on change	2018-11-24 21:24:05 -05:00
Alam Ed Arias	1113849f5c	Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext	2018-11-24 18:00:14 -05:00
Nev3r	ec67c4cbd6	Fix uninitialized pointer. ... Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-24 23:39:31 +01:00
Alam Ed Arias	1bcfe16933	Do not remove newlines from the end of files	2018-11-24 17:30:49 -05:00
Alam Ed Arias	4ac481bcc6	Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext	2018-11-24 17:22:11 -05:00
Nevur	3f69e7c9b4	Merge branch 'next' into PK3-BackportNext	2018-11-24 23:08:52 +01:00
Nev3r	a1fb333e9b	Revamped the lumpinfo_t array generation code. ... -The resource type is 'adequately*' detected first. -The type-specific behaviors are now contained in their own functions, which are called accordingly for each. -The PKZip lumpinfo_t generation has been almost entirely rewritten. -If the functions return null pointer, the resource addition is considered invalid and pops an error.	2018-11-24 22:58:35 +01:00
mazmazz	f80691eb6e	Revert "Adjust mouse scaling calculation for SDL in windowed mode" ... This reverts commit 3b298b7c42.	2018-11-24 15:36:50 -05:00
Alam Ed Arias	c1d4ef3296	Merge branch 'next' into PK3-BackportNext	2018-11-24 14:54:42 -05:00
Alam Ed Arias	148d8ec9e0	Merge branch 'PK3-Backport' into PK3-BackportNext	2018-11-24 14:54:07 -05:00
Alam Ed Arias	17528a6aa9	LFS fixup for PK3 support	2018-11-24 14:48:56 -05:00
Nev3r	6f5e3d42ff	Merge branch 'PK3-Backport' into 'PK3-BackportNext' ... Pk3 backport See merge request Nev3r/SRB2!1	2018-11-24 06:02:19 -05:00
Nev3r	cb0c31fa9a	Final touches ... -Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES. -Removed now-unused function. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-24 09:26:52 +01:00
mazmazz	cf8b4a6cb1	Additional 2.1 credits update	2018-11-23 21:57:07 -05:00
mazmazz	3b298b7c42	Adjust mouse scaling calculation for SDL in windowed mode	2018-11-23 21:43:50 -05:00
mazmazz	b60c10dc9b	Change default mouse sensitivity	2018-11-23 20:51:57 -05:00
Monster Iestyn	794d27b49e	Kill CheckMissileImpact, it has been useless for probably a decade and a half	2018-11-23 23:14:49 +00:00
Monster Iestyn	0a0336a674	Merge branch 'master' into fof-slope-skew-backport ... # Conflicts: # src/r_segs.c	2018-11-23 22:40:28 +00:00
Monster Iestyn	4e616f54ad	Merge branch 'master' into next	2018-11-23 21:01:03 +00:00
Monster Iestyn	d228e35fcb	Merge branch 'responsefile-fix' into 'master' ... Fix M_FindResponseFile returning garbage data See merge request STJr/SRB2!254	2018-11-23 15:59:40 -05:00
Steel Titanium	97dd291f3f	Merge branch 'master' into responsefile-fix	2018-11-23 15:29:52 -05:00
Alam Arias	30b9cef043	Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix ... Render the skies correctly on splitscreen in OpenGL mode	2018-11-23 14:48:05 -05:00
Alam Arias	b1587cb0a3	Merge pull request #325 from monster-psychic-cat/opengl_startup_screen ... Render the startup screen on OpenGL mode	2018-11-23 14:47:56 -05:00
Alam Arias	3d0fd7ff2e	Merge pull request #258 from light2yellow/master ... m_fixed: asm: cc is not a register	2018-11-23 14:47:36 -05:00
Monster Iestyn	08af33c51f	Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't	2018-11-23 19:12:48 +00:00
Nev3r	0487558a98	Add missing tweaks ... Also remove a test printf. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-23 17:58:45 +01:00
Nev3r	c548aaa347	Backported PK3 support to 2.1 ... Hopefully I'm not missing anything. Signed-off-by: Nev3r <apophycens@gmail.com>	2018-11-23 16:58:16 +01:00
Digiku	9a3d2d0ee5	Merge branch '21-credits-update' into 'master' ... 2.1.21 credits update See merge request STJr/SRB2!339	2018-11-23 07:38:28 -05:00
Digiku	3c95a63fc2	Merge branch 'public-darker-credits' into 'master' ... Make the credits pics darker See merge request STJr/SRB2!336	2018-11-23 07:35:44 -05:00
mazmazz	2f7f472ca2	Update credits for 2.1.21	2018-11-23 07:34:23 -05:00
mazmazz	36e020c366	Update version to 2.1.21	2018-11-23 06:58:45 -05:00
Steel Titanium	fe43deacec	Merge branch 'master' into responsefile-fix	2018-11-22 23:02:20 -05:00
Steel Titanium	933c1311cd	Make the error less confusing	2018-11-22 22:59:46 -05:00
Steel Titanium	6020abab94	Fix the not found errors on DLLs	2018-11-22 22:44:47 -05:00
mazmazz	0d4cd35e13	Make the credits pics darker	2018-11-22 20:08:02 -05:00
mazmazz	edd98842d5	Added chasefreecam to menu	2018-11-22 17:32:03 -05:00
mazmazz	17ff7e69a0	Add chasefreelook to separate third and first person mouselook	2018-11-22 17:05:24 -05:00
Monster Iestyn	8f48f082d1	Merge branch 'master' into next	2018-11-22 20:12:59 +00:00
mazmazz	146dd52d24	Smarter pause/break rejection for setcontrol	2018-11-22 14:48:33 -05:00
mazmazz	a8e01ee69b	Smarter pause/break rejection for setcontrol	2018-11-22 14:47:01 -05:00
mazmazz	7075cdbfa8	Don't accept KEY_PAUSE for control console command	2018-11-22 14:37:28 -05:00
mazmazz	f926774ee1	Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key	2018-11-22 14:37:21 -05:00
mazmazz	4b5246d5b7	Adjust menu for movement and camera controls	2018-11-22 14:13:28 -05:00
Monster Iestyn	37c0e646e4	Merge branch 'ms-update-alert-fix' into 'master' ... Master Server Update alert fix See merge request STJr/SRB2!333	2018-11-22 13:34:43 -05:00
Digiku	38b4425030	Merge branch 'new-control-names' into 'master' ... Change camera control names to Look See merge request STJr/SRB2Internal!207	2018-11-22 11:32:10 -05:00
mazmazz	dd1ecb04cf	Change camera control names to Look	2018-11-22 11:28:32 -05:00
mazmazz	2a5ae054f9	Make movement controls consistent with 2.2	2018-11-22 10:41:21 -05:00
mazmazz	6a3b41ea6f	Let skins jump their regular strength variances in NiGHTS	2018-11-21 21:24:44 -05:00
mazmazz	40eda0e749	Nerf jumping	2018-11-21 21:13:15 -05:00
Digiku	9e75774fd2	Merge branch 'nights-ideyaspawn-dronebox' into 'master' ... NiGHTS: Ideya Anchor Points See merge request STJr/SRB2Internal!160	2018-11-21 21:03:29 -05:00
mazmazz	250aab5889	Missed sign cast	2018-11-21 20:30:26 -05:00
Digiku	c6bd1111e5	Merge branch 'nights-dronebox' into 'master' ... NiGHTS: Drone hitbox improvements and player position correction on Nightserize See merge request STJr/SRB2Internal!158	2018-11-21 20:19:39 -05:00
Steel Titanium	ff9c41ca5f	Merge branch 'master' into cmake-use-internal-libs	2018-11-21 20:05:08 -05:00
Digiku	bb38aa649f	Merge branch 'nov20-build-fixes' into 'master' ... Nov20 build fixes See merge request STJr/SRB2Internal!205	2018-11-21 17:23:20 -05:00
Digiku	e599428442	Merge branch 'debug_stuff' into 'master' ... Debug tweaks See merge request STJr/SRB2Internal!144	2018-11-21 16:41:51 -05:00
Digiku	f3e4cf1f9d	Merge branch 'nights-fastercapsule' into 'master' ... NiGHTS: Faster Egg Capsule destruct sequence See merge request STJr/SRB2Internal!164	2018-11-21 16:30:01 -05:00
Digiku	597877773b	Merge branch 'nights-onfootcapsulefix' into 'master' ... NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS See merge request STJr/SRB2Internal!185	2018-11-21 16:29:37 -05:00
Monster Iestyn	3acc312923	Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.	2018-11-21 20:45:03 +00:00
mazmazz	9bdab67de6	Don't accept KEY_PAUSE for control console command	2018-11-21 11:21:17 -05:00
mazmazz	2acad7ad86	Dont show Hold to Retry HUD when using Pause/Break key	2018-11-21 11:10:18 -05:00
mazmazz	8a9c10e633	Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key	2018-11-21 10:58:07 -05:00
mazmazz	74da082c75	Merge remote-tracking branch 'origin/master' into HEAD	2018-11-20 23:19:36 -05:00
Marco Z	c0df7b47c5	Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes ... # Conflicts: # src/hardware/hw_main.c	2018-11-20 22:42:20 -05:00
Marco Z	ddd357d27c	VC build fixes	2018-11-20 21:54:20 -05:00
mazmazz	0af071dbca	build errors	2018-11-20 20:23:48 -05:00
mazmazz	dcac157ccd	Merge remote-tracking branch 'origin/master' into menu-execs	2018-11-20 18:31:30 -05:00
mazmazz	5870d145b2	Draw connection screen correctly; make scroll speed inherit global setting	2018-11-20 18:13:18 -05:00
mazmazz	094ec7ce3c	Performance improvements ... * Don't loop every frame for menu drawing parameters * Fixed in-game escape menu not dimming correctly * Fixed glitches on default title screen parameters	2018-11-20 17:28:26 -05:00
Monster Iestyn	b2c3a39a2f	I forgot to do this earlier, welp	2018-11-20 21:17:46 +00:00
Monster Iestyn	224c0fccdb	Merge branch 'public_next' ... # Conflicts: # src/Makefile.cfg # src/d_clisrv.c # src/p_setup.c # src/r_segs.c # src/r_things.c	2018-11-20 14:33:10 +00:00
Monster Iestyn	66900c70ee	Merge branch 'master' into next	2018-11-20 13:55:36 +00:00
Monster Iestyn	948466658f	Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master' ... FOF wall rendering fixes and cleanup See merge request STJr/SRB2!317	2018-11-20 08:54:09 -05:00
mazmazz	cfaa017e7d	stray #if to #ifdef	2018-11-19 20:52:01 -05:00
mazmazz	6cc6edc137	Changed Mixer X sources to 2.2.0; added x64 gcc support	2018-11-19 20:51:54 -05:00
Monster Iestyn	2d1f927a17	Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs. ... ...that was a mouthful	2018-11-19 22:12:26 +00:00
Monster Iestyn	418943acdc	change return type of M_CheckMODVersion to boolean	2018-11-19 17:47:23 +00:00
Monster Iestyn	797f9d180e	Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages	2018-11-19 17:46:38 +00:00
Alam Ed Arias	a290c4727b	Merge branch 'master' into Travis_CI-gcc8	2018-11-18 21:23:27 -05:00
Alam Ed Arias	42afd3532d	Merge branch 'master' into next	2018-11-18 20:22:40 -05:00
Alam Ed Arias	0b5069f36c	We need to include the NUL char	2018-11-18 20:21:32 -05:00
Alam Ed Arias	5a09d44fd2	Merge remote-tracking branch 'public/master' into Travis_CI-gcc8	2018-11-18 19:59:21 -05:00
Monster Iestyn	ab39534ef6	Merge branch 'mingw-64bit' into 'master' ... MinGW: Fix compiling on 64-bit Windows. See merge request STJr/SRB2!329	2018-11-18 19:49:18 -05:00
mazmazz	4fa6895f60	Fixed skullAnimCounter type for text prompts	2018-11-18 12:56:37 -05:00
Monster Iestyn	8c71cd0b90	Merge branch 'master' into next	2018-11-18 17:11:57 +00:00
Monster Iestyn	a400bb9ef6	Merge branch 'camera-subsector-crash-fix' into 'master' ... Camera subsector crash fix See merge request STJr/SRB2!318	2018-11-18 08:28:38 -05:00
mazmazz	53b956f540	Mirror a wipe if it's forced off and the counter-wipe is specified	2018-11-18 04:39:34 -05:00
mazmazz	765e4b3134	Compiler fixes	2018-11-18 04:32:38 -05:00
mazmazz	3d1e5fa7e8	Allow inherited wipes when switching menus without a common ancestor (Multiplayer > Server Settings)	2018-11-18 03:32:19 -05:00
mazmazz	5fc91e8405	Fix lingering titlemapcameraref when reloading title screen	2018-11-18 03:19:32 -05:00
mazmazz	3acabdab93	Fix MN_SPECIAL check for menu meta state	2018-11-18 03:19:07 -05:00
mazmazz	3c2d30072e	Allow backgrounds for player select	2018-11-18 02:49:08 -05:00
mazmazz	f3be97a95a	Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too	2018-11-18 02:41:35 -05:00
mazmazz	758647fab2	More title screen features; menu meta state implementation (active and previous menu types) ... * Draw background over titlemap * HIDEBACKGROUND to show titlemap * Specify NOMUSIC or IGNOREMUSIC (to not change music) * Linedef execs implemented for tree hierarchy, including bubbling (NOENTERBUBBLE/NOEXITBUBBLE) * Specify ENTERWIPE and EXITWIPE * Menuid hierarchy fixes (Control mapping, joystick setup) * Time attack handling fixes * Specify custom wipes on runtime for D_Display and P_SetupLevel (for titlemap) * Allow for forcing and skipping a wipe * Wipe utility functions F_GetWipeLength and F_WipeExists	2018-11-17 19:08:30 -05:00
mazmazz	d2bbddbed4	Implemented features ... * M_SkyScroll optimization with still speeds; refactor background drawing * Music (in time attack screens so far) * FadeStrength * HideTitlePics * Scrolling backgrounds in Time Attack (moved F_SkyScroll to m_menu)	2018-11-17 01:21:21 -05:00
mazmazz	1e6369e8de	Implement scrolling menu backgrounds	2018-11-16 18:26:26 -05:00
mazmazz	32dc47207d	Merge branch 'menu-execs' into menu-execs-skyscroll	2018-11-16 15:11:02 -05:00
mazmazz	0e0437b894	Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg	2018-11-16 15:01:28 -05:00
mazmazz	4d3ddda5b5	Sky scroll attempt	2018-11-16 14:34:28 -05:00
mazmazz	9c76c61384	Extra title SOCs: Music and FadeScreen. TitleScrollYSpeed in MainCfg	2018-11-16 14:18:35 -05:00
mazmazz	c4cddf8741	Menumeta iterators	2018-11-16 14:16:41 -05:00
mazmazz	199bc155bc	Make MENU dehacked block top-level; TITLESCREEN is not necessary	2018-11-16 12:12:11 -05:00
mazmazz	15c0bab0c9	Title screen menu SOC	2018-11-16 12:07:47 -05:00
mazmazz	75dab7850f	Refactor MM_ menu types to MN_	2018-11-16 09:56:22 -05:00
mazmazz	3ec96d8b99	Menutypes for dehacked	2018-11-16 09:46:32 -05:00
mazmazz	b69756f5e5	Use bitshifting for menu IDs and hierarchy instead	2018-11-16 09:22:27 -05:00
mazmazz	9dab65fce0	Add MM menutype flags to menu defs	2018-11-15 19:41:27 -05:00
mazmazz	c8f5aa688a	Express menu defs as flags	2018-11-15 19:41:05 -05:00
mazmazz	f7cc62d9d9	Define menu enum, encode hierachy by number places	2018-11-15 15:51:29 -05:00
Steel Titanium	02c08a3e10	Some small changes	2018-11-14 21:01:54 -05:00
Steel Titanium	f02105732e	Fix up compiling on DD version	2018-11-14 18:00:10 -05:00
Steel Titanium	c5a97dcfe6	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit	2018-11-14 17:28:41 -05:00
Alam Ed Arias	4695841b8d	fix format-truncation: need bigger string buffers	2018-11-14 16:50:52 -05:00
Monster Iestyn	09f9572a8f	Merge branch 'master' into next	2018-11-14 21:49:11 +00:00
Monster Iestyn	3e6fcf1b8b	Merge branch 'opengl-hud-scale-fix' into 'master' ... OpenGL HUD scaling fix See merge request STJr/SRB2!320	2018-11-14 16:48:13 -05:00
Alam Ed Arias	fb08950c19	Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length	2018-11-14 16:32:57 -05:00
Alam Ed Arias	4e9fc881a2	Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?	2018-11-14 16:26:46 -05:00
Steel Titanium	1b79b9527c	Properly check if cmake is running on wwindows ... Thanks Monster Iestyn for informing me this is the correct way.	2018-11-14 15:58:45 -05:00
Alam Ed Arias	d4cb81cb28	Merge branch 'master' into next	2018-11-14 15:45:29 -05:00
MonsterIestyn	772c072064	Merge branch 'master' into analog-flipcam-synch-fix	2018-11-14 19:36:39 +00:00
Alam Ed Arias	97fd69951a	Merge branch 'master' into next	2018-11-14 11:07:12 -05:00
Alam Ed Arias	de5b626520	Fix misleading indentation	2018-11-14 11:06:45 -05:00
Alam Ed Arias	f81d01edca	Merge branch 'vc-xpm-fix' into 'master' ... Remove unnecessary SDLCALL from IMG_xpm.c declarations See merge request STJr/SRB2!327	2018-11-14 11:00:20 -05:00
Alam Ed Arias	d14f87b8c6	Cleanup whitespace	2018-11-14 10:54:33 -05:00
Alam Ed Arias	938bf1605c	Merge branch 'master' into next	2018-11-14 10:52:49 -05:00
Alam Ed Arias	f73ea4f984	Clean up warnings	2018-11-14 10:52:16 -05:00
mazmazz	cf834f3503	Line 457: Calculate input angle tolerance correctly	2018-11-14 10:13:39 -05:00
Marco Z	8777d5c6c9	Comment context for declaration changes; remove extern terms	2018-11-14 08:15:38 -05:00
Marco Z	51768e7dd1	Remove unnecessary SDLCALL from xpm declarations	2018-11-14 08:06:07 -05:00
Monster Iestyn	f3b59c1731	Fix VC project files to include hw_clip.c/h	2018-11-14 12:11:57 +00:00
Marco Z	0b97b2a76c	Missed #ifdef HAVE_LIBGME in win_snd	2018-11-13 22:50:08 -05:00
Steel Titanium	2ca5e29110	Make sure the new option only works on Windows. ... Is this how you do it? I'm not really sure.	2018-11-13 20:37:14 -05:00
Steel Titanium	4836e711d3	Fix up 64-bit MINGW	2018-11-13 20:32:18 -05:00
Steel Titanium	d0b64222f7	Merge branch 'master' into cmake-use-internal-libs	2018-11-13 19:46:43 -05:00
Monster Iestyn	302358c403	Merge branch 'mixer-sound-x64-fix' into 'master' ... mixer_sound fix x64 build issue See merge request STJr/SRB2!323	2018-11-13 17:42:23 -05:00
Steel Titanium	9029cf5d9c	Fix skybox disappearing after using objectplace command	2018-11-13 17:25:42 -05:00
mazmazz	2db2b6e6af	Win32 boolean fixes	2018-11-13 17:24:19 -05:00
Steel Titanium	95ed3fcf7e	Save current renderer to screenshots	2018-11-13 17:19:22 -05:00
mazmazz	894ee02f3f	Fix x64 build issue	2018-11-13 17:12:18 -05:00
mazmazz	f2bfed7892	Merge branch 'musicplus-core' into musicplus-sdlmixerx	2018-11-13 14:34:40 -05:00
mazmazz	119cf49452	Merge branch 'master' into musicplus-core	2018-11-13 14:19:04 -05:00
mazmazz	6bb408da08	Remove misplaced tutorialmode = false due to debugging	2018-11-13 14:12:22 -05:00
mazmazz	8f87bf82cd	Merge branch 'master' into musicplus-core	2018-11-13 13:46:30 -05:00
Monster Iestyn	e9fe0ebae1	Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy	2018-11-13 18:14:59 +00:00
Monster Iestyn	0d38061db8	Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode	2018-11-13 18:13:51 +00:00
mazmazz	6c69dd1f78	Merge branch 'master' into text-prompts	2018-11-13 11:12:44 -05:00
Digiku	b6a0b2f1d9	Merge branch 'tutorial-time' into 'master' ... Tutorial mode handling See merge request STJr/SRB2Internal!201	2018-11-13 10:49:02 -05:00
Digiku	fae095f9e8	Merge branch 'control-switching' into 'master' ... Game control switching See merge request STJr/SRB2Internal!202	2018-11-13 10:48:18 -05:00
Digiku	3ccfd57fba	Merge branch 'tracerangle' into 'master' ... Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away See merge request STJr/SRB2Internal!198	2018-11-13 10:48:01 -05:00
Digiku	1b7f7ef7cc	Merge branch 'monitor-exec' into 'master' ... Run linedef exec upon popping a monitor See merge request STJr/SRB2Internal!199	2018-11-13 10:47:37 -05:00
mazmazz	dbb4924348	Compile errors	2018-11-13 10:43:40 -05:00
mazmazz	c1c815ce6e	Compile errors	2018-11-13 10:31:06 -05:00
mazmazz	4b3dff3ef3	Tutorial named tag detection adjustment	2018-11-13 02:00:58 -05:00
mazmazz	3d7b185ea0	Check specifically for gcs_fps when starting tutorial	2018-11-13 01:57:51 -05:00
mazmazz	6f435ee410	F_AdvanceToNextPage adjustment	2018-11-13 01:38:20 -05:00
mazmazz	75c4a96e69	NextTag implementation ... * Adjust named tag implementation to be more portable * Next page adjustments	2018-11-13 00:13:36 -05:00
mazmazz	f4ad5ebfba	text-prompts gclist -> gcl refactor	2018-11-12 23:31:10 -05:00
mazmazz	3a00439f3a	Merge branch 'control-selector' into text-prompts	2018-11-12 23:26:27 -05:00
mazmazz	96da056f81	tutorial-time gclist -> gcl refactor	2018-11-12 23:25:49 -05:00
mazmazz	870ee89371	Merge branch 'control-selector' into tutorial-time	2018-11-12 23:23:52 -05:00
mazmazz	1d86cc348d	Refactor gclists	2018-11-12 23:23:39 -05:00
mazmazz	eb7718bfeb	PicToStart implementation; fix NumPrompts limitation error	2018-11-12 23:16:24 -05:00
mazmazz	d31b4b792b	F_GetTextPromptTutorialTag implementation	2018-11-12 22:47:20 -05:00
mazmazz	a362407886	Merge branch 'control-selector' into text-prompts	2018-11-12 21:11:53 -05:00
mazmazz	7ec4a42d9f	Force chasecam for tutorialmode	2018-11-12 20:37:55 -05:00
mazmazz	a0926b5314	First time tutorial prompt fixes	2018-11-12 19:10:41 -05:00
mazmazz	5200f55e40	Merge branch 'tutorial-time' into tutorial-time-firstprompt	2018-11-12 18:08:48 -05:00
mazmazz	118da60615	Freeze camera values in tutorialmode with proper defaults	2018-11-12 18:08:24 -05:00
mazmazz	a58461c29e	Merge branch 'tutorial-time' into tutorial-time-camera	2018-11-12 17:41:49 -05:00
mazmazz	80c613561c	->defalutvalue -- .defaultvalue adjustment	2018-11-12 17:37:54 -05:00
mazmazz	40e5a2104b	Also set cv_analog for tutorialgcs ... * M_TutorialSaveControlResponse CV_Set adjustment	2018-11-12 17:34:56 -05:00
mazmazz	acd922886a	Change mouse cv vars temporarily alongside control scheme	2018-11-12 17:30:21 -05:00
mazmazz	44b42af22b	Merge branch 'control-selector' into tutorial-time	2018-11-12 17:17:02 -05:00
mazmazz	1a5ccb2781	Uncomment gcs_platform	2018-11-12 17:16:54 -05:00
mazmazz	4986d5945b	Restrict control changes if tutorialgcs is active	2018-11-12 16:56:06 -05:00
mazmazz	45381058b3	Merge branch 'control-selector' into tutorial-time	2018-11-12 16:54:49 -05:00
mazmazz	31c1145cf3	Uncomment gcs_platform defaults	2018-11-12 16:54:42 -05:00
mazmazz	ab084f1bc9	Add tutorialgcs variable for optional control scheme loading	2018-11-12 16:50:03 -05:00
Monster Iestyn	e85f73117c	Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!	2018-11-12 20:07:45 +00:00
Monster Iestyn	63ba59341b	Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing	2018-11-12 16:23:59 +00:00
mazmazz	8f7c1e7f71	Fix CopyControls not firing when starting tutorial while keeping current controls	2018-11-11 23:42:02 -05:00
mazmazz	ce7f168568	Fix PICSMETAPAGE	2018-11-11 14:50:10 -05:00
mazmazz	424bc557c2	Dehacked typos	2018-11-11 14:44:57 -05:00
mazmazz	3f1ade35f3	Merge branch 'tutorial-time' into tutorial-time-firstprompt	2018-11-11 09:37:36 -05:00
mazmazz	703cb6be0f	Check reduced control set for tutorial time; change the entire tutorial control set when prompted	2018-11-11 09:37:19 -05:00
mazmazz	9fc58d0a68	Merge branch 'control-selector' into tutorial-time	2018-11-11 09:35:27 -05:00
mazmazz	c7a855de7a	Split gclist_tutorial_check from gclist_tutorial	2018-11-11 09:35:15 -05:00
mazmazz	3be9981231	Merge branch 'control-selector' into tutorial-time	2018-11-11 09:22:06 -05:00
mazmazz	fd83e1ed5c	num_gclist_tutorial adjustment	2018-11-11 09:21:54 -05:00
mazmazz	c883b13b5d	Merge branch 'tutorial-time' into tutorial-time-firstprompt	2018-11-11 09:21:10 -05:00
mazmazz	54f04fa5cf	Tutorial control message adjustments	2018-11-11 09:15:43 -05:00
mazmazz	ea9f499936	Merge branch 'control-selector' into tutorial-time	2018-11-11 08:57:07 -05:00
mazmazz	181d13fe73	gclist_tutorial include lookup/lookdown for conflict reasons	2018-11-11 08:56:40 -05:00
mazmazz	80b19ff566	gclist adjustments	2018-11-11 08:52:21 -05:00
mazmazz	9ff27ebbae	gclist adjustments	2018-11-11 08:51:51 -05:00
mazmazz	6be583eac6	Merge branch 'control-selector' into tutorial-time	2018-11-11 08:46:06 -05:00
mazmazz	3f72e1bacf	New gclists and const modifier; added tutorialmode declarations to this branch	2018-11-11 08:44:08 -05:00
mazmazz	9f1c40f881	G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)	2018-11-11 08:21:11 -05:00
mazmazz	85bcf6d389	Tutorial mode support for control switching	2018-11-11 08:20:08 -05:00
mazmazz	75fc91644b	G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)	2018-11-11 08:19:44 -05:00
mazmazz	1e00381075	Merge branch 'control-selector' into tutorial-time	2018-11-10 17:30:33 -05:00
mazmazz	775b34e3f2	Made gamecontrol tables more portable ... * G_DefineDefaultControls * G_GetControlScheme * G_CopyControls * G_SaveKeySetting * gamecontrolschemes_e	2018-11-10 17:26:30 -05:00
mazmazz	7deeb8bac4	Stub netgame support; ignore bots on linedef special	2018-11-10 15:34:56 -05:00
mazmazz	0c72d7e70a	Let triggering splitscreen player control the text prompt	2018-11-10 14:47:30 -05:00
mazmazz	80973e8b65	Splitscreen "support" (one prompt only, both players freeze controls)	2018-11-10 14:30:59 -05:00
MPC	eb4a72440a	Render the skies correctly on splitscreen in OpenGL mode	2018-11-10 16:19:41 -03:00
Monster Iestyn	e4f157786c	Merge branch 'public_next' ... # Conflicts: # src/Makefile # src/doomtype.h # src/hardware/hw_clip.c # src/hardware/hw_main.c # src/sdl12/sdl_sound.c	2018-11-10 19:18:34 +00:00
Monster Iestyn	fced19d291	Merge branch 'master' into next	2018-11-10 19:05:33 +00:00
Monster Iestyn	c7e58b7cd5	Merge branch 'opengl-new-clipping-backport' into 'master' ... OpenGL new clipping backport See merge request STJr/SRB2!315	2018-11-10 13:57:16 -05:00
Monster Iestyn	46b58cba55	Merge branch 'alias-recursion-hotfix' into 'next' ... Alias recursion hotfix See merge request STJr/SRB2!314	2018-11-10 13:56:43 -05:00
Monster Iestyn	51df32dd3d	Merge branch 'gcc-compiling-cleanup' into 'master' ... Compiling cleanup and fixes See merge request STJr/SRB2!311	2018-11-10 13:56:17 -05:00
MPC	ff642df1f2	Render the startup screen on OpenGL mode	2018-11-10 15:56:13 -03:00
mazmazz	727ca143b5	Branch G_Controldefault into FPS and PLATFORM	2018-11-10 13:28:10 -05:00
mazmazz	8c6de7ff60	Pictoloop zero-based fix	2018-11-10 12:54:59 -05:00
mazmazz	9a038b28e1	Implemented GFX for text prompts ... * PicMode SOC * PicToLoop SOC	2018-11-10 12:42:13 -05:00
Monster Iestyn	323c89dbaf	fix using abs() on unsigned	2018-11-10 17:40:09 +00:00
Monster Iestyn	dd83652b71	Whoops, this broke my non-NEWCLIP test build	2018-11-10 16:10:25 +00:00
Monster Iestyn	8ba0f2a177	clipping code didn't seem so bad this time (at least compared to without), let's enable it now?	2018-11-10 16:09:52 +00:00
Monster Iestyn	c4569e61a8	Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly ... R_IsEmptyLine is now a thing too btw	2018-11-10 16:09:21 +00:00
Monster Iestyn	1e98e3b4f2	More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now ... Other notes: * on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way * despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall	2018-11-10 16:08:56 +00:00
Monster Iestyn	a733a29f4c	Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least ... Other notes: * Renamed all new functions to have HWR_ prefix instead of gld_, for consistency * HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory * The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included	2018-11-10 16:08:26 +00:00
mazmazz	631c6f93f5	Implement music switching for prompts	2018-11-10 11:05:33 -05:00
Monster Iestyn	896de73c60	....ow this slipup hurt me badly	2018-11-10 16:00:33 +00:00
Monster Iestyn	d456a5362c	Whoops, mucked up this part of the conflict resolving	2018-11-10 15:55:09 +00:00
Monster Iestyn	a8291c122a	adding lua_maplib.c comments for new slope-related userdata types	2018-11-10 15:47:04 +00:00
Monster Iestyn	268bde3fdf	Merge branch 'public_next' ... # Conflicts: # src/d_netcmd.c # src/d_netcmd.h # src/dehacked.c # src/g_game.h # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/lua_baselib.c # src/lua_hook.h # src/lua_hooklib.c # src/lua_hudlib.c # src/lua_libs.h # src/lua_maplib.c # src/lua_script.c # src/m_misc.h # src/p_mobj.c # src/s_sound.c # src/sdl12/mixer_sound.c # src/w_wad.c	2018-11-10 15:41:57 +00:00
mazmazz	3d9ce630d2	SOC for prompt gfx and music	2018-11-10 10:33:58 -05:00
mazmazz	99a0831b0b	Hardcode tutorial prompt offset index	2018-11-10 10:15:16 -05:00
mazmazz	a197c19742	Prompt page string field length adjustment; check empty named tag before prompt search	2018-11-10 09:38:32 -05:00
mazmazz	e1e94c3af2	Added page tags and find page by tag ... * Added tutorial mode defines to this branch	2018-11-10 09:32:53 -05:00
Monster Iestyn	31301660cd	Merge branch 'master' into next	2018-11-10 14:27:27 +00:00
Monster Iestyn	925a56ad98	Merge branch 'opengl-improvements-backport' into 'master' ... Opengl improvements backport See merge request STJr/SRB2!304	2018-11-10 09:25:18 -05:00
Monster Iestyn	e01c7ae743	Merge branch 'copyright-info-update' into 'master' ... Update copyright info See merge request STJr/SRB2!309	2018-11-10 08:33:09 -05:00
Monster Iestyn	2da335a1c4	Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion	2018-11-10 13:08:26 +00:00
mazmazz	28238c41df	WIP: First-time tutorial prompt	2018-11-10 02:30:21 -05:00
mazmazz	ffed9f4d20	Force camera defaults during tutorialmode (doesn't work in all cases)	2018-11-10 01:31:30 -05:00
mazmazz	a542006ae8	Hide Tutorial menu option if no tutorialmap	2018-11-10 01:17:11 -05:00
mazmazz	33a94ba2b8	Prompt HUD hiding implementation	2018-11-10 01:00:18 -05:00
mazmazz	54dc5d1892	Merge branch 'text-prompts' into text-prompts-hidehud	2018-11-10 00:10:42 -05:00
mazmazz	19a8b15912	Actually fix empty prompt text crash	2018-11-10 00:10:16 -05:00
mazmazz	7ac641450f	Text prompt Hide HUD dehacked	2018-11-09 23:50:25 -05:00
mazmazz	9ee894f777	Make gray/black text prompt backcolor darker in OpenGL	2018-11-09 22:52:13 -05:00
mazmazz	7daf5d4727	Set up separate background color for prompts vs. console	2018-11-09 22:38:55 -05:00