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
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
Alam Ed Arias
365879d06f
libs: Updated SDL2-Mixer to 2.0.2
2017-10-28 18:03:18 -04:00
Alam Ed Arias
e1492ae3f0
libs: EOL fun of SDL2
2017-10-28 17:53:15 -04:00
Alam Ed Arias
b7d0896c83
libs: updated SDL2 to 2.0.7
2017-10-28 17:50:36 -04:00
toasterbabe
efc4d2f81d
* Make multiple ANIMDEFS lumps get loaded.
...
* Refactor the multiple TEXTURES lump code.
2017-10-28 17:12:08 +01:00
