Commit graph

5957 commits

Author SHA1 Message Date
GoldenTails
cdaadc0037 Merge remote-tracking branch 'STJrSRB2/master' into patch-1 2018-07-05 16:44:34 -05:00
Monster Iestyn
15812dfb30 Merge branch 'master' into next 2018-07-05 21:09:39 +01:00
Monster Iestyn
2004a852a6 Merge branch 'lua-exploit-fix' into 'master'
Lua exploit fix

See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
MonsterIestyn
e536a5fb28 Merge pull request #264 from LJSonik/password-security-fix
Disable admin password by default
2018-07-05 20:16:19 +01:00
LJSonik
333a98fb59 Merge branch 'master' into password-security-fix 2018-07-05 20:58:00 +02:00
MonsterIestyn
b6881d75db Merge pull request #232 from LJSonik/minor-net-command-fixes
Minor net command fixes
2018-07-05 19:56:17 +01:00
LJSonik
5c246dfcac Merge branch 'master' into minor-net-command-fixes 2018-07-05 20:00:38 +02:00
LJSonik
48a1e4b63c Merge branch 'master' into password-security-fix 2018-07-05 19:46:36 +02:00
Steel Titanium
2075925ac8 Merge remote-tracking branch 'upstream/master' into responsefile-fix 2018-07-05 01:24:51 -04:00
Steel Titanium
6d1a8703c7 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium
deb0d72094 Merge remote-tracking branch 'upstream/master' into defaultsoundvol 2018-07-05 01:22:39 -04:00
Steel Titanium
d47e7014bc Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium
b7776da524 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium
e104e01057 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
Monster Iestyn
56ccf5ab7c Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
Monster Iestyn
1c30318bd3 fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype) 2018-07-02 21:03:04 +01:00
Monster Iestyn
4fc9ec6cba remove MF_RUNSPAWNFUNC from MT_CACOLANTERN 2018-07-02 20:35:39 +01:00
Monster Iestyn
e662d6cbf1 Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore.
Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.
2018-07-01 22:01:00 +01:00
Monster Iestyn
a23d5cf101 huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems 2018-07-01 19:47:26 +01:00
Monster Iestyn
a1f742a0d4 Fix special stage map end var defaults to use the correct map numbers 2018-06-30 18:14:04 +01:00
Monster Iestyn
90b56b7386 Don't re-enable MD5 checks yet, we're not even near RC phase yet 2018-06-30 18:09:39 +01:00
Monster Iestyn
28702eeed1 Merge branch 'master' into next 2018-06-27 15:06:12 +01:00
Monster Iestyn
c5a82d22c9 Merge branch 'mp-menu-playername-fix' into 'master'
Multiplayer menu playername fix

See merge request STJr/SRB2!256
2018-06-27 10:01:39 -04:00
Monster Iestyn
e3616de7de Fix OpenGL completely missing the ability to alter FOF wall pegging by lower unpegged flag. Stupid OpenGL.
Sorry in advance Lat'!
2018-06-26 21:41:05 +01:00
Monster Iestyn
cb7a46a33d Merge branch 'master' into fof-slope-skew-backport 2018-06-26 20:11:08 +01:00
Monster Iestyn
4eb2ccfae9 fix the multiplayer menu not allowing the full max length for player names unlike the "name" console command 2018-06-26 17:46:04 +01:00
Steel Titanium
492eeb7009 Deallocate when I_Quit() is called instead. 2018-06-23 15:09:11 -04:00
Steel Titanium
78d4f90747 Remove free() call from the function 2018-06-23 14:39:26 -04:00
Monster Iestyn
609cc16b1e Fix HWR_ProjectSprite to check properly whether the displayed player's mobj or its subsector exists, to avoid a crash when checking for fake planes. (also use viewplayer since its available to use, silly hardware code)
Also tweaked a weird splitscreen check in HWR_DrawSpriteShadow; still investigating whether stplyr is ever not player 2 when it's player 2's view, but this looks better for now
2018-06-23 18:47:32 +01:00
Monster Iestyn
62dcc48631 Merge branch 'precipmobj-fix' into 'master'
Add sprite2 to precipmobj_t

See merge request STJr/SRB2Internal!150
2018-06-20 08:25:40 -04:00
MascaraSnake
4993add019 Added sprite2 to precipmobj_t 2018-06-20 14:04:49 +02:00
toaster
4c3be6a577 Rework software coronas a bit, apply them to the flame and flame holder too, and spawn them only if MTF_EXTRA is given. 2018-06-19 23:16:49 +01:00
toaster
af3c0bc8e4 * Fix nextstate, radius, and painchance of fire torch decoration.
* Fix waving flag object type's... flags. *womp womp*
2018-06-19 21:58:49 +01:00
toaster
e22f158453 Some cvar fudging.
* Turn off mlook and mousemove by default, as requested by Prime/Mystic.
* Change all the analog cvar names (and hide them from the help function so they aren't so easily rediscovered) to invalidate 2.1-era copies of config.cfg, given I've seen a common sentiment is that they won't try the new controls at all and will just copy their old ones across, and I'd like to sabotage the deprecated feature.
2018-06-18 17:39:34 +01:00
toaster
95ba75629a Major refinement of Add-ons menu!
* Kill addonsresponselimit, which was a hacky solution to a stupid problem. Instead...
* Allocate and consistently handle memory to store the name of an added file so we can reference it directly.
* Replace the choice between ./ and a custom folder with the full, standard assortment of Default (usehome ? SRB2HOME : SRB2PATH), HOME (SRB2HOME), SRB2 (SRB2PATH) or Custom (cv_addons_folder.string).
* Make these render as the name plus folder, since you can't go UP... from the top level.
* Make the path seperators consistently system-based re PATHSEP. (Quite frankly, I'm surprised it even worked in the first place...)
2018-06-18 16:55:34 +01:00
toaster
06e9b320d5 Not necessary on-topic devwork, but using global variables I developed in internal to make there less code repetition/iteration in the WAD limit checks. 2018-06-18 12:49:06 +01:00
toaster
ac727d5772 Improve the tempname position-keeping behaviour significantly, hammering out a potential crash bug too. 2018-06-18 11:22:57 +01:00
toaster
320959255e Revamp of addons menu search!
* Instead of iterating through the folder every time you change the search query by one letter, iterate through the "coredirmenu" (the game's interpretation of the folder) instead. MUCH, much less likely to lag to fuck and back.
* Hide a bit of complexity in filesrch.c instead of having the entire thing exposed to mess with. For example, closefilemenu() instead of manually freeing the struct each time.
* Refactor some stuff.
2018-06-17 18:45:03 +01:00
Steel Titanium
68037d15a3 Update copyright 2018-06-17 00:09:35 -04:00
Steel Titanium
8c40c84bd8 Fix M_FindResponseFile returning garbage data 2018-06-16 23:44:28 -04:00
toaster
0ce1e60519 Correct some minor deficiencies in the hold-for-retry system in record attack. 2018-06-15 21:42:36 +01:00
toaster
4d551e8845 Minor modifications to the intro text. 2018-06-14 22:23:55 +01:00
toaster
b565e537a8 * Make the OpenGL loading screen work with the fades better.
* Make the closed captions not mess with fades, and improve their movement calculation.
2018-06-14 22:23:20 +01:00
Monster Iestyn
71d2280020 Added linedef 447 as the change colormap linedef exec special.
IMPORTANT NOTE: UNTESTED
2018-06-14 21:51:21 +01:00
Monster Iestyn
18aa5bda18 Merge branch 'master' into leveltitle-tinkering
# Conflicts:
#	src/hu_stuff.h
#	src/st_stuff.c
2018-06-14 21:26:44 +01:00
toaster
de91c0e846 * Level title movement begins before the fade in!
* https://cdn.discordapp.com/attachments/400761370800422922/456833651645349888/srb20051.gif
* Fix some wipe bugs.
	* Solved that thing where there was no fade between two back-to-back cutscenes.
	* Fixed there being no effective wipe between the end of the vanilla intro cutscene and the title screen.
	* Smoothed out the behaviour of titlemap fades to prevent conflicts.
* [COMPLETELY UNRELATED] Kill the pause graphic and replace with a blue box with text in it, like what happens when the window loses focus. Much harder to miss.
2018-06-14 20:17:31 +01:00
toaster
bdee4dd694 Improve retrying text presentation.
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
2018-06-14 14:41:14 +01:00
toaster
f080921305 * Hold the pause button to restart a record attack run!
* Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif
* Show powerup display in singleplayer even while holding Game Status button.
2018-06-14 00:58:28 +01:00
toaster
d655359544 Fixing dehacked.c consistency. 2018-06-13 18:10:32 +01:00
toaster
25ac5a9bf4 * Record attack tab-HUD tweaks.
* Do not subtract a life when retrying if you have infinite lives.
2018-06-13 17:52:23 +01:00