Digiku
2f7cfcc7b8
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
e1e00ecb88
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
9591ac92ec
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
72796d3d62
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
9e8784a376
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
f8a3343500
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
7a8cdf06f4
Reset player->rings on denightserize and on new mare
2018-08-10 04:01:33 -04:00
mazmazz
37b50ca5a4
Tag damage fix error
2018-08-10 02:34:21 -04:00
mazmazz
674b9e918f
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
c2f81eaf8f
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation
2018-08-10 02:18:24 -04:00
mazmazz
f7a32c9fad
MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries
2018-08-10 02:18:20 -04:00
MascaraSnake
f0f8698d04
Reorganized the thing type numbers
2018-08-03 23:58:11 +02:00
Monster Iestyn
594cc953b5
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
502c80eaac
Merge branch 'master' into hardcoding-time-again
2018-08-02 16:04:54 +01:00
Monster Iestyn
1b6e85fda0
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
f6b8206660
Merge branch 'public_next'
...
# Conflicts:
# src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
Monster Iestyn
10668f14b8
Merge branch 'master' into next
2018-07-31 19:36:30 +01:00
Monster Iestyn
e4f38995e7
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
6bf3274452
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
d649700abf
Re-did this fix.
2018-07-28 01:58:25 -04:00
Alam Ed Arias
6d9bf3c5b3
Merge branch 'master' into next
2018-07-20 17:35:53 -04:00
Alam Ed Arias
f80b4e18a2
Fixup PROFILEMODE
2018-07-20 17:35:18 -04:00
Monster Iestyn
107dbf7496
Merge branch 'master' into next
2018-07-11 21:37:23 +01:00
Monster Iestyn
1e4e0006cb
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
e9339b6356
Merge branch 'master' into next
2018-07-11 21:18:39 +01:00
Monster Iestyn
c8aaad253d
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
639f0d335b
Update f_finale.c
2018-07-07 20:20:46 -04:00
Alam Ed Arias
e219f92c6b
Merge branch 'master' into next
2018-07-07 16:42:50 -04:00
Alam Arias
57f74bcc82
Update m_misc.c
2018-07-07 20:41:11 +00:00
Alam Arias
b4d84a171e
Update m_misc.c
2018-07-07 20:33:19 +00:00
Monster Iestyn
71a40a8125
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
5758beb6b2
Merge branch 'md2-smoother-interpolation' into 'master'
...
Smoother MD2 interpolation
See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
MonsterIestyn
a1ebb61b0a
Merge pull request #252 from GoldenTails/patch-1
...
Fixed MD2 models not loading correctly on Linux
2018-07-06 19:12:21 +01:00
GoldenTails
cdaadc0037
Merge remote-tracking branch 'STJrSRB2/master' into patch-1
2018-07-05 16:44:34 -05:00
Monster Iestyn
15812dfb30
Merge branch 'master' into next
2018-07-05 21:09:39 +01:00
Monster Iestyn
2004a852a6
Merge branch 'lua-exploit-fix' into 'master'
...
Lua exploit fix
See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00
MonsterIestyn
e536a5fb28
Merge pull request #264 from LJSonik/password-security-fix
...
Disable admin password by default
2018-07-05 20:16:19 +01:00
LJSonik
333a98fb59
Merge branch 'master' into password-security-fix
2018-07-05 20:58:00 +02:00
MonsterIestyn
b6881d75db
Merge pull request #232 from LJSonik/minor-net-command-fixes
...
Minor net command fixes
2018-07-05 19:56:17 +01:00
LJSonik
5c246dfcac
Merge branch 'master' into minor-net-command-fixes
2018-07-05 20:00:38 +02:00
LJSonik
48a1e4b63c
Merge branch 'master' into password-security-fix
2018-07-05 19:46:36 +02:00
Steel Titanium
6d1a8703c7
Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation
2018-07-05 01:23:56 -04:00
Steel Titanium
d47e7014bc
Merge remote-tracking branch 'upstream/master' into md2-fopen-error
2018-07-05 01:21:09 -04:00
Steel Titanium
b7776da524
Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix
2018-07-05 01:20:32 -04:00
Steel Titanium
e104e01057
Merge remote-tracking branch 'upstream/master' into gme-pause
2018-07-05 01:16:43 -04:00
Monster Iestyn
56ccf5ab7c
Fixed the Lua crash exploit.
2018-07-04 20:15:36 +01:00
Monster Iestyn
1c30318bd3
fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)
2018-07-02 21:03:04 +01:00
Monster Iestyn
4fc9ec6cba
remove MF_RUNSPAWNFUNC from MT_CACOLANTERN
2018-07-02 20:35:39 +01:00
Monster Iestyn
e662d6cbf1
Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore.
...
Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.
2018-07-01 22:01:00 +01:00
Monster Iestyn
a23d5cf101
huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems
2018-07-01 19:47:26 +01:00
