Commit graph

3392 commits

Author SHA1 Message Date
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
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
Monster Iestyn 2b1fb67a5f DrawMD2i: change duration and tics to INT32, fix up any related code 2017-10-30 19:12:51 +00: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
Alam Ed Arias daf442f17b Appvendor: -Wno-error=suggest-attribute=noreturn 2017-10-27 21:31:02 -04:00
Alam Ed Arias f6af81be59 Appvendor: -Wno-tautological-compare 2017-10-27 21:25:52 -04:00
Alam Ed Arias 264fc2f3c7 Appveyor: remove error 2017-10-27 21:14:52 -04:00
Alam Ed Arias c160241f1b Appveyor: stuff warnings switchs 2017-10-27 20:59:18 -04:00
Alam Ed Arias bdfdd868c7 Appveyor: let see what is the command line 2017-10-27 20:30:15 -04:00
Alam Ed Arias ce40c00b7a Build: do not error on FALLTHURs 2017-10-27 19:49:55 -04:00
Monster Iestyn 365cd305d7 Make appveyor config use GCC72=1 instead of GCC63=1 2017-10-27 17:41:23 +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
Monster Iestyn 94b7d564e7 Merge branch 'ports-chopping-block' into 'master'
Ports chopping block

See merge request STJr/SRB2Internal!118
2017-10-18 14:39:57 -04:00
Monster Iestyn 3e595b8f1b Merge branch 'master' into ports-chopping-block 2017-10-14 20:47:04 +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
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
Monster Iestyn 38c109ddd2 filtered out the FILTERS makefile option 2017-10-07 21:31:24 +01: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
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