mazmazz
54343bc05f
Change special stage bonus to NiGHTS in-level score, per MB
2018-08-12 20:36:53 -04:00
mazmazz
89f57cb111
Have just one NiGHTS bonus option: NIGHTS and LINK together
2018-08-12 20:25:35 -04:00
mazmazz
feadcbfc94
BONUSTYPE typo; bonus alignment
2018-08-12 19:32:11 -04:00
mazmazz
372fc540bc
Totalmarescore typo
2018-08-12 19:26:18 -04:00
mazmazz
30d57eac79
NiGHTS bonus implementation
2018-08-12 19:25:21 -04:00
mazmazz
61999100e5
totalmarescore player variable for NiGHTS scoring
2018-08-12 19:21:55 -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
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
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
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
toaster
145c050e14
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
toaster
5daeaf529f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +01:00
Monster Iestyn
10a2ba8d39
Merge branch 'master' into next
2018-08-07 20:54:19 +01:00
toaster
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
Monster Iestyn
02d2b61866
Merge branch 'master' into next
2018-08-06 15:15:35 +01:00
Monster Iestyn
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
Monster Iestyn
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
MascaraSnake
21cb0cab3c
Reorganized the thing type numbers
2018-08-03 23:58:11 +02:00
Monster Iestyn
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
Monster Iestyn
b5ec286667
Merge branch 'master' into hardcoding-time-again
2018-08-02 16:04:54 +01:00
Monster Iestyn
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
Monster Iestyn
be5d0406bd
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
Monster Iestyn
74646052b0
Merge branch 'master' into next
2018-07-31 19:36:30 +01:00
Monster Iestyn
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
Monster Iestyn
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
Steel Titanium
c02ee9a502
Re-did this fix.
2018-07-28 01:58:25 -04:00
Alam Ed Arias
79e4c3760a
Merge branch 'master' into next
2018-07-20 17:35:53 -04:00
Alam Ed Arias
1ee7eda0ad
Fixup PROFILEMODE
2018-07-20 17:35:18 -04:00
Monster Iestyn
a06ef26149
Merge branch 'master' into next
2018-07-11 21:37:23 +01:00
Monster Iestyn
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
Monster Iestyn
09ae0aae53
Merge branch 'master' into next
2018-07-11 21:18:39 +01:00
Monster Iestyn
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
colette
0a931a1364
Update f_finale.c
2018-07-07 20:20:46 -04:00
Alam Ed Arias
17570c1ad6
Merge branch 'master' into next
2018-07-07 16:42:50 -04:00
Alam Arias
a79b9a9127
Update m_misc.c
2018-07-07 20:41:11 +00:00
Alam Arias
7da6aca450
Update m_misc.c
2018-07-07 20:33:19 +00:00
Monster Iestyn
f1bba60373
Merge branch 'md2-fopen-error' into 'master'
...
More helpful error messages
See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn
130de10f97
Merge branch 'md2-smoother-interpolation' into 'master'
...
Smoother MD2 interpolation
See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
GoldenTails
761a221840
Merge remote-tracking branch 'STJrSRB2/master' into patch-1
2018-07-05 16:44:34 -05:00
Monster Iestyn
e5236c3137
Merge branch 'master' into next
2018-07-05 21:09:39 +01:00
Monster Iestyn
8c56e39c18
Merge branch 'lua-exploit-fix' into 'master'
...
Lua exploit fix
See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
