365a59f186
Revert "SETSPHERES console command for debugging/cheating"
...
This reverts commit 4cb7036f51
2018-08-16 11:34:57 -04:00
f19b7bfacf
Merge branch 'horizon-line-hom-fix' into 'master'
...
Horizon line HOM fix
See merge request STJr/SRB2Internal!152
2018-08-12 03:48:20 -04:00
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
299337f578
Merge branch 'leveltitle-tinkering' into 'master'
...
Leveltitle tinkering
See merge request STJr/SRB2Internal!134
2018-08-10 15:30:26 -04:00
a5510cab5d
Merge branch 'master' into polyobj-sky-plane-crash-fix
2018-08-10 20:06:12 +01:00
d7830dfff4
Merge branch 'master' into horizon-line-hom-fix
2018-08-10 20:04:39 +01:00
55fd60b29b
Merge branch 'master' into leveltitle-tinkering
...
# Conflicts:
# src/hu_stuff.h
2018-08-10 20:03:59 +01:00
fa382c0233
Merge branch 'public_next'
2018-08-10 19:36:51 +01:00
7ee9c5b0f4
Merge branch 'master' into next
2018-08-10 19:31:15 +01:00
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
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
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
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
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
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
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
b05960431d
Reset player->rings on denightserize and on new mare
2018-08-10 04:01:33 -04:00
14c17cf012
Tag damage fix error
2018-08-10 02:34:21 -04:00
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
e0f6dee8be
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 02:18:24 -04:00
fe61678437
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 02:18:20 -04:00
145c050e14
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
5daeaf529f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +01:00
10a2ba8d39
Merge branch 'master' into next
2018-08-07 20:54:19 +01:00
c8ea5cfcaa
Merge branch 'transparency_i_hardly_knew_er' into 'master'
...
Transparency? I hardly knew 'er!
See merge request STJr/SRB2!264
2018-08-07 15:29:35 -04:00
ecc9ebe8c1
Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice).
...
Please note I haven't touched the ASM equivalent, given as it's not actually used.
2018-08-07 19:12:10 +01:00
02d2b61866
Merge branch 'master' into next
2018-08-06 15:15:35 +01:00
5943eb125e
Merge branch 'lua-archive-long-string-fix' into 'next'
...
Fixes for archiving/unarchiving Lua strings in netgames
See merge request STJr/SRB2!262
2018-08-06 10:12:59 -04:00
8d54d8adaa
Merge branch 'password-fix-hotfix' into 'master'
...
Password fix hotfix
See merge request STJr/SRB2!261
2018-08-06 09:43:54 -04:00
2738f3a537
Rewrite archiving/unarchiving of Lua strings for netgames.
...
This now means:
* Lua strings longer than 1024 chars can now be read properly without awful crashes
* Lua strings with embedded zeros can be written/read without truncating anything (hopefully)
2018-08-05 22:02:20 +01:00
8d622ff6f8
Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server!
2018-08-05 20:17:30 +01:00
21cb0cab3c
Reorganized the thing type numbers
2018-08-03 23:58:11 +02:00
83d87c343b
Fix Cacolantern's preparing sound being played everywhere across the map
...
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
2018-08-02 16:15:30 +01:00
b5ec286667
Merge branch 'master' into hardcoding-time-again
2018-08-02 16:04:54 +01:00
d1b45c72b9
Merge branch 'pk3-wad-map-noreload-hotfix' into 'master'
...
PK3 WAD Map NoReload hotfix
See merge request STJr/SRB2Internal!148
2018-07-31 14:43:14 -04:00
be5d0406bd
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
74646052b0
Merge branch 'master' into next
2018-07-31 19:36:30 +01:00
485d990949
Merge branch 'gme-lowvolume-fix' into 'master'
...
GME low volume fix
See merge request STJr/SRB2!248
2018-07-31 14:35:32 -04:00
16999b7080
Merge branch 'gme-pause' into 'master'
...
Fix pausing on gme
See merge request STJr/SRB2!251
2018-07-31 14:33:56 -04:00
c02ee9a502
Re-did this fix.
2018-07-28 01:58:25 -04:00
79e4c3760a
Merge branch 'master' into next
2018-07-20 17:35:53 -04:00
1ee7eda0ad
Fixup PROFILEMODE
2018-07-20 17:35:18 -04:00
a06ef26149
Merge branch 'master' into next
2018-07-11 21:37:23 +01:00
8e19611033
Merge branch 'opengl-fof-lowerunpegged' into 'master'
...
OpenGL: FOF walls + Lower unpegged
See merge request STJr/SRB2!258
2018-07-11 16:36:26 -04:00
09ae0aae53
Merge branch 'master' into next
2018-07-11 21:18:39 +01:00
c127ea3ceb
Merge branch 'opengl-projectsprite-fix' into 'master'
...
OpenGL HWR_ProjectSprite fix
See merge request STJr/SRB2!255
2018-07-11 16:15:42 -04:00
2cd2b6bf10
Backport Kart Krew's fix for the 1px HOM with horizon lines
2018-07-08 22:30:37 +01:00
0a931a1364
Update f_finale.c
2018-07-07 20:20:46 -04:00
17570c1ad6
Merge branch 'master' into next
2018-07-07 16:42:50 -04:00
a79b9a9127
Update m_misc.c
2018-07-07 20:41:11 +00:00
mazmazz