Sryder
00c36a9d9e
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
Sryder
d7f373a42d
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
Sryder
224b228089
Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
...
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
052df3265e
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
Monster Iestyn
951b4d1582
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
Steel Titanium
413d5e46c6
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
Steel Titanium
8368647b29
Fix DD compiling
2018-10-04 22:44:26 -04:00
Steel Titanium
1656b77bc0
Restore deleted endif
2018-10-04 22:38:59 -04:00
Steel Titanium
2eb9bebcd9
Split zlib and libpng
2018-10-04 19:47:19 -04:00
Alam Ed Arias
1b8c18fbc8
Merge branch 'master' into next
2018-10-02 09:14:59 -04:00
Monster Iestyn
7d076d799c
Merge branch 'linux-better-mem-report' into 'master'
...
Use MemAvailable instead
See merge request STJr/SRB2!281
2018-10-01 16:25:21 -04:00
Monster Iestyn
f3ebe6585e
Move player + player mobj existence checks to top of P_MoveChaseCamera. This is the only place it makes sense to even check them tbh.
...
While I'm at it, let's also use the "mo" variable instead of player->mo throughout the function (to be consistent)
2018-09-30 22:18:48 +01:00
Monster Iestyn
57f76051bd
Redo OpenGL skewing support, so that it now itself supports the lower unpegged effect for FOFs in OpenGL!
2018-09-28 17:02:02 +01:00
Steel Titanium
5efb94a35b
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
7f7c5b60ae
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Steel
502414d609
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
ac8658fac8
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
Steel Titanium
43cbb0d11e
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
13a3f197bd
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
Digiku
46691c557d
Merge branch 'le-fof-sametagfix' into 'master'
...
Linedef Exec FOF specials: Don't stop procedure after the first matching FOF in target sector
See merge request STJr/SRB2Internal!194
2018-09-20 08:09:25 -04:00
mazmazz
64d3aaef14
foundrover ffloor_t -> boolean
2018-09-19 20:11:30 -04:00
mazmazz
9042f1a23b
Initialize foundrover to NULL (for debug checking)
2018-09-19 17:50:05 -04:00
mazmazz
052f1aede6
Linedef exec FOF specials: Move logic into for (rover =...) block so procedure happens on every FOF match
2018-09-19 17:49:03 -04:00
Digiku
a8a0549bf4
Merge branch 'nights-keeppoints' into 'master'
...
NiGHTS: Deduct marescore when player hits ground, not immediately on timeout
See merge request STJr/SRB2Internal!161
2018-09-19 11:03:24 -04:00
Digiku
a5a8282a77
Merge branch 'nights-score-lap' into 'master'
...
NiGHTS: Intermission Bonuses
See merge request STJr/SRB2Internal!159
2018-09-19 11:03:14 -04:00
Digiku
96f61d8ae6
Nights intermission bonus y_inter.c: A comment
2018-09-19 10:53:11 -04:00
Digiku
eb307a4066
Nights intermission dehacked: a comment
2018-09-19 10:45:51 -04:00
Digiku
94730a921e
Merge branch 'le-fadefof' into 'master'
...
Linedef Exec Action: Fade FOF
See merge request STJr/SRB2Internal!168
2018-09-18 17:14:48 -04:00
mazmazz
7dfe25d1b5
Merge branch 'master' into le-fadefof
2018-09-18 17:11:33 -04:00
Digiku
ba0b15a715
Merge branch 'fof-fixes-movingplatexists' into 'master'
...
Moving platform fix: Player snaps to floor when setting ~FF_EXISTS
See merge request STJr/SRB2Internal!188
2018-09-18 11:29:11 -04:00
mazmazz
c213c23af3
420: Don't interrupt existing light fade on duration timing except EFFECT5
...
(cherry picked from commit 3b957c32517a8f5148940c0067af7e88a51d1fee)
2018-09-18 11:08:33 -04:00
Digiku
be6bae4ccb
Merge branch 'colormap-overhaul-fade' into 'master'
...
Linedef Exec 455 Fade Colormap, 456 Stop Fading Colormap
See merge request STJr/SRB2Internal!191
2018-09-18 11:06:09 -04:00
mazmazz
65aeea28bc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
mazmazz
83cfc7d0e4
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
Digiku
7e8fdcae54
Merge branch 'colormap-overhaul-change-ldef' into 'master'
...
Linedef Exec 447: Change Colormap relative value calc
See merge request STJr/SRB2Internal!190
2018-09-18 10:49:54 -04:00
Digiku
31ea145fb2
Merge branch 'polyobj-fade' into 'master'
...
Linedef Exec 492: Fade PolyObject
See merge request STJr/SRB2Internal!192
2018-09-18 10:48:46 -04:00
Digiku
34a340340d
Merge branch 'no-effect5-fudging' into 'master'
...
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
See merge request STJr/SRB2Internal!193
2018-09-18 10:48:29 -04:00
mazmazz
4da5d45cf5
S_ChangeMusic: More specific load/play fail messages
2018-09-18 09:38:41 -04:00
mazmazz
7b94368549
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
2018-09-18 07:37:29 -04:00
mazmazz
f3f8575dfc
492: Remove pre-existing thinker when setting up new fade
2018-09-18 07:31:19 -04:00
mazmazz
ae5b02bccd
492: Don't interrupt existing polyobj fader unless EFFECT5
2018-09-18 07:31:17 -04:00
mazmazz
5daf21de9b
455: A line break
2018-09-18 07:30:37 -04:00
mazmazz
71e7a15425
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:30:35 -04:00
mazmazz
a48b9d9e3f
455: Don't interrupt current color fading
2018-09-18 07:29:21 -04:00
mazmazz
aa9da189a6
453: A line break
2018-09-18 07:28:30 -04:00
mazmazz
dfaf0b00d4
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:28:28 -04:00
mazmazz
2fac7c36ad
453: Don't interrupt current FOF fade unless EFFECT5
2018-09-18 07:27:47 -04:00
Monster Iestyn
c088d55547
Merge branch 'public_next'
2018-09-17 21:50:19 +01:00
Monster Iestyn
e48e3e15c4
Merge branch 'public-var2s-fix' into 'next'
...
Level spec thinker: Netsync var2s
See merge request STJr/SRB2!280
2018-09-17 14:43:44 -04:00
mazmazz
f307c6d1b6
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
