lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3596 commits 1 branch 29 tags 122 MiB
Commit graph

3596 commits

This branch
This branch
All branches
Author SHA1 Message Date
MonsterIestyn 2ad4e1a1e5
Merge pull request #219 from LJSonik/net-archive-fix 
Fix missing lua_pop in ArchiveExtVars
 2017-12-16 20:57:46 +00: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
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
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 b63bd97b1a Merge branch 'md2-interpolation-fix' into 'master' 
MD2 interpolation fix

Closes #28

See merge request STJr/SRB2!212
 2017-11-01 13:34:34 -04: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