toasterbabe
877065250e
Some NiGHTS change oversights I forgot to correct before.
2016-12-25 19:56:33 +00:00
toasterbabe
5164ee7fc9
Fun gameplay tweak: Turn CA_FLOAT into a limited CA_SLOWFALL when moving slowly, to double down on it being for speedrun characters and punishing slowing down. Rob-approved.
2016-12-24 22:23:34 +00:00
toasterbabe
578b809557
* Turned CA_DASHMODE into SF_DASHMODE.
...
* SF_DASHMODE users can now dash on water.
* Gave CA_HOVER its own states/sprite2s.
* Gave Super Sonic's hover his own hover-run state/sprite2.
2016-12-24 20:57:39 +00:00
toasterbabe
102f26182b
* Tweaks to CA_BOUNCE.
...
* Tweaks to drowning number placement for altered sizes.
2016-12-24 14:23:11 +00:00
toasterbabe
f60233027d
On Rob's suggestion: Allow your controls to turn CA_BOUNCE users to turn on a dime when coiling for the next bounce.
2016-12-24 13:31:23 +00:00
toasterbabe
942065ba9f
* CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors.
...
* CA_BOUNCE users harmlessly bounce off Sharps.
2016-12-24 13:17:53 +00:00
toasterbabe
b84ad05061
Okay, failed experiment fixed. (This has nothing to do with the ability to pierce bustable FOFs, I just modified it for kicks to see what would happen.)
2016-12-24 00:12:29 +00:00
toasterbabe
a61f5e4521
* CA_BOUNCE can now break downwards.
2016-12-23 23:58:12 +00:00
toasterbabe
0a7fe9569d
* Fixed issue where CA_BOUNCE users can harmlessly bounce on deathpits (and not Cakewalk style!)
...
* Minor quality-of-life improvements to CA_BOUNCE handling.
2016-12-23 23:13:31 +00:00
toasterbabe
10a137620a
First commit, CA_BOUNCE almost completed.
2016-12-23 17:31:07 +00:00
Inuyasha
37c8ef6369
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
2016-12-22 17:46:39 -08:00
Inuyasha
f4b0591174
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-12-22 17:44:28 -08:00
Alam Ed Arias
97f87827f4
hardware: init undef vars in HWR_SortVisSprites
2016-12-22 19:42:00 -05:00
Alam Ed Arias
fca398ae4d
Win32 Debugger: no need for Win32 interface code for SDL
2016-12-22 19:40:02 -05:00
Alam Ed Arias
1c16a4e670
m_aatree: add newline
2016-12-22 19:39:37 -05:00
Alam Ed Arias
fc9a86f6d2
Mingw: fixup unsigned/signed compare
2016-12-22 19:39:14 -05:00
Alam Arias
fe3916a60d
Merge pull request #147 from LJSonik/hook-optimisation
...
Hook optimisation
2016-12-22 18:26:49 -05:00
Monster Iestyn
d782638da8
Merge branch 'zlib_pkgconfig' into 'master'
...
Zlib pkgconfig
Linux build to include libgme by default
See merge request !116
2016-12-18 21:44:19 -05:00
Monster Iestyn
752eca5253
Changed how return values work for the iteration function supplied to searchBlockmap
2016-12-18 16:53:11 +00:00
Monster Iestyn
7bcb595eaf
don't make NF_SUBSECTOR available to Lua either unless HAVE_LUA_SEGS is defined
2016-12-18 15:36:19 +00:00
Monster Iestyn
8e56582728
Created R_CheckTextureCache to make sure midtexture/FOF walls cache their textures before choosing colfunc_2s, for software mode
2016-12-17 19:59:54 +00:00
Monster Iestyn
a9cfd12e04
Created R_GetTextureNum to make sure top/bottom/midtexture texture ids are always valid in rendering code for both software and OpenGL (and also for the Solid Midtexture effect physics code)
2016-12-16 21:38:53 +00:00
Louis-Antoine
db20bfb3c3
Generic mobj hooks are now run before mobjtype-specific mobj hooks, and player/linedef executor hooks now have their own lists
2016-12-15 21:05:54 +01:00
Monster Iestyn
6ae2c24484
Merge branch 'public_next'
...
# Conflicts:
# src/p_user.c
2016-12-14 18:53:00 +00:00
Monster Iestyn
f8961d396f
Initial commit of what I've done so far, DOES NOT COMPILE
2016-12-13 22:42:47 +00:00
toasterbabe
d8d5f31898
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-12-13 22:03:59 +00:00
toasterbabe
fe6b4c4875
Reduced momentum killing of groundpound into slime per Mystic's request.
2016-12-13 21:48:16 +00:00
Monster Iestyn
6f8969aec0
Merge branch 'spindash-dust' into 'master'
...
Spindash dust
Charging a spindash kicks up dust, we all know this feature was dying to get in at some point. Bubble and flame forms of spin dust are included from FSonic, for underwater and elemental respectively.
Oh, and as a bonus I reorganised the spindash/spinning/other ability2 stuff code to look a bit neater and more organised.
New resources:
* MT_SPINDUST - the object
* S_SPINDUST1 to 4 - the normal form's states
* S_SPINDUST_BUBBLE1 to 4 - the bubble form's states
* S_SPINDUST_FIRE1 to 4 - the bubble form's states
* SPR_DUST - the normal form's sprite set (uses frames A to D, just pinch FSonic's sprites really)
* SPR_FPRT - the flame form's sprite set (frame A only)
SF_NOSPINDASHDUST disables spindash dust for a character
See merge request !52
2016-12-13 15:15:33 -05:00
Monster Iestyn
aa82042cf8
Merge branch 'credit_switch' into 'next'
...
No switching skins mid-credits/custom cutscene in SP
Does what it says on the tin.
See merge request !129
2016-12-13 09:33:53 -05:00
Monster Iestyn
68c8b8a68a
Merge branch 'multipatchtex-translucent-cyanpixel-fix' into 'master'
...
Multi-patch texture support for transparency AND translucency
Fixes the transparent bits of the multi-patch glass texture in THZ1 turning cyan when linedef types 900-908 are applied for translucency
See merge request !56
2016-12-12 14:29:44 -05:00
Monster Iestyn
3f3a26b7d4
Merge branch 'zoom_fix' into 'master'
...
Zoom tube camera fix
Fixed a mistake where I accidentially allowed people to change the player angle whilst in a zoom tube when previously improving them.
See merge request !57
2016-12-12 14:29:03 -05:00
Monster Iestyn
1ec97c242a
Merge branch 'smooth_ropes' into 'next'
...
Smoother ropes and zoom tubes
Makes rope hangs and zoom tubes suck less. Specifically, they handle corners (and vertical height changes, ala sloped rope hangs) a LOT nicer. Ported from internal.
See merge request !139
2016-12-12 14:18:36 -05:00
Sryder
93901847d3
Fix the Fixed Rounding functions
2016-12-12 00:06:48 +00:00
Monster Iestyn
ab423f99c6
Optimising retrieval of sector_floorpic/ceilingpic
...
As LJSonic has pointed out, there's no need for a for loop in either case; just use sector->floorpic/ceilingpic as a levelflats index directly
(Besides, if that was to stop any out-of-bounds indexes being used, that's hardly the way to do it anyway)
2016-12-09 21:18:06 +00:00
Monster Iestyn
d294c9d15c
P_NetUnArchiveWorld now uses P_AddLevelFlatRuntime instead of P_AddLevelFlat.
...
Also created P_CheckLevelFlat to just return the flat # from a name, since that's all P_NetArchiveWorld really needed from P_AddLevelFlat anyway
2016-12-08 21:45:25 +00:00
Alam Ed Arias
5e74318fb2
Merge branch 'master' into next
2016-12-06 17:29:43 -05:00
Monster Iestyn
7c07f39019
Make sure flipped things placed directly on ceiling get MFE_ONGROUND
...
This fixes ceiling springs apparently flying down with you in various scenarios
2016-12-05 22:07:16 +00:00
Monster Iestyn
84f3102ad0
Added FLIPX support for single patch textures with holes
...
This completes FLIPX/FLIPY support for all textures
2016-12-01 22:37:33 +00:00
Monster Iestyn
52a84cf309
Fix negative y offsets for both normal and y-flipped patches
2016-12-01 21:43:27 +00:00
toasterbabe
c833497d39
Correcting slip-up I made when originally improving zoom tubes.
2016-12-01 14:40:58 +00:00
toasterbabe
02d78b355b
Smoother ropes and zoom tubes ported from internal.
2016-12-01 14:33:44 +00:00
Monster Iestyn
ae3e11369e
Revert "(Messiness warning) attempt to start using SDL_SetRelativeMouseMode instead of the old hacks of making the mouse do movement without leaving the window and be hidden"
...
This reverts commit 347b531881 .
(Too experimental, may end up adding new bugs; let's just keep it to clean up for now)
2016-11-30 17:21:28 +00:00
Monster Iestyn
410b55ebcd
Work on FLIPX/FLIPX support:
...
*Added FLIPX/FLIPY support for multi-patch textures and single-patch textures without holes
*Added FLIPY support for single-patch textures with holes; I'll sort FLIPX support out later
2016-11-28 22:21:54 +00:00
Monster Iestyn
cc2612c2d8
Merge branch 'master' into TEXTURES-additions
2016-11-27 19:49:56 +00:00
Monster Iestyn
347b531881
(Messiness warning) attempt to start using SDL_SetRelativeMouseMode instead of the old hacks of making the mouse do movement without leaving the window and be hidden
...
Seems to work so far though
2016-11-25 21:13:39 +00:00
Monster Iestyn
38f7af9281
Added ability to use custom-defined lines with P_PointOnLineSide such as with P_ClosestPointOnLine
2016-11-24 22:01:51 +00:00
Monster Iestyn
aa146dee41
Disabled all seg_t/node_t-related Lua code for now
...
To re-enable support for the above, uncomment the define HAVE_LUA_SEGS line in lua_script.h. Plain bbox userdata stuff is not disabled (though currently it's not used anyway)
2016-11-24 21:11:44 +00:00
Monster Iestyn
73b8790946
Merge branch 'master' into lua-additions
2016-11-24 19:35:06 +00:00
toasterbabe
a9c68a78e9
Slope correction.
2016-11-24 15:23:13 +00:00
toasterbabe
095a438e9e
* Super float now back on spin button, again takes precedence over shield actives.
...
* Fixed BIG mistake where ShieldSpecial hook bailed out of the entire function instead of just the shield section.
2016-11-24 14:29:29 +00:00