Commit Graph

3406 Commits

Author SHA1 Message Date
toasterbabe efc4d2f81d * Make multiple ANIMDEFS lumps get loaded.
* Refactor the multiple TEXTURES lump code.
2017-10-28 17:12:08 +01:00
toasterbabe ee4b891318 Since I'm on the branch: bugfix a thing with introchanged/titlechanged. 2017-10-27 22:08:01 +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
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
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 2cbed2aa4f Merge branch 'FileManagement' of http://git.magicalgirl.moe/STJr/SRB2Internal into FileManagement 2017-10-07 17:21:42 -05: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
Alam Ed Arias 1a8e99bf5c Merge branch 'master' into FileManagement 2017-10-07 16:08:48 -04:00
Alam Ed Arias c9a43f310d Merge remote-tracking branch 'private/FileManagement' into FileManagement 2017-10-07 16:06:26 -04:00
Alam Ed Arias 602fbd356a Merge branch 'master' into FileManagement 2017-10-07 16:06:10 -04: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
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
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 f9077789e7 Remove objs and bin subfolders for nds and WinCE 2017-09-29 23:29:29 +01:00
Monster Iestyn 302d0425e0 Incinerated WinCE 2017-09-29 23:25:34 +01:00
Alam Ed Arias 075c4e0956 Travis: clang 4.0 and 5.0 is not up for trusy 2017-09-29 17:57:03 -04:00
Alam Ed Arias 472c74907e Travis: fix misspelling 2017-09-29 17:52:12 -04:00
Monster Iestyn be13f10626 ended NDS 2017-09-29 22:48:14 +01:00
Alam Ed Arias 03ba14640f Travis: test building with clang 3.9, 4.0 and 5.0 2017-09-29 17:43:20 -04:00
Monster Iestyn 497512ee52 Remove all relevant objs and bin subfolders for ports killed so far 2017-09-29 22:32:58 +01:00
Monster Iestyn 23d28e6b8c Gutted the GP2X 2017-09-29 22:27:08 +01:00