Alam Ed Arias
bb94d9fa3a
Merge branch 'master' into XPMupdate
2018-08-11 20:37:34 -04:00
Alam Ed Arias
6603f26772
Merge branch 'xpm_fix' into 'XPMupdate'
...
Fix white being treated as transparent.
See merge request STJr/SRB2!266
2018-08-11 20:36:57 -04:00
Steel Titanium
d9c7334dea
Fix white being treated as transparent.
2018-08-10 19:02:03 -04:00
mazmazz
c72e724122
Merge branch 'nightsplus-laplogic' into nightsplus-le
...
# Conflicts:
# src/p_map.c
# src/p_setup.c
2018-08-10 17:24:12 -04:00
Alam Ed Arias
0575d2f1f9
TravisCI: remove gcc-5 test, gcc-5 package is gone
2018-08-10 17:16:26 -04:00
mazmazz
872761e258
Add lapbegunat and lapstartedtime player variables
...
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
2018-08-10 17:12:26 -04:00
Alam Ed Arias
3479310546
SDL: update IMG_xpm.c
2018-08-10 17:09:11 -04:00
mazmazz
18b5b70822
Add lastmarelap and lastmarebonuslap player variables
2018-08-10 16:30:49 -04:00
mazmazz
d58445fdf3
Set player->finishedrings upon new mare
...
(Forgot this line from the player->spheres merge, so let's straggle here)
2018-08-10 16:17:28 -04:00
mazmazz
f69f102531
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le
...
# Conflicts:
# src/p_map.c
# src/p_setup.c
2018-08-10 15:51:20 -04:00
Monster Iestyn
30e4d2cd51
Merge branch 'polyobj-sky-plane-crash-fix' into 'master'
...
Polyobject sky plane crash fix
See merge request STJr/SRB2Internal!146
2018-08-10 15:40:43 -04:00
Monster Iestyn
299337f578
Merge branch 'leveltitle-tinkering' into 'master'
...
Leveltitle tinkering
See merge request STJr/SRB2Internal!134
2018-08-10 15:30:26 -04:00
mazmazz
1b922b8ba5
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
...
# Conflicts:
# src/p_map.c
# src/p_setup.c
2018-08-10 15:10:26 -04:00
Monster Iestyn
a5510cab5d
Merge branch 'master' into polyobj-sky-plane-crash-fix
2018-08-10 20:06:12 +01:00
Monster Iestyn
8d0a44899a
Merge branch 'master' into change-colormap-ldef
2018-08-10 20:05:04 +01:00
Monster Iestyn
d7830dfff4
Merge branch 'master' into horizon-line-hom-fix
2018-08-10 20:04:39 +01:00
mazmazz
7f4e2a6164
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop
2018-08-10 15:04:14 -04:00
Monster Iestyn
55fd60b29b
Merge branch 'master' into leveltitle-tinkering
...
# Conflicts:
# src/hu_stuff.h
2018-08-10 20:03:59 +01:00
mazmazz
b8eb282367
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker
2018-08-10 15:03:07 -04:00
mazmazz
508e1a2595
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof
2018-08-10 15:02:43 -04:00
mazmazz
d405bdfd9b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes
2018-08-10 15:00:41 -04:00
mazmazz
07c882139b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things
2018-08-10 14:58:27 -04:00
Monster Iestyn
fa382c0233
Merge branch 'public_next'
2018-08-10 19:36:51 +01:00
Monster Iestyn
7ee9c5b0f4
Merge branch 'master' into next
2018-08-10 19:31:15 +01:00
Monster Iestyn
653fd3038d
Merge branch 'woops!_all_trans' into 'master'
...
Woops! All trans
See merge request STJr/SRB2!265
2018-08-10 14:27:45 -04:00
Digiku
a439dce584
Merge branch 'hardcoding-nights-spheredamage' into 'master'
...
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently
See merge request STJr/SRB2Internal!157
2018-08-10 13:50:57 -04:00
Digiku
ed99f3a425
Merge branch 'nights-invertloopfix' into 'master'
...
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2Internal!138
2018-08-10 13:49:42 -04:00
mazmazz
d97c25f6dd
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le
...
# Conflicts:
# src/p_setup.c
# src/p_user.c
2018-08-10 13:44:47 -04:00
mazmazz
487c62fe31
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic
...
# Conflicts:
# src/p_setup.c
2018-08-10 13:35:59 -04:00
mazmazz
672e196aa4
Pandora's Box support for player->spheres
...
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
2018-08-10 13:15:54 -04:00
MascaraSnake
04063ba3a2
Merge branch 'hardcoding-time-again' into 'master'
...
Hardcoding time again
See merge request STJr/SRB2Internal!130
2018-08-10 13:14:53 -04:00
mazmazz
4cb7036f51
SETSPHERES console command for debugging/cheating
...
Fixed sphere spill bug where no spheres spill if player->rings is 0
2018-08-10 13:06:53 -04:00
mazmazz
5115097dc2
Make bigger default Flicky follow trigger from 128 radius to 320 radius
2018-08-10 04:24:14 -04:00
mazmazz
bd8316f49b
Track player's previous mare rings with player->finishedrings.
...
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
2018-08-10 04:05:20 -04:00
mazmazz
b05960431d
Reset player->rings on denightserize and on new mare
2018-08-10 04:01:33 -04:00
mazmazz
14c17cf012
Tag damage fix error
2018-08-10 02:34:21 -04:00
mazmazz
62e288a664
Correct player->spheres deduction upon losing spheres
...
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.
Therefore, just deduct player->spheres.
2018-08-10 02:18:34 -04:00
mazmazz
e0f6dee8be
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 02:18:24 -04:00
mazmazz
fe61678437
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 02:18:20 -04:00
mazmazz
09f4309f45
Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option
2018-08-09 23:14:14 -04:00
mazmazz
b28183129f
NiGHTS drill meter penalty when mashing jump button
...
Thanks Inuyasha (KS) for code
2018-08-09 22:15:13 -04:00
mazmazz
bf74b81842
Snappier NiGHTS pickup attraction
...
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
2018-08-09 21:24:01 -04:00
mazmazz
5eafebe4d4
A_FlickyCenter implementation - now Flickies can be attracted to players!
...
* Changed default movement to attraction, vs. aimless
* Flickies spawned from this will always have the FLICKY_CENTER mobj as its target
* Use P_IsFlickyCenter to identify FLICKY_CENTER mobjs versus players
* FLICKY_CENTER mobj tracer points to the spawned Flicky
* Thanks toaster for the original code~~
2018-08-09 17:28:37 -04:00
toaster
145c050e14
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
mazmazz
38eae01400
MT_FLICKY_x_CENTER defs
2018-08-09 12:08:06 -04:00
toaster
5daeaf529f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +01:00
mazmazz
904ff6fccb
Choose Flicky Fish Color by Thing Parameter
2018-08-09 04:19:18 -04:00
mazmazz
f7c80f3980
Make standing flickies bounce if MTF_AMBUSH and not MTF_OBJECTSPECIAL
2018-08-09 02:55:22 -04:00
mazmazz
9127a835c1
Flicky stand animation fixes
2018-08-09 02:27:25 -04:00
mazmazz
abbc7631cd
Flicky stand implementation by MTF_AMBUSH
...
* MTF_OBJECTSPECIAL: Set no gravity for flicky
2018-08-09 02:08:25 -04:00