Commit graph

4987 commits

Author SHA1 Message Date
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
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
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
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