stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-23 11:10:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
4039 commits 172 branches 41 tags 285 MiB
Commit graph

3423 commits

Author SHA1 Message Date
Monster Iestyn
8556a05668 Fix SOC/Lua loading messages to display full names or even display at all (for PK3s at least), and otherwise some cleanup of existing code for the messages. 
Also, I moved lua_lumploading on/offing to LUA_LoadFile.
 2018-02-09 22:43:08 +00:00
Monster Iestyn
bf88407d00 Make sure both software and OpenGL ignore patches that are completely out of a multi-patch texture's bounds. 
This fixes OpenGL in particular crashing because of such a weird situation.
 2018-02-09 17:23:35 +00:00
Monster Iestyn
f12530a39f Merge branch 'master' into hardcoding-time-again 2018-02-08 20:33:17 +00:00
Monster Iestyn
b533d36143 Merge branch 'master' into file-loading-cleanup 2018-02-08 20:32:59 +00:00
Monster Iestyn
b1695de124 Merge branch 'public_next' 2018-02-08 20:31:53 +00:00
Monster Iestyn
c42c70cb34 Merge branch 'playdemo-custom-home-fix' into 'next' 
Fix for "playdemo" not working with custom home paths

See merge request STJr/SRB2!221
 2018-02-08 15:29:39 -05:00
Monster Iestyn
fbd4ce1d47 optimised R_ExpandPlane too 2018-02-07 18:11:32 +00:00
Monster Iestyn
efe9204f78 Fixed sky-sky thok barriers showing HOM (turns out the floor and ceiling share the same plane, so I've modified the code to account for this) 
Additionally, place some optimisations in both software and OpenGL; in particular one has been added for when all of back and front sector (floor and ceiling) is sky: since everything is "open" anyway, we can simply the usual checks involved.
 2018-02-07 17:46:01 +00:00
Steel Titanium
0cc4b8d6db Smoother MD2 interpolation 2018-02-06 14:50:08 -05:00
Monster Iestyn
493af49a00 Correct backwards skies for OpenGL too 2018-02-03 21:39:36 +00:00
Monster Iestyn
33a538383f Added proper support for upside-down thok barriers, in both renderers 
Thankfully it was really just a copy+paste of the code I already tinkered with for the normal ceiling sky based thok barriers, but tweaked for floors instead
 2018-02-03 19:48:18 +00:00
Monster Iestyn
0dc867c05e Cleanup of the code I've tweaked for skies, added SLOPEPARAMS macro to R_StoreWallRange for use in getting seg end z positions 2018-02-03 18:30:49 +00:00
Monster Iestyn
ecf2eed37f Pushing all my work to make OpenGL consistent with my changes to software's sky so far 2018-02-01 22:04:04 +00:00
toasterbabe
5adfdf9516 cv_playername already has a valid default value of "Sonic". We do NOT need to expose things like this. 2018-01-30 22:48:53 +00:00
toasterbabe
8090ea4ed0 Stop leaking names. 2018-01-30 21:25:28 +00:00
Monster Iestyn
9e4c985d70 some cleanup of software's seg rendering code, moved Red's polyobject plane hack to R_StoreWallRange since it doesn't actually need to be done every column draw 
(I suspect polyobject planes don't actually need the minx/maxx hacks anymore, but I haven't the time to test that tonight nor is this branch really suited for it anyway)
 2018-01-29 22:05:04 +00:00
Monster Iestyn
7d150485c9 More sky fixes for software: 
* Thok barriers with slopes now render fine in software
* The solid "sky walls" between different-height thok barriers adjacent to each other are gone. Forever.
 2018-01-28 22:08:58 +00:00
Monster Iestyn
5c70d6e6ca Fix skies in software being displayed backwards 
(I'll get round to OpenGL later)
 2018-01-27 19:29:41 +00:00
Monster Iestyn
f6c740840a Move sky plane-drawing code from R_DrawPlanes to a new function called by R_DrawSinglePlane 
This potentially allows FOFs and polyobjects to display sky flats on them properly, unless skyboxes are involved in which case they'd fail either way

I also updated or added comments to some places of the sky drawing code and related where useful
 2018-01-27 19:18:17 +00:00
toasterbabe
eba0978a00 RIP smiles 2018-01-24 02:07:30 +00:00
toasterbabe
ab0296d1c1 Added a failure animation if you don't get the emerald. https://cdn.discordapp.com/attachments/402861856219463681/405477752972509185/srb20004.gif 2018-01-23 23:13:56 +00:00
toasterbabe
dd3b39089f * Improve the rendering of emerald coinboxes. 
* Make emeralds fall onto the end tally. https://cdn.discordapp.com/attachments/400761370800422922/405122775272128512/srb20003.gif
 2018-01-22 23:29:57 +00:00
Monster Iestyn
c0bb511c1f Hardcoded LUA_THZT from THZ1.wad, giving us the funny-looking steam whistle tree 
This concludes hardcoding of scenery items for THZ
 2018-01-22 18:41:14 +00:00
toasterbabe
dca107f630 * Update V_DrawCroppedPatch and V_DrawFill to support V_PERPLAYER. 
* Fix some mistakes in the comments for v_video.h.
 2018-01-21 12:56:38 +00:00
toasterbabe
373bb329a2 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff 2018-01-20 22:18:16 +00:00
toasterbabe
2141754e54 V_PERPLAYER. (Hooh boy.) 
* Completely redid how splitscreen works, with eventual support for quads. Squish per-player stuff automatically into the right places! Works in GL, associated flag kills V_SPLITSCREEN.
* Seriously update the lives-drawing function for all gametypes, with strings that replace the lives number whenever it's missing (deprecates SKINNAMEPADDING).
* Improved how the nosshack works, alongside many other refactorings.
 2018-01-20 22:14:24 +00:00
Monster Iestyn
0f99fdadd1 Merge branch 'next' into lua-archive-crash-hotfixes 2018-01-20 21:33:03 +00:00
Monster Iestyn
fa3998e942 Some fixes to prevent bad table key types causing Lua panic errors for joining players in netgames: 
* ArchiveTables: print an error if invalid key, to alert script author potentially
* UnArchiveTables: if the key is found to be nil after reading key and value, print an error and don't set them in the table
 2018-01-20 21:18:16 +00:00
Monster Iestyn
82ac8b6a1c Hardcoded SOC_FWR6 from THZ1.wad, also tweaked MT_THZFLOWERB's hitbox 2018-01-19 17:56:18 +00:00
Monster Iestyn
0ef7aff5c0 Prevent SV_SpawnPlayer from being able to freeze the game if gametic is 0. Additionally add a sanity check to prevent the loop going on more than necessary anyway 
This commit fixes -playdemo and -timedemo params for command line, allowing them to actually work again
 2018-01-16 15:21:49 +00:00
Monster Iestyn
87aa9175a1 Merge branch 'master' into hardcoding-time-again 2018-01-13 17:49:44 +00:00
Monster Iestyn
f1b8e122a2 Fix missing semicolon 2018-01-12 20:05:09 +00:00
Monster Iestyn
602701d6dd G_DoPlayDemo: prepend srb2home to the demo name (if an external file) so that demos in custom home paths can be loaded 2018-01-11 16:55:42 +00:00
Monster Iestyn
ddf82949bf W_IsLumpWad: check if the file is a PK3, so it can bail out if it isn't 2018-01-10 19:13:29 +00:00
Monster Iestyn
0c89853425 created W_IsLumpWad as a shortcut for the "is the lump a WAD" checking in the code getting map data lumps 2018-01-10 16:51:23 +00:00
Monster Iestyn
19e08584a3 add support for maps-in-WADs-in-pk3s to P_NetArchiveWorld as well 2018-01-10 15:24:24 +00:00
Monster Iestyn
9c13cee9f0 Hack up support for pk3s in Custom FOF setup, fix stray ! preventing blockmap from loading 2018-01-09 22:22:10 +00:00
Monster Iestyn
db23cfc916 Same has been done for REJECT now 2018-01-09 21:33:10 +00:00
Monster Iestyn
2d98da3bcb Added support for loading BLOCKMAP lumps from MAPXX.wad maps in /Maps/ in PK3s 2018-01-09 19:43:59 +00:00
Monster Iestyn
0e8db59f4b P_AddWadFile: for both WADs and pk3s, if a sound is found to replace an existing sound, don't go on looking for more with the same name (since there shouldn't be any) 2018-01-04 21:06:26 +00:00
Monster Iestyn
03020036d4 Merge branch 'master' into file-loading-cleanup 2018-01-04 20:17:19 +00:00
Monster Iestyn
b0d0738fb6 P_AddWadFile: Remove useless firstmapname param, clean up map searching code 2018-01-04 20:15:44 +00:00
Alam Ed Arias
f9a0ef517d Use playersprite_t 2018-01-04 14:49:26 -05:00
Alam Ed Arias
5cce6101cc Merge branch 'public_next' into private 2018-01-04 14:32:27 -05:00
Alam Ed Arias
82f2f2f2f9 SDL: disable check for noreturn 2018-01-04 14:29:29 -05:00
Alam Ed Arias
30549addf3 Undo signed mess 2018-01-04 14:26:16 -05:00
Monster Iestyn
29d605a104 clarify this comment a little better 2018-01-04 15:17:32 +00:00
Monster Iestyn
6590d97338 clean up CM_LZF code in W_ReadLumpHeaderPwad 2018-01-04 15:14:53 +00:00
Monster Iestyn
8d07e2f8be Merge branch 'master' into file-loading-cleanup 2018-01-02 18:46:02 +00:00
Monster Iestyn
2e3eade637 Merge branch 'master' into hardcoding-time-again 2018-01-02 18:36:42 +00:00
Alam Ed Arias
75abd428fc MSVC2015: fixup 2018-01-02 13:22:10 -05:00
Monster Iestyn
61176ee736 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
#	src/win32/win_vid.c
 2018-01-02 17:32:24 +00:00
Alam Ed Arias
1ab5273400 Merge branch 'master' into next 2017-12-27 19:34:28 -05:00
Alam Ed Arias
f647989433 MSVC: set SubSystem on DLLs to Windows 2017-12-27 19:32:38 -05:00
Monster Iestyn
d937f6fc8b Merge branch '2.1.20-preparation' into 'next' 
2.1.20 preparation

See merge request STJr/SRB2!215
 2017-12-27 16:53:43 -05:00
Monster Iestyn
5400beb2e3 Merge branch 'master' into next 2017-12-27 21:51:11 +00:00
Monster Iestyn
afcdb5cd1e Merge branch 'restartaudio' into 'master' 
Add command to restart the audio system

Closes #27

See merge request STJr/SRB2!214
 2017-12-27 16:47:50 -05:00
Steel Titanium
875446295b Remove redundant !dedicated check 2017-12-27 16:36:57 -05:00
Alam Ed Arias
f9388eab1b Merge branch 'master' into next 2017-12-27 15:50:31 -05:00
Monster Iestyn
fa507ee939 Merge branch 'respawnspecials-mobjtype-hotfix' into 'next' 
P_RespawnSpecials mobj type hotfix

See merge request STJr/SRB2!217
 2017-12-27 15:47:44 -05:00
Monster Iestyn
a87eec89ff Merge branch 'airbob-fix-backport' into 'next' 
Airbob fix backport

See merge request STJr/SRB2!219
 2017-12-27 15:46:39 -05:00
Steel Titanium
3856165623 Indentation cleanup 2017-12-27 13:18:20 -05:00
Alam Ed Arias
f397b5fc3f Makefile: disable win_dbg for DirectDraw 2017-12-26 20:42:37 -05:00
Alam Ed Arias
a29203acd8 Disable win_dbg 2017-12-26 20:24:08 -05:00
Alam Ed Arias
e2b604fdfd TCP: remove BADSOCKET 2017-12-26 19:56:50 -05:00
Monster Iestyn
6886a29e99 Merge branch 'master' into next 2017-12-24 20:06:33 +00:00
toasterbabe
a1620b709e Fix airbob sectors fucking up when below 0 z-height. 2017-12-20 21:13:24 +00:00
toasterone
ff745531b0
Merge branch 'master' into addfile-netgame-fixes 2017-12-20 20:58:45 +00:00
Monster Iestyn
d576453b56 Command_Addfile: add "too many files" and already-loaded checks and respective error messages 
No more shall the server be kicked from their own servers for re-adding a wad by accident!
 2017-12-18 21:17:37 +00:00
LJSonik
36ce6579b7
Merge branch 'master' into download-freeze-fix 2017-12-18 21:39:16 +01:00
Louis-Antoine
47481804da Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix 2017-12-18 21:38:10 +01:00
Louis-Antoine
c8e9e779e7 Add a short comment to explain the newplayernum hack 2017-12-18 21:35:02 +01:00
Alam Ed Arias
57a7a3bed8 Merge branch 'master' into next 2017-12-17 22:22:57 -05:00
LJSonik
084a534f6a
Merge branch 'master' into download-freeze-fix 2017-12-17 22:48:13 +01:00
LJSonik
9c7ff6e0c3
Merge branch 'master' into resynch-fixes 2017-12-17 22:47:23 +01:00
Monster Iestyn
c7cd64583d Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case 2017-12-17 20:59:24 +00:00
Monster Iestyn
ec10367856 Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console. 
This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
 2017-12-17 20:57:45 +00:00
Alam Ed Arias
baf227175b Merge branch 'master' into next 2017-12-16 18:16:15 -05:00
Alam Arias
703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix 
Fix for window being offcenter
 2017-12-16 18:15:00 -05:00
Alam Ed Arias
bd86f98822 Merge branch 'master' into next 2017-12-16 16:07:31 -05:00
Louis-Antoine
4ea5d2df01 Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix 2017-12-15 22:06:03 +01:00
Louis-Antoine
beb9b0f103 Return for both players and mobjs if they've got an empty table, instead of just mobjs 2017-12-15 22:02:34 +01:00
LJSonik
b994180927
Merge branch 'master' into net-archive-fix 2017-12-15 20:07:44 +01:00
Louis-Antoine
0b836a9841 Fix missing lua_pop in ArchiveExtVars 2017-12-15 16:31:27 +01:00
Monster Iestyn
ac3fef15eb Rob is now in charge of Mod IDs, change MODID comment in doomdef.h to reflect this 2017-12-13 19:07:02 +00:00
Louis-Antoine
4e89c03b0f Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à$%@ 2017-12-12 23:08:18 +01:00
Louis-Antoine
16b8265c6e F stands for Fun. You want more Fun, don't you? 2017-12-12 22:48:08 +01:00
toasterbabe
336a26602d Not strictly pretty, but fixes a bug I discovered whilst working on this. 2017-12-10 14:35:55 +00:00
toasterbabe
ce724a6138 * Make lives pic appear in all gametypes. 
* Lives position now more consistent between players in splitscreen.
* Ringslinger weapon bar is now at the same height as the lives pic, and also more centered horizontally.
* Begin tweaking emerald icon locations for ringslinger gametypes.
* Remove in-game team names from team gametypes, since this information is (mostly) conveyed by the lives pic.
 2017-12-09 23:08:12 +00:00
toasterbabe
3d4adaac09 my mistake 2017-12-09 18:48:25 +00:00
Monster Iestyn
a79d064d15 The contents of DSZ-f16.wad's LUA_A000 Lua script are in now 
Thing type numbers may be changed later
 2017-12-08 18:26:32 +00:00
Monster Iestyn
75bc76e9b4 Remove all traces of "srb2.wad" support, since it is no longer needed now that srb2.pk3 is the IWAD (...IPK3?). srb2.wad cannot exactly be a pk3 file after all. 
Additionally, rename any remaining "srb2.srb" to "srb2.pk3" in the main source code files. Not sure whether to bother dealing with srb2.srb/srb2.wad mentions in project files for now.
 2017-12-07 18:26:12 +00:00
toasterbabe
e63c1d15d8 * Show an emerald token box on the tally screen. 
* Change the horizontal spacing of the emeralds on the special stage tally screen.
* (unrelated) Fix a reference to srb2.srb instead of the now-correct srb2.pk3.
 2017-11-17 23:02:34 +00:00
Monster Iestyn
91097fb48e added RET_SOC and RET_LUA, so we can load SOC/LUA files differently to WADs 
this also means we can remove a few ancient hacks relating to using the same code used to load SOC/Lua in WADs for loading standalone Lua/SOC files, though I haven't fully done this yet
 2017-11-10 22:36:37 +00:00
Steel Titanium
e61549d81f Opps, forgot to change this. 2017-11-08 14:50:27 -05:00
Steel Titanium
55c86f3e15 Successful attempt at restarting the music 2017-11-08 14:48:05 -05:00
Monster Iestyn
7cb0138293 Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
Steel
dbbbc1cc06
Merge branch 'master' into window_center_fix 2017-11-08 00:32:23 -05:00
Steel Titanium
c1405137ec Extra tab space to make the compiler happy 2017-11-07 23:48:03 -05:00
Steel Titanium
4f8b91c770 Attempt to restart music 2017-11-07 16:26:45 -05:00
Louis-Antoine
67aba2648c Fix download freezes (well, most of them) 2017-11-03 22:58:47 +01:00
Alam Ed Arias
7f4424b4a0 whitespace cleanup 2017-11-02 23:13:34 -04:00
Alam Ed Arias
3e3065f67c Move FindFolder 2017-11-02 23:09:52 -04:00
toasterbabe
c89b1ec234 Always allow the first singleplayer level in the MP level platter. 2017-11-02 21:20:55 +00:00
toaster
7d15afe6fb Merge branch 'md2_interpfix' into 'master' 
(re-)fix MD2 interpoleration.

See merge request STJr/SRB2Internal!128
 2017-11-02 16:47:24 -04:00
toaster
82a868ec8f Merge branch 'lua-sector-find-funcs' into 'master' 
Lua sector find funcs

See merge request STJr/SRB2Internal!127
 2017-11-02 16:46:16 -04:00
toaster
b302607c2e Merge branch 'nights_colours_again' into 'master' 
More NiGHTS tweaks

See merge request STJr/SRB2Internal!125
 2017-11-02 16:45:09 -04:00
toaster
29c3ff1c0e Merge branch 'demo_shit' into 'master' 
Demo shit

See merge request STJr/SRB2Internal!123
 2017-11-02 16:44:13 -04:00
toaster
c84d4261d1 Merge branch 'unca_scrooge' into 'master' 
The hardcoded part of ACZ3 so far

See merge request STJr/SRB2Internal!124
 2017-11-02 16:43:11 -04:00
toasterbabe
2a42291b30 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 
# Conflicts:
#	src/d_netcmd.c
 2017-11-02 20:39:07 +00:00
toaster
49a1266ccc Merge branch 'sal-misc-stuff' into 'master' 
Sal misc stuff (state overwriting, gamepad tweaks)

See merge request STJr/SRB2Internal!116
 2017-11-02 16:35:12 -04:00
toaster
605e51f6f3 Merge branch 'more_about_menus' into 'master' 
More about menus

Closes #72

See merge request STJr/SRB2Internal!122
 2017-11-02 16:31:51 -04:00
toaster
927e74e406 Merge branch 'FileManagement' into 'master' 
File management - PK3 support.

See merge request STJr/SRB2Internal!121
 2017-11-02 16:27:54 -04:00
toasterbabe
05832e66a3 Fix unmatched readfixed (by replacing). 2017-11-02 19:38:21 +00:00
toasterbabe
b2d43cc56b (re-)fix MD2 interpoleration. 2017-11-02 14:33:56 +00:00
Monster Iestyn
2cccb81d7f Merge branch 'master' into lua-sector-find-funcs 2017-11-01 19:14:44 +00:00
Monster Iestyn
5faf263f1f Merge branch 'gametype-strings' into 'master' 
Gametype strings

See merge request STJr/SRB2Internal!113
 2017-11-01 14:47:45 -04:00
Monster Iestyn
477ee6e073 Merge branch 'lua-action-userdata' into 'master' 
Lua action userdata

See merge request STJr/SRB2Internal!112
 2017-11-01 14:45:03 -04:00
Monster Iestyn
b52c843139 Merge branch 'public_next' 2017-11-01 18:39:25 +00:00
Monster Iestyn
d61105fcce Merge branch 'master' into next 2017-11-01 18:36:48 +00:00
Monster Iestyn
fbe5654477 add quick error messages to make toaster happy 2017-11-01 17:11:10 +00:00
Monster Iestyn
a244948f21 fix action_call index numbers for the args, add missing breaks after LUA_TUSERDATA code in infolib (I am dumb dumb dumb dumb dumb dumb) 2017-11-01 16:52:12 +00:00
Monster Iestyn
42b955f4ca getActionName: added support for custom actions (A_ prefix functions only) 2017-10-31 16:47:24 +00:00
toasterbabe
811fd5f9bc * Change the NiGHTS link text colour list. Again. 
* Make the NiGHTS link text pulse, like in the original game!
* Fix going from NiGHTS special stage as Smiles to a normal level losing your followitem.
 2017-10-31 15:47:58 +00:00
toasterbabe
ead8fd6bf7 Update some strings that say "joystick". 2017-10-30 23:23:52 +00:00
toasterbabe
2458c06f5b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into sal-misc-stuff 
# Conflicts:
#	src/g_game.c
 2017-10-30 21:42:38 +00:00
Monster Iestyn
bfca420f47 Merge branch 'master' into gametype-strings 2017-10-30 21:34:16 +00:00
Monster Iestyn
440ada120d Merge branch 'master' into lua-action-userdata 2017-10-30 21:33:40 +00:00
toasterbabe
4d82a76e5b Move R_AddSpriteDefs back into place. 2017-10-30 21:07:17 +00:00
toasterbabe
d4e08551bf * Make P_LoadVertexes a wrapper for P_LoadRawVertexes. 
* Remove extraenous R_ClearTextureNumCache from P_LoadSidedefs2.
* Remove regressions in comments/#includes.
 2017-10-30 20:54:14 +00:00
Monster Iestyn
1d11797b47 Added six new functions from p_spec.c/h to Lua 2017-10-30 20:09:41 +00:00
Monster Iestyn
2b1fb67a5f DrawMD2i: change duration and tics to INT32, fix up any related code 2017-10-30 19:12:51 +00:00
toasterbabe
3994697fbd Fix all NiGHTS demo desyncs! (More specifically: compare with d_netcmd.c's order of operations - it's skin change, then g_initnew, then demo start, NOT g_initnew then skin change then demo start!!!!! 2017-10-30 14:20:36 +00:00
toasterbabe
548c120534 Since they give points now, make tokens spawn in record attack (and not add end-of-act tokens/continues). 2017-10-29 13:41:02 +00:00
Steel Titanium
97445f941a Add command to restart the audio system 2017-10-29 01:09:34 -04:00
Steel Titanium
799a819ee9 Merge remote-tracking branch 'upstream/master' into window_center_fix 2017-10-29 00:00:11 -04:00
Alam Ed Arias
6a639dd717 Merge branch 'master' into md2-interpolation-fix 2017-10-28 18:47:20 -04:00
Alam Ed Arias
d2f922a981 Merge branch 'master' into next 2017-10-28 18:46:10 -04:00
Alam Ed Arias
cf10b55be0 Win32: pragma hell 2017-10-28 18:39:42 -04:00
Alam Ed Arias
3ecc304332 Win32: just ignore format overflows 2017-10-28 18:33:47 -04:00
Alam Ed Arias
0250040a5b Win32: all fails of DD and try more to stop format-overflow errors 2017-10-28 18:24:07 -04:00
Alam Ed Arias
a4072260db Win32: try to fix up CD printf code 2017-10-28 18:13:59 -04:00
toasterbabe
efc4d2f81d * Make multiple ANIMDEFS lumps get loaded. 
* Refactor the multiple TEXTURES lump code.
 2017-10-28 17:12:08 +01:00
Alam Ed Arias
ce40c00b7a Build: do not error on FALLTHURs 2017-10-27 19:49:55 -04:00
toasterbabe
ee4b891318 Since I'm on the branch: bugfix a thing with introchanged/titlechanged. 2017-10-27 22:08:01 +01:00
toasterbabe
f512b64563 Fix some mistakes when updating the function signature. 2017-10-26 17:30:08 +01:00
toasterbabe
df1e5eb9b7 * Optimise the new static code further. 
* Update all the other V_DrawCroppedPatch calls to match the new behaviour.
* Fix the OGL version of V_DrawCroppedPatch to match the new behaviour.

(To justify my changes: It's not exposed to Lua, and the function signature was a mess. This way it's easier to mentally map how it would work.)
 2017-10-26 16:59:02 +01:00
toasterbabe
b2e89f6832 WOOPS CAN'T UPDATE THE PLAYSIM RANDOM SEED IN A MENU 2017-10-26 11:45:08 +01:00
toasterbabe
4a4ba228df Per request, remove the "/ * ACTION" stuff 2017-10-25 23:34:20 +01:00
toasterbabe
9a10dfeaee Replaced the laggy randomised-at-runtime static with sufficiently random low-impact pregenerated static. Requires new patch.dta. https://cdn.discordapp.com/attachments/293238104096112641/372770688890830859/srb20003.gif 2017-10-25 16:40:21 +01:00
toasterbabe
9ffb5c0fb0 Since Mystic complained, moved the right-aligned Rings to a special "Mania" HUD mode. 2017-10-25 11:54:21 +01:00
Monster Iestyn
0cc8fbdb4e Don't use interpolation code if the frame lasts instantaneously or infinitely 
Also removed the + 1 from newtime, since there was never really any need for it. It just offset the interpolation so it went like (1 -> 2] instead of [1 -> 2), so you never saw the base appearance for each frame except at the end of any frames interpolating to it

Changed DrawMD2Ex's duration/tics type to INT32 so -1 comparisons work, probably want to change the signs elsewhere too but this is fine for now
 2017-10-24 20:45:55 +01:00
toasterbabe
d1e007ef8d Change the little green light symbol on the save to indicate modifiedgame. 2017-10-24 00:06:13 +01:00
toasterbabe
65e3cdc1fb Fix Autobrake/analog not showing up properly in record attack mode. 2017-10-23 23:29:55 +01:00
toasterbabe
3a96c507a2 * Made PK3s fail the music lump check, because... that method of checking doesn't really work with it. 
* Improve the output of listwad to identify unimportant, non-networked files. https://cdn.discordapp.com/attachments/237467298590490625/371314970002063370/srb20044.png
* Fixed mainwads being one too high due to the removal of rings.dta.
 2017-10-21 16:18:28 +01:00
toasterbabe
50d6208913 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-10-21 14:28:44 +01:00
toasterbabe
eea5c9d56a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into unca_scrooge 
# Conflicts:
#	src/dehacked.c
#	src/info.h
#	src/p_enemy.c
 2017-10-21 12:48:41 +01:00
toasterbabe
49aa6ee339 Tweak to modifications to new level select. 2017-10-18 22:18:43 +01:00
toasterbabe
8372bde91b Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 2017-10-18 21:02:50 +01:00
toasterbabe
9f46f84132 Disable REDXVI cheat by default. 2017-10-18 21:02:43 +01:00
toasterbabe
77bcb5d502 Slow the flash. 2017-10-18 16:22:18 +01:00
toasterbabe
5c4247dd61 Allow for the combination of NiGHTS and record attack HUD. 2017-10-18 13:58:16 +01:00
toasterbabe
0fe1f9d63b * "BAD DEMO!!" and "ANALOG" attachments to the input viewer 
* Minor refactor
 2017-10-18 13:22:57 +01:00
toasterbabe
c7b2c43ae5 Record attack input display! 
https://cdn.discordapp.com/attachments/293238104096112641/369485020038955008/srb20041.gif
 2017-10-16 16:25:31 +01:00
toasterbabe
04160f0081 Fixed the smilestails/any other followmobj not spawning at leveltime 0 in a fresh record attack boot! 2017-10-15 13:51:20 +01:00
toasterbabe
a4f10a4b96 Fixed replays of skins whose realnames differed from their normal names from not being readable (by fixing the writing). 2017-10-15 12:35:49 +01:00
TehRealSalt
f0b938eb98 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff 
# Conflicts:
#	src/p_saveg.c
 2017-10-14 16:20:56 -04:00
TehRealSalt
8a676d8aa4 Added movebob removed viewheight 
"movebob" lets you determine the strength of movement bobbing (does not
affect landing delta, that's technically not movement bobbing :p),
values range from 0.0 to 4.0. viewheight is now relative to
player->height.
 2017-10-14 16:11:08 -04:00
Monster Iestyn
3e595b8f1b Merge branch 'master' into ports-chopping-block 2017-10-14 20:47:04 +01:00
toasterbabe
8e389382ed Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 
# Conflicts:
#	src/p_user.c
 2017-10-14 19:12:15 +01:00
toasterbabe
1ba9d1fe6e * Rudimentary (set everything every state or DIE) support for ghost followmobjs. 
* Rename GZT_SPRITE to GZT_FRAME, since otherwise it's easy to confuse with EZT_SPRITE (which does something completely different).
* Fix issue where ghosts were facing wrong direction on spawn.
* Other minor refactorings.

* ...also, made smiles' tails pop up instead of down when skidding
 2017-10-14 17:50:14 +01:00
toasterbabe
31dff22202 Fixed followmobj not getting deleted when removing mobjs. Why did I do it in this branch? I've got lots related to followmobjs to do here for demo purposes, so... 2017-10-12 13:15:24 +01:00
Alam Ed Arias
1918e256f1 use the right bitmask 2017-10-11 17:12:41 -04:00
Alam Ed Arias
e927008711 signed stuff before using abs() 2017-10-11 17:05:35 -04:00
Alam Ed Arias
cdde7ea8e5 not equal, NOT statement 2017-10-11 16:58:45 -04:00
Monster Iestyn
7ebaa58997 Removed makefile options that existed only for the removed ports 2017-10-11 19:11:35 +01:00
toasterbabe
f75d56f932 Beginner support for followitem. Doesn't handle it for ghosts; need to do that independently. 2017-10-11 17:45:32 +01:00
toasterbabe
8871b08007 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into demo_shit 
# Conflicts:
#	src/p_user.c
 2017-10-11 17:44:48 +01:00
toaster
e298e35ada Merge branch 'smiling_on_the_inside' into 'master' 
Smiles! (and some tweaks to Super)

See merge request !119
 2017-10-11 10:40:11 -04:00
toasterbabe
7fcef5d44d Huh, that's what was going on with the black magyks. Silly me! 2017-10-10 21:24:24 +01:00
toasterbabe
728a195e54 Fix NiGHTS desync message... by obliterating all its special casing. 2017-10-10 19:30:32 +01:00
toasterbabe
8217900c0d * Make replays take analog mode, flipcam, directionchar and autobrake settings into account. 
* Fix replays for the current state of internal, irrespective of that previous thing.
* Fix replay ghosts for everything.
* Known issues; NiGHTS still prints an error message about desyncing on map start, but plays back fine. Curious.
 2017-10-10 17:56:38 +01:00
Wolfy
2fff5e9f6d Fix empty WAD files printing the wrong sprite count. 2017-10-10 01:41:28 -05:00
Wolfy
ec9d47cb34 Use the new sprite system 2017-10-09 14:24:04 -05:00
Alam Ed Arias
79879bbd7b Need to handle that FindFolder() does not fill musPos 2017-10-07 19:10:29 -04:00
Alam Ed Arias
021417500e Do not use Win32's TRUE/FALSE is OS independent code 2017-10-07 19:08:29 -04:00
wolfy852
b298c7a541 Fix p_spec.c and r_things.h, get the compiler to shut up 
This compiles with no errors or warnings, but hasn't been tested yet. Please review/test when you can.
 2017-10-07 17:18:25 -05:00
Monster Iestyn
38c109ddd2 filtered out the FILTERS makefile option 2017-10-07 21:31:24 +01:00
wolfy852
93584f6811 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement 2017-10-07 14:52:40 -05:00
wolfy852
a3cfa8dd5c Fixes from toaster, plus some other stuff 2017-10-07 14:52:27 -05:00
wolfy852
69d0e84b00 Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement 2017-10-07 14:48:56 -05:00
wolfy852
efb30f93ab Fixes from toaster, plus some other things 2017-10-07 14:48:49 -05:00
Monster Iestyn
b2bd073677 Slaughtered SDL 1.2 code 2017-10-07 18:32:50 +01:00
Alam Ed Arias
66201620dd cleanup a few compiler warnings 2017-10-07 13:21:12 -04:00
Monster Iestyn
52620ac9b1 Obliterated OS/2 2017-10-07 18:11:14 +01:00
Alam Ed Arias
c60caa5169 Merge branch 'public_next' into master 2017-10-07 12:46:16 -04:00
Alam Ed Arias
96c014deeb Merge branch 'master' into next 2017-10-07 12:44:28 -04:00
toasterbabe
e478fa830e Remove the MF2_DONTDRAW set - this is effectively already handled by MF2_LINKDRAW. 2017-10-07 14:45:37 +01:00
toasterbabe
1e4395036d * Make S_PLAY_RIDE tail animation not go exceedingly fast due to forced state setting. 
* Make tail appear at different angle when falling whilst walking.
* Remove irrelevant comment.
 2017-10-07 14:35:34 +01:00
toasterbabe
b2612b08c9 Dispoffset adjustment. 2017-10-06 12:26:55 +01:00
toasterbabe
87fc24ccbb Fancy super transformation changes! About to go out for dinner, so no major writeup,but let's just say all this changed code means that the transformation animation is smoother in colour change. 2017-10-04 17:45:03 +01:00
toasterbabe
40ef1335a1 * Smiles hardcode! 
* Add a default behaviour to followmobj (just basic A_CapeChase).
* Allow for modifying which character starting a new SP game should start you on, relative to the first valid character. (SOC's "startchar" variable)
* Make MF2_SHADOW transferrable via linkdraw.
* Modify P_GetSkinSprite2's recursion limiter to have zero chance of ever infinitely looping.
 2017-10-03 18:18:18 +01:00
toasterbabe
9fa00533b2 Incorporate linkdraw and ghosts into followmobj. 2017-10-02 16:01:10 +01:00
toasterbabe
844416855f Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo! 2017-10-02 14:08:58 +01:00
Alam Ed Arias
1b576bacf3 Build: support GCC 8 2017-09-30 23:07:47 -04:00
TehRealSalt
f31cdf395a Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff 
# Conflicts:
#	src/p_user.c
 2017-09-30 22:29:16 -04:00
Monster Iestyn
d38873854d Now that MiniGL is gone, the 1.2 Params macros will always be defined 
ATI_RAGE_PRO_COMPATIBILITY isn't used, and was disabled in r_minigl.c (the only other file that mentioned it) anyway. So let's get rid of support for it!
 2017-09-30 17:09:45 +01:00
Monster Iestyn
20709f55b5 Murdered MiniGL (yes it's not a port, but we don't need it anymore anyway) 2017-09-30 17:00:37 +01:00
toasterbabe
8ffec89207 * Fix music not being properly restored when toggling music on/off ingame. 
* Fix non-centiseconds rings position.
 2017-09-30 15:28:38 +01:00
Alam Ed Arias
6fbdf37b18 Build: support building with clang 5.0 2017-09-30 08:54:17 -04:00
Monster Iestyn
c448027312 remove this one leftover from the DC port I missed earlier 2017-09-29 23:30:27 +01:00
Monster Iestyn
302d0425e0 Incinerated WinCE 2017-09-29 23:25:34 +01:00
Monster Iestyn
be13f10626 ended NDS 2017-09-29 22:48:14 +01:00
Monster Iestyn
23d28e6b8c Gutted the GP2X 2017-09-29 22:27:08 +01:00
Monster Iestyn
89619761f3 Remove FAKEDC and FAKEPSP options from Makefile 2017-09-29 21:04:46 +01:00
Monster Iestyn
7481ffef2a Wiped out Wii (and Wii Linux) 2017-09-29 21:03:28 +01:00
Monster Iestyn
41ae71db4a postponed PSP 2017-09-29 20:34:16 +01:00
Monster Iestyn
9c6e739005 PS3 was deposed 2017-09-29 20:12:57 +01:00
Monster Iestyn
49542cdaa1 Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them 2017-09-29 19:46:23 +01:00
Monster Iestyn
5a16c39af0 XBOX was eXecuted 2017-09-29 19:27:17 +01:00
Monster Iestyn
330399ea9b Dreamcast is gone, so there is no need for KOS_GL_COMPATIBILITY anymore 2017-09-29 18:28:47 +01:00
Monster Iestyn
f4e535a64d Burned Dreamcast port at the stake 2017-09-29 18:19:34 +01:00
Monster Iestyn
de4ea022c0 Merge branch 'public_next' 2017-09-29 17:23:47 +01:00
Monster Iestyn
ea372fae53 Merge branch 'master' into next 2017-09-29 17:15:57 +01:00
Alam Ed Arias
f0eee4737f Menu: no more pop/push options 2017-09-28 17:45:27 -04:00
Alam Ed Arias
3e26e2a443 Menu: Compile M_DrawAddons without any optimizes 2017-09-28 17:38:14 -04:00
Monster Iestyn
c90ddbca36 Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master' 
Makefile ports tweaks cleanup etc

See merge request !211
 2017-09-28 17:31:33 -04:00
Alam Ed Arias
2629301947 Merge branch 'public_next' into master 2017-09-28 17:29:02 -04:00
toasterbabe
d38b627b85 woops 2017-09-28 22:20:16 +01:00
Alam Ed Arias
6c18d15b4a Merge branch 'master' into next 2017-09-28 16:55:04 -04:00
Alam Ed Arias
01602fa1f1 Build: fixup warnings in Debug builds 2017-09-28 16:54:26 -04:00
toasterbabe
9446fe6cd6 Tweak some HUD stuff, including a more consistent application of MAXSCORE. 2017-09-28 20:24:40 +01:00
Alam Ed Arias
1be137f461 cleanup 2017-09-28 11:10:24 -04:00
Alam Ed Arias
5986720789 Build: fixups 2017-09-28 11:01:52 -04:00
Alam Ed Arias
f1a347e55f Merge branch 'public_next' into master 2017-09-28 11:01:20 -04:00
Alam Ed Arias
ec125628ab Merge branch 'master' into next 2017-09-28 10:16:35 -04:00
Alam Ed Arias
7f98c5c804 Build: do not error on fallthrough 2017-09-28 10:02:08 -04:00
Alam Ed Arias
2ccd397d11 Build: kill GCC 7's implicit-fallthrough warning 2017-09-28 09:39:47 -04:00
Alam Ed Arias
55f377ba3d Build: kill GCC 7's format-overflow warnings 2017-09-28 09:13:46 -04:00
Alam Ed Arias
bdba212b2a Makefile: add support for GCC 7.1 and 7.2 2017-09-28 09:13:01 -04:00
Alam Ed Arias
7e23014d5f Makefile: support GCC 6.4 2017-09-28 09:04:36 -04:00
toasterbabe
f0ce22edb6 Fix issue #72 (where closed captioning jingles didn't account for pausing). 2017-09-27 15:37:52 +01:00
toasterbabe
7fb2e6633e Fix a crash. 2017-09-27 14:43:18 +01:00
toasterbabe
295b100df4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus 
# Conflicts:
#	src/m_menu.c
 2017-09-27 14:43:09 +01:00
TehRealSalt
fcc1554467 Play bubble breathe sound for bots 2017-09-24 13:43:36 -04:00
Nevur
77d7b1495c Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-09-24 14:52:41 +02:00
TehRealSalt
09c3c58575 Obligatory "fixing a very tiny and very stupid mistake" commit :p 2017-09-21 17:38:42 -04:00
TehRealSalt
6b448f72ee A_GhostMe lets you change fuse with var1, fixed the walking-spin frames bug For Real This Time 2017-09-21 17:34:53 -04:00
TehRealSalt
d55f84bec0 Camera scaling to splitscreen mode 
Stacks with analog's camera buff. The camera height of both are also now
proportional with their dist
 2017-09-21 16:43:55 -04:00
Alam Ed Arias
62264901e5 Merge branch 'master' into next 2017-09-20 17:18:58 -04:00
TehRealSalt
cfce6650ca Fix holding spin while landing putting you in your walking state, remove commented out stuff 2017-09-20 16:53:05 -04:00
TehRealSalt
7c7bf243a2 Okay, nope, still nothing; reverting 2017-09-20 16:20:30 -04:00
TehRealSalt
4e7b817945 Does THIS fix the conflicts?? 2017-09-20 16:14:00 -04:00
Monster Iestyn
829328637d Merge branch 'netcode-fixes-the-sequel' into 'next' 
Netcode fixes the sequel

See merge request !207
 2017-09-20 15:00:09 -04:00
TehRealSalt
6a0f50cdf5 Resolve conflicts 2017-09-19 17:27:13 -04:00
TehRealSalt
4a51d4bee0 Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc-stuff 
# Conflicts:
#	src/g_game.h
 2017-09-19 17:07:09 -04:00
toasterbabe
ca42659e03 Made a mistake in the directionchar branch. I'm pushing to master - naughty naughty - but nobody's around to stop me and it's my birthday c: 2017-09-19 14:22:17 +01:00
toasterbabe
48c0ef2362 Remove extraneous DEH_WriteUndoline's. 2017-09-19 13:21:48 +01:00
toaster
3cc14e3985 Merge branch 'directionchar' into 'master' 
Autobrake & decoupling player sprite angle from camera angle

See merge request !69
 2017-09-19 07:56:22 -04:00
toaster
ecfeb7b0af Merge branch 'spr2fixes' into 'master' 
Sprite2 MD2s and customisable defaulting

See merge request !115
 2017-09-19 07:49:04 -04:00
toaster
6d03c50966 Merge branch 'continue_startinglives' into 'master' 
Save cards and continue startinglives-balancing

See merge request !114
 2017-09-19 07:45:35 -04:00
toaster
b805380294 Merge branch 'titlemap' into 'master' 
Titlemap

See merge request !97
 2017-09-19 07:44:00 -04:00
toaster
c389328789 Merge branch 'mi-misc-whatever' into 'master' 
MI misc whatever

See merge request !111
 2017-09-19 07:40:29 -04:00
TehRealSalt
da82a6bb56 Replaced instances of "joystick" with "gamepad" in menus 2017-09-19 00:33:53 -04:00
TehRealSalt
d1e379f4f9 Whoops, forgot P2 2017-09-19 00:30:08 -04:00
TehRealSalt
e020352c0c Fixed diagonal analog input being weakened 
Using a keyboard and an analog stick should now give you similar
acceleration in all directions.
 2017-09-19 00:26:05 -04:00
toasterbabe
5bd71970ad Make chat visible in the evaluation gamestate. 2017-09-18 21:38:51 +01:00
Monster Iestyn
7f875131ee If compiling for GP2X with SDL, make it use SDL 1.2 interface like the others 
Doing this way because I have no idea if the GP2X port was SUPPOSED to use SDL or not in the first place
 2017-09-18 18:14:05 +01:00
toasterbabe
918edda672 * Make exitlevel only work if someone's at the exit or you've visited the next map before. 
* Added a message to suggest changing cheats before release to a future self.
* Removed the gametype selection menu, and baked its contents into the level platter instead (with an additional dose of pretty - https://cdn.discordapp.com/attachments/293238104096112641/359338275338584064/unknown.png)
 2017-09-18 15:04:38 +01:00
TehRealSalt
ce0a49ede5 Add jump & spin joystick axis 
Lets you set jump/spin to Xbox controller triggers, like you can with
fire/nfire
 2017-09-17 22:30:48 -04:00
TehRealSalt
5cc8734da7 Prevent bots from killing bubbles 
Self-explanatory. They can still breathe them in, they just no longer
get popped
 2017-09-17 21:37:36 -04:00
toasterbabe
970268ec38 Redid that ridiculous lastcoop thing as an MV_MP thing, which also means it gets properly cleared when you load mods with new save data. 2017-09-17 22:05:13 +01:00
toasterbabe
8fd5bb6342 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into directionchar 2017-09-17 17:16:02 +01:00
toasterbabe
148f2cc607 * Updated the circumstances under which autobrake is applied. 
* Made drawangle updated when jumping off a wall as Knuckles.
 2017-09-17 17:09:26 +01:00
toasterbabe
b217e9eb92 * Made levels with TOL_COOP inaccessible from the multiplayer map select unless you'd visited them in singleplayer (mapvisited, saves to gamedata) or visited a Co-op level number equal to/after it (multiplayer, doesn't save to gamedata) 
* Tweaked Pandora's box to add:
 - A mid-game link to the Addons menu.
 - A button to give everyone SF_SUPER (except Tails in non-devmode executables).
 2017-09-17 16:49:39 +01:00
toasterbabe
d44a36c8fe * Make autobrake scaled to low-friction surfaces. 
* Make rope hangs change how they handle the player's angle a little more organically.
 2017-09-17 12:10:33 +01:00
toasterbabe
725e015a19 Fix the bracketing on the autobrake calculation. 2017-09-16 22:49:18 +01:00
Monster Iestyn
b040113246 Removed the wrong endif by mistake 2017-09-16 20:59:35 +01:00
Monster Iestyn
a33bb70a0c Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 
Also removed GP2X setup from sdl/MakeNIX.cfg, use sdl12 for that too
 2017-09-16 20:26:04 +01:00
toasterbabe
f90d595332 * cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist. 
* cv_useranalog is now hidden from the menu.
* Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum.
* Tailsbot is now slightly more capable of keeping up with Sonic.
* pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL.
* [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
 2017-09-16 20:25:14 +01:00
Monster Iestyn
dcb23e01c0 SDL_INIT_NOPARACHUTE does nothing in SDL 2.0, so don't use it anymore 2017-09-15 21:22:28 +01:00
Sryder13
f3a605de6b I need to stop leaving things commented out that are going 2017-09-15 18:03:06 +01:00
Monster Iestyn
5fb551dd75 Removed 1.2.x version checks in these files, SDL 2.0.x should always have these files 2017-09-15 17:15:06 +01:00
Monster Iestyn
d2a76ca269 Removed references to console ports and WinCE in sdl/Makefile.cfg 2017-09-15 17:12:53 +01:00
Monster Iestyn
9e6ed121ba Comment out sdl12/SRB2CE/cehelp.h include in m_fixed.h 
I think it was originally included for defining the "USEASM" macro, but USEASM isn't used by m_fixed.h/c code anymore
 2017-09-14 21:29:38 +01:00
Monster Iestyn
900bab9b13 Fix includes for SDL 1.2-only ports' files 2017-09-14 21:15:38 +01:00
Monster Iestyn
5076861e0f Fixed sdl12/Makefile.cfg and sdl12/(port)/Makefile.cfg and related to refer to sdl12/ subfolders, not sdl/ subfolders 2017-09-14 21:09:35 +01:00
Monster Iestyn
c330907dba Added a SDL12=1 flag to all ports whose interface code still lives in the sdl12 folder (and is unsupported by SDL 2.0 officially anyway) 
This basically causes the makefile to use the sdl12 folder instead of the main sdl folder
 2017-09-14 21:03:20 +01:00
Steel Titanium
cf41a11770 Fix for window being offcenter 2017-09-11 16:36:30 -04:00
TehRealSalt
8b53295a74 Remove instances of player state changes being done every tic 
Makes it easier to change player state with Lua. Wasn't sure how to
tackle changing this for S_PLAY_CLIMB or S_PLAY_CLING, so I left them;
it's a minor ability-specific case anyway
 2017-09-09 19:02:11 -04:00
toasterbabe
3c785cbe94 * Add Skid SPR2/state in preperation for directionchar. 
* Clean up spr2 md2 code.
* Experimented but then commented out some stuff for homing attack.
 2017-09-09 22:12:23 +01:00
Monster Iestyn
8514251ad5 fix savegamename not prepending srb2home to itself for custom mods using their own gamedata files 2017-09-09 21:19:07 +01:00
Sryder13
db99537a6b Various Transparent Texture Fixes 
Draw Textures and Flats that have holes in them like a solid polygon so they use the depth buffer and don't need to be sorted
Disable all linear filtering on textures and flats that have holes in them, the linear filtering introduces translucency into the textures where the edges are. Leaving them with either a black border, or causing pixels behind the slightly translucent areas to not be drawn. Doesn't apply to sprites and the HUD as they are always already sorted properly.
Make the Alpha Testing more strict on non-translucent blend modes. This makes it so any transparency below 0.5 is discarded instead. Would make anything that is blended and has holes in it look slightly better, only the HUD and MD2s where the texture has holes are effected currently.
Set TF_TRANSPARENT on flat texture flags when there are holes in the texture.
Minor fix to make sure MD2s always set the right blend mode
 2017-09-09 00:44:13 +01:00
Sryder13
6877930ed9 Go through and draw MD2s and sprites at the same time so they are sorted from each other (mostly) correctly 2017-09-08 00:57:21 +01:00
Nevur
f61755dd67 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-09-04 22:32:38 +02:00
Nevur
4aed951bd8 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 
# Conflicts:
#	src/r_things.h
#	src/w_wad.h
 2017-09-04 22:32:11 +02:00
Monster Iestyn
d65e23f3ec Merge branch 'public_next' 2017-09-04 20:19:47 +01:00
Monster Iestyn
d565cc6a2c Merge branch 'master' into next 2017-09-04 20:16:06 +01:00
Nevur
b087c16eb1 Merge branch 'toastfixes' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 
# Conflicts:
#	src/p_setup.c
#	src/p_spec.c
 2017-09-04 21:13:29 +02:00
Monster Iestyn
50917d2ee2 P_FloorzAtPos: Check the normal floor's slope as well as FOF slopes, silly. 2017-08-30 19:21:23 +01:00
toasterbabe
d6701edcb6 Don't allow creating a new save when it wouldn't end up making a save file (ie, modified game without savemoddata). 2017-08-27 18:47:24 +01:00
toasterbabe
79dab78fd3 * Support FF_SPR2ENDSTATE in interpoleration. 
* Fix skidding interpoleration bug.
 2017-08-27 16:35:19 +01:00
toasterbabe
973f700dcf * Make the model->spr2frames dynamically allocated. (There's only two settings - on and off - but that's better than it perpetually being on...) 
* Fix up defaulting for DEAD to go to PAIN.
 2017-08-27 14:56:07 +01:00
toasterbabe
76300026f8 * Added support for sprite2s to MD2s! 
- Name each frame either SPR2_**** or SUPER**** (where **** is the 4-character name)
    - If the name is 3 characters, '.' is accepted as a substitute for the '_', but a space/absent isn't (for tool-related reasons).
    - Adds a big sprite2 index array to all models, even non-player ones. Sorry!
* Made MD2 frame interpoleration only work across the same spriteset (and sprite2set).
* Made MD2 frame interpoleration happen when there's less than a quarter of a second between frames, as opposed to the hardcoded specific animation disabling.
* Fixed sprite2-related typo in dehacked.c.
 2017-08-26 18:56:23 +01:00
toasterbabe
4da6169892 Add spr2defaults[] array to make sprite2 defaulting system much, much simpler to manage. 
This is in preparation for a seperate project which still involves sprite2s.
 2017-08-25 18:00:20 +01:00
toasterbabe
3e2be5e47a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into continue_startinglives 2017-08-25 13:50:50 +01:00
toasterbabe
9641196374 * Fixed bug with wide blank select pic being used instead of the normal one. 
* Added length cap to savegame's zone name.
* Refactor to level select's zone name length cap code.
 2017-08-25 00:40:45 +01:00
toasterbabe
16395f4dd2 Final corrections. Branch should be ready to merge now. 2017-08-24 21:29:29 +01:00
toasterbabe
00c62e6d88 * Removed unused info from struct as part of clean up. 
* Made botskin being invalid make the entire save invalid.
 2017-08-23 22:05:11 +01:00
Monster Iestyn
9c4e2eeeef Merge branch 'next' into netcode-fixes-the-sequel 2017-08-23 19:17:25 +01:00
toasterbabe
a81c3ca115 Update V_DrawCroppedPatch to match V_DrawFixedPatch's fixes. 2017-08-23 17:41:16 +01:00
yellowtd
519414b215 Merge branch 'master' into titlemap 2017-08-22 19:07:32 -04:00
toasterbabe
673fbc3ec2 * Make the delete save message include the save number. 
* Update/improve ultimate mode interaction experience a little. https://cdn.discordapp.com/attachments/293238104096112641/349685399200727041/srb20027.png
 2017-08-22 23:47:25 +01:00
Monster Iestyn
36977a5eda SDL_SetRelativeMouseMode(SDL_TRUE) already does what HalfWarpMouse does 
Also, don't post an ev_mouse event_t if not in relative mouse mode, so the camera doesn't jerk when the mouse enters the window
 2017-08-22 22:53:18 +01:00
toasterbabe
1e71b6d746 woops lmao 2017-08-22 21:12:02 +01:00
toasterbabe
8d78d32d64 * Fix an issue where valid savefiles would be hidden because there were at least three unused slots between that and the last visible save. In the process, made sure there were at least three slots visible at all times, but never show extras not needed to show all the saves. 
* Optimisations in a bunch of places, including to static
* Fix some visual errors with text and patches near the edges of the screen in non-standard resolutions.
 2017-08-22 21:02:33 +01:00
Monster Iestyn
821a1810f7 Moved lrounding of mouse motion events to the actual point an event is made 
Also did some cleanup and moving around, as well as adding comments
 2017-08-21 21:38:29 +01:00
toasterbabe
6e7605e4f3 * Add new graphics for the no save and ultimate slots, and make the invalid files look a little different. 
* Push big endsign images downwards.
* Add a way to disable the ultimate slot.
* BwehHehHe()
 2017-08-21 16:02:13 +01:00
toasterbabe
706eb5efeb * New, pretty save select! Requires patch.dta to really appreciate. 
* Changed the save format a little more, since I had free reign over it.
* Modified the string drawing functions to not awkwardly clip at the very edges of the screen, considering the relevant patch drawing functions avoid out-of-range memory writes.
 2017-08-20 23:18:47 +01:00
toasterbabe
42211f02b4 * Per Mystic's request, only set the number of lives in the save file if you actually use a continue, or completely wipe out your lives and continues. 
* Fix a bug where I got emeralds and mapnumbers mixed up when checking for the "there's a tailsbot" flag.
* Consider a save with an invalid skin an invalid save, rather than allowing its continued presence.
 2017-08-20 13:14:17 +01:00
Monster Iestyn
10cbe2c82b Turns out the issue was with fullscreen! All I have to do is factor in the resolution/real window size ratio apparently (which was already done before) 
Also changed movemousex/y to INT32
 2017-08-19 22:54:30 +01:00
Monster Iestyn
758e9c4558 Merge all (relative) mouse motion events into one mouse event 
This fixes SDL2_RelMouse's weaker sensitivity for me on Windows (but apparently not for others??)
 2017-08-19 21:39:04 +01:00
Monster Iestyn
d4141ae230 Remove unused floorinfo_t struct and some unused vars in the hardware code 2017-08-19 18:51:56 +01:00
Monster Iestyn
9805b82fec Disable "connect self" due to being broken, cleaned up ip+port part 
Anyone know if "connect any" work at all? Would have disabled that too but apparently the game uses it if "-connect" is given with no params
 2017-08-18 18:14:03 +01:00
Monster Iestyn
030c437186 Merge branch 'master' into mi-misc-whatever 2017-08-18 17:00:05 +01:00
toasterbabe
fd63db0aaf Starting lives revamp, per the 2.2 priorities topic list! 
* Each time you die, the number of game overs you've had is counted.
* Your save file updates to record this.
* The number of startinglives is determined by the number of times you'ved game-overed, with the maximum being infinity lives (thereby providing a cap on the number of game overs you can go through in a typical game).

Requires a new patch.dta, but I'm not uploading that yet because not happy with the icon we've got going for infinity lives on the save select menu.
 2017-08-18 00:58:16 +01:00
toasterbabe
2e6c09a636 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into directionchar 
# Conflicts:
#	src/hardware/hw_main.c
 2017-08-16 21:40:32 +01:00
Monster Iestyn
9703aa2864 Feed skin and sprite2 through P_GetSkinSprite2 to change sprite2 if necessary (if for instance the supplied sprite2 didn't actually exist) 2017-08-16 21:00:18 +01:00
Monster Iestyn
c9acc3cee4 Merge branch 'master' into lua-spritedefs 2017-08-16 20:13:26 +01:00
Monster Iestyn
3795a15164 Merge branch 'public_next' 2017-08-16 20:11:33 +01:00
Monster Iestyn
9f726bc66d Merge branch 'new_coop' into 'master' 
New Co-op

See merge request !104
 2017-08-16 15:01:39 -04:00
Monster Iestyn
75d363527b Merge branch 'toastfixes' into 'master' 
An assortment of relatively minor bugfixes and behaviour tweaks

See merge request !110
 2017-08-16 14:58:30 -04:00
toasterbabe
f6670fea76 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/r_things.h
 2017-08-16 19:29:23 +01:00
toasterbabe
6d3691d3d1 woops, compile fix 2017-08-15 22:40:19 +01:00
toasterbabe
06dc30ea54 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into skin_patch 
# Conflicts:
#	src/dehacked.c
 2017-08-14 21:34:37 +01:00
toasterbabe
6e79de3de8 Patched an out-of-bounds crash with papersprites in the least resource-intensive way I could find (xiscale not fitting perfectly into frac). This will have to do until papersprites get a make-over at some point. 2017-08-11 16:00:45 +01:00
Nevur
4f8d53b329 Got rid of functions I added once but turned out to be unnecessary. 2017-08-11 15:46:46 +02:00
toasterbabe
a00deee209 * Combine all shield-giving functions into a single one, since they were practically identical anyways. 
* Expose P_SwitchShield(player, shieldnum) to Lua.
 2017-08-10 13:57:09 +01:00
toasterbabe
709a43d3be Fix that thing where you-know-who didn't have a lives icon. 2017-08-09 22:51:29 +01:00
toasterbabe
8175e0836e Remove all trace of harddefs, considering we use an ANIMDEFS lump in srb2.srb now. 2017-08-09 22:09:06 +01:00
toasterbabe
1cab08e39f * Add SH_PROTECTSPIKE as a shield flag, because I kinda wanted to when I originally made shields, and SUBARASHII's cactus shield vindicated my desires. 
* Tweaked the values of the shield constants slightly so that no base-game shield is made up of flags and only flags.
 2017-08-09 20:56:31 +01:00
toasterbabe
a3767fedac Clean out code/update comments relating to TEXTUREn, TEXTURE (SOC), PNAMES, and ANIMATED. 2017-08-08 22:03:37 +01:00
Yukita Mayako
720987367a Prevent cvar naming conflicts from pointing Lua to the wrong internal data. 2017-08-08 14:27:02 -05:00
toasterbabe
a61be91523 Add a new feature to MT_PARTICLEGEN, per Sphere's request - if you give the parameters line a backside, then the backside x offset controls the number of tics between particle spawn. (By default, it's 3.) 2017-08-08 18:22:44 +01:00
toasterbabe
1d11a14f64 Getting polyobject flats to the equivalent functionality BEFORE I changed up how floor offsets worked. (Doesn't touch OGL, since they work perfectly there.) 2017-08-08 15:32:12 +01:00
Nevur
8b64a6eef3 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into FileManagement 2017-08-08 10:41:33 +02:00
Nevur
bb3365a904 We use srb2.pk3 instead. 2017-08-08 10:39:25 +02:00
Monster Iestyn
2d661fef18 Turns out we don't need to use SDL_SetWindowTitle on its own, since SDL_CreateWindow already deals with the window title anyway. So I've disabled everything related to Impl_SetWindowName for now 
Also what were you thinking Fury?!? window shouldn't be NULL for SDL_SetWindowTitle, you backwards person you
 2017-08-07 16:44:29 -04:00
Alam Ed Arias
35404be1e0 SDL: y input is flipped 2017-08-07 16:37:03 -04:00
Alam Ed Arias
c25b2eb37f Merge remote-tracking branch 'origin/master' into SDL2_RelMouse 2017-08-07 16:33:39 -04:00
toasterbabe
780f9b1645 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/hardware/hw_md2.c
 2017-08-07 20:36:14 +01:00
Monster Iestyn
42ed41aeb1 Merge branch 'maces_but_better' into 'master' 
Maces but better

See merge request !103
 2017-08-07 15:27:05 -04:00
Monster Iestyn
f3b7d2f89e Merge branch 'opengl-improvements' into 'master' 
OpenGL improvements

See merge request !99
 2017-08-07 15:06:16 -04:00
toasterbabe
2e1b81b5da Woops, silly find and replace 2017-08-07 19:23:48 +01:00
Monster Iestyn
15db571757 Merge branch 'master' into opengl-improvements 2017-08-07 19:06:49 +01:00
toasterbabe
d135f64464 Crash prevention 2017-08-07 18:58:41 +01:00
TehRealSalt
a813506b8f Clean whitespace 2017-08-06 23:47:39 -04:00
Monster Iestyn
a0204c6722 Made P_SpecialStageDamage for the lose 10 rings damaging code shared by spikeballs and SS damage sector special 2017-08-06 22:10:29 +01:00
TehRealSalt
042729bd8f AA i'm forgetting everything today 2017-08-06 17:09:25 -04:00
TehRealSalt
5c1aaf3906 Guess who forgot to press "Save All Files" in Notepad++ ^^; 2017-08-06 17:07:23 -04:00
TehRealSalt
a5ca158622 LF_SAVEGAME flag instead of savemode 
Also always save on file creation
 2017-08-06 16:36:55 -04:00
Monster Iestyn
34908c9b29 Re-order P_RemoveShield's first/second layer shield code 2017-08-06 18:57:02 +01:00
TehRealSalt
e24b8b917a Merge remote-tracking branch 'refs/remotes/origin/master' into save-mode 2017-08-06 01:19:33 -04:00
toasterbabe
b51e80ef88 Make timer reset work in LF_NORELOAD as well. 2017-08-05 22:13:35 +01:00
toasterbabe
0a1e055ba1 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 
# Conflicts:
#	src/m_menu.c
 2017-08-05 22:13:14 +01:00
Monster Iestyn
0ac63c0949 Merge branch 'lua-lump-load-only' into 'master' 
Lua lump load only

This branch prevents the following Lua functions from being used within hooks or coroutines, to prevent netgame desync problems or any other similar oddities when using these weirdly:

* `freeslot()`
* `addHook()`
* `hud.add()`
* `COM_AddCommand()`
* `CV_RegisterVar()`

All of the above should only be called when the Lua script is being loaded (i.e. it takes place the same instant a ".lua" file or a WAD file with a "LUA_" lump is being loaded)

To put it another way:
```
//This is valid usage:
freeslot("MT_TEST")

//This is NOT valid usage
addHook("MobjSpawn", function() freeslot("MT_TEST2") end, MT_PLAYER)

```

See *Monster Iestyn/Lua lump load only* on the FTP for an exe and test script.

See merge request !87
 2017-08-05 16:36:05 -04:00
Monster Iestyn
15a1112218 Merge branch 'master' into opengl-improvements 2017-08-05 21:08:48 +01:00
Monster Iestyn
2e2b71da92 Merge branch 'addfile_menu' into 'master' 
Add-ons menu

Does what it says on the tin! Very pretty. Would like help testing in filesystems that are not Windows, although I've recieved assurances from Sryder that since it's based on the same filesrch code, it should work cross-platform. Just want to confirm it works, though.

Also, M_* is whitelisted lumpname too.

root/!LatestSRB2Files/srb2win_branch_addfile.exe, requires new patch.dta.

See merge request !92
 2017-08-05 16:05:12 -04:00
Monster Iestyn
c10c3d0441 Merge branch 'alignment_v2' into 'master' 
Consistent flat alignment

Does what it says on the tin. Consistent between the three different plane drawers:

* Software flat (previously the only one working as intended)
* Software sloped (took a lot of work)
* OpenGL flat and sloped (worked reasonably well but used different signs for some reason)

Check out root/!LatestSRB2Files/srb2win_branch_flat2.exe, root/toaster/flatalignment.wad and any in-dev DSZ1 to test it all out.

See merge request !78
 2017-08-05 16:04:41 -04:00
Monster Iestyn
102d30fe8d Merge branch 'nights_emblems' into 'master' 
NiGHTS Paraloop-special emblems

Implemented the two NiGHTS Emblem types in the TUDD via var modifications to ET_GLOBAL!
* GE_NIGHTSPULL (for it to chase you once paralooped) - Sun emblem
* GE_NIGHTSITEM (for hidden until paralooped) - Moon emblem
* Combined means that you essentially have to loop it twice.

Also, revamped NIGHTSITEM to suck a little less (and have more compatibility with MT_EMBLEM).

Check out root/!LatestSRB2Files/srb2win_branch_nightsemblems.exe with the latest patch.dta, along with root/toaster/nightstest.soc for a sample in GFZS.

See merge request !94
 2017-08-05 16:03:33 -04:00
toasterbabe
e2a9d47ef6 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 2017-08-05 12:28:31 +01:00
toasterbabe
8fcb66b3fa Allow for new coop leveltime reloading 2017-08-05 12:26:05 +01:00
Monster Iestyn
c6be44d0da Merge branch 'linkdraw_reliability' into 'master' 
MF2_LINKDRAW reliability improvements

Seriously improves the reliability of the linkdraw system (in Software, the only rendering engine which actually does anything with this information), reducing the number of visual errors it produces significantly. Deliberately engineered to only affect objects with MF2_LINKDRAW applied.

Of particular note: Standing in shallow pools of water as Smiles will now reliably associate the bottom half of the tails following mobj with the underwater portion of Smiles' body, and the flicking ends with his un-submerged head.

Test with ```<root>/!LatestSRB2Files/srb2win_branch_linkdraw.exe``` and ```<root>/toaster/smiles.wad```.

See merge request !101
 2017-08-04 17:26:31 -04:00
Monster Iestyn
157c5625d7 Welp, that space removal was my fault 2017-08-04 22:22:20 +01:00
Monster Iestyn
0270e50ce5 Split off mostly map-specific code into a "CanSaveLevel" function, just to make things a bit less cluttered 2017-08-04 20:43:00 +01:00
Monster Iestyn
3fd9e9be3a Merge branch 'wallspike_tweaks' into 'master' 
Wallspike tweaks

Sorry, MI. You told me to test the objects via objectplace, and they worked fine there - but @FuriousFox had some [issues](http://i.imgur.com/DQuLYzz.png) when he finally got to place them via mapthing.

Specifically, I think the problem this was caused by was a straight up copypaste of the "height" attribute of MT_SPIKE into the "radius" field of MT_WALLSPIKE, when it should technically be half that to match the intended collision box. Some other stuff also got adjusted to match when I solved this.

FF's happy now - they work well enough to place, even if their [collision is a little wonky](http://i.imgur.com/o2rG0tV.gifv), but that's an MF_PAPERCOLLISION issue and more than a quick fix to be done in an evening.

Nab ```<root>/!LatestSRB2Files/srb2win_branch_spikefix.exe``` to test.

UPDATE:

* Support for MF_PAPERCOLLISION tmhitthing in P_SlideMove.
* Knockback for wallspikes is much more consistent, fixing FF's gif as posted above/below.
* Optimised away a FixedDiv call when determining the slopetype of a line.
* Changed the position of the wallspike base slightly.
* Made it so NOTHING can step up onto the player outside of other players, essentially killing a bunch of springs-launch-with-players style bugs. (I was able to recreate that issue with the wallspikes until I added this, which is why I did it in this branch.)
* Wallspikes are now bustable.
* Invert the solidity mapthing flag for spikes and wallspikes.
* Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta)
* Make all spikes consistently do damage with DMG_SPIKE.
* (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages.
* (unrelated) Make gas jets not make noise if they have the ambush flag, per Sphere's request.

See merge request !107
 2017-08-04 14:28:44 -04:00
TehRealSalt
2d9a024c4a Commenting out lastmapsaved 2017-08-04 13:57:47 -04:00
TehRealSalt
9d17466d99 Added lastmaploaded to replace the lastmapsaved check 
This allows saving in special cases where you can go to a map that
doesn't save, and then back to the map you saved on (see: SUBARASHII
special stages), while still preventing you from killing your lives by
repeatedly retrying in said map.

Kept lastmapsaved just in case. Can be removed if deemed unnecessary.
 2017-08-03 20:27:31 -04:00
toasterbabe
e21ae8de7d * Updated NiGHTS skincolor list on Rob's request. 
* Unrelated: fixed a bug where FF_ANIMATE stuff tried to access rain's skin.
 2017-08-03 00:01:12 +01:00
toasterbabe
cca779e4a0 * Updated Supercyan constants/names to Supersky, considering the base skincolour Cyan was renamed Sky (and a new Cyan was made independently of that). 
* Swapped the names of Cloudy and Silver so that Silver meant the shinier option.
 2017-08-02 13:11:21 +01:00
toasterbabe
021e7ed1f0 Okay, actually fixed. Thanks, MI, for understanding the maths a little better than I :p 2017-07-30 17:45:27 +01:00
toasterbabe
1e1d191a75 Make it so you can't even STAND on spikes if you're flashing and moving away from them. 2017-07-30 16:52:39 +01:00
TehRealSalt
0b05b10bdb Merge remote-tracking branch 'refs/remotes/origin/master' into save-mode 2017-07-30 11:13:52 -04:00
toasterbabe
1180f0418e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into new_coop 2017-07-26 17:52:34 +01:00
toasterbabe
be5184a8cc ...fixed some weirdness with spinning I accidentially introduced in an attempt to fix it. 2017-07-26 16:34:33 +01:00
toasterbabe
672bcc349c * Hide the number of lives you can steal if game-overed. It's not directly relevant unless you're game overed. 
* Fix an issue where everyone being game overed except for one person, and then kicking that one person, meant the game over trigger was never met.
* Fix an issue where the spectator text could be overridden with a count of the number of remaining players to complete the level.
* Fixed a few glitches with spinning. (Unrelated to the branch, but exposed through new_coop testing.)
 2017-07-26 16:10:08 +01:00
toasterbabe
2bdf432703 Allow for the previous defaulting system to continue working. 2017-07-26 13:50:49 +01:00
Monster Iestyn
07c260a83e Merge branch 'master' into opengl-improvements 2017-07-25 19:11:16 +01:00
Monster Iestyn
15bd6b980d Merge branch 'master' into lua-action-userdata 2017-07-25 19:10:56 +01:00
Monster Iestyn
025891d2aa Merge branch 'master' into gametype-strings 2017-07-25 19:10:38 +01:00
toasterbabe
3186d6a4e4 * An improved Multiplayer menu. 
* If NONET, the Multiplayer option on the main menu leads directly to the Splitscreen menu, which also includes player 1/2 setup under this circumstance.
* A mechanism to save player name, skin and colour as defaults to config.cfg.
 2017-07-25 18:34:13 +01:00
Monster Iestyn
3948ab6da5 Merge branch 'master' into lua-lump-load-only 2017-07-25 17:18:07 +01:00
Monster Iestyn
472d962e1a Merge branch 'master' into lua-spritedefs 2017-07-25 17:17:48 +01:00
Monster Iestyn
cfbe180312 Merge branch 'public_next' 2017-07-25 17:17:22 +01:00
Monster Iestyn
821692fbf7 This was my fault, whoops 2017-07-24 17:53:18 +01:00
toasterbabe
634c560e99 * Who wore it better? https://cdn.discordapp.com/attachments/293238104096112641/338696939774279680/srb20037.png 
* Now that Cyan is back, swap out the substitute Teal in the emblems for it.
* P_GetMobjSprite2 is now P_GetSkinSprite2.
* Correct "Siler".
 2017-07-23 17:49:19 +01:00
toasterbabe
8941379c64 Implementation of all the new skincolours. No new exe yet, though, since I'm still doin' stuff. 2017-07-22 23:24:12 +01:00
toasterbabe
b2e92e7a09 * Invert solidity flag for vertical spikes and wallspikes. 
* (unrelated) Per a request by sphere, make the ambush flag stop sounds being made by the gas jet.
 2017-07-19 17:07:31 +01:00
toasterbabe
ef4dc42c7c * Bustable wallspikes. 
* Improve the code for busting vertical spikes.
* Improve the frame arrangement for vertical spikes' spriteset. (Requires new patch.dta)
* Make all spikes consistently do damage with DMG_SPIKE.
* (unrelated) renamed "flame stomp" to "elemental stomp" in P_HitDeathMessages
 2017-07-19 16:26:49 +01:00
toasterbabe
2330f1a9c9 Account for the fact that pointtoangle2 points due weast if there's no dy OR dx, so that's taken care of. 2017-07-18 17:04:30 +01:00