Sryder
7b417b573c
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
725a65c1f7
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
Monster Iestyn
1ec601af6b
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
Steel Titanium
b812a6a4ab
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
Steel Titanium
fc5d969642
Fix DD compiling
2018-10-04 22:44:26 -04:00
Steel Titanium
49cb1ffe9f
Restore deleted endif
2018-10-04 22:38:59 -04:00
Steel Titanium
79f5f4885c
Split zlib and libpng
2018-10-04 19:47:19 -04:00
Alam Ed Arias
348f4dc2cd
Merge branch 'master' into next
2018-10-02 09:14:59 -04:00
Monster Iestyn
a605ee9c11
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
800b3bb240
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
872e2f82c1
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
f88708bb75
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
68ec811909
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Steel
af58ba9ae3
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
be74b4e58b
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
Steel Titanium
378495cb2b
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
a53f036149
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
Digiku
b75f54ea95
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
31343be41b
foundrover ffloor_t -> boolean
2018-09-19 20:11:30 -04:00
mazmazz
5e1b4272c1
Initialize foundrover to NULL (for debug checking)
2018-09-19 17:50:05 -04:00
mazmazz
24938473a5
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
87087c190e
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
106afd48af
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
e3ecb61173
Nights intermission bonus y_inter.c: A comment
2018-09-19 10:53:11 -04:00
Digiku
1dadee6804
Nights intermission dehacked: a comment
2018-09-19 10:45:51 -04:00
Digiku
981c149e01
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
81ad8f0681
Merge branch 'master' into le-fadefof
2018-09-18 17:11:33 -04:00
Digiku
b7bcc16c98
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
c45d523e8f
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
a036c42973
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
3cdd904fbc
Merge branch 'colormap-overhaul-fade' into le-fadefof
2018-09-18 11:05:30 -04:00
mazmazz
899e8ef2a0
Merge remote-tracking branch 'origin/master' into le-fadefof
2018-09-18 10:52:03 -04:00
Digiku
a32304c9d5
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
843ed289a6
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
a2c64d0e96
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
34e403afcb
S_ChangeMusic: More specific load/play fail messages
2018-09-18 09:38:41 -04:00
mazmazz
e7ecd84e80
p_setup: Don't fudge texture offsets if EFFECT5 and a linedef exec
2018-09-18 07:37:29 -04:00
mazmazz
5029c01c2b
492: Remove pre-existing thinker when setting up new fade
2018-09-18 07:31:19 -04:00
mazmazz
6567872229
492: Don't interrupt existing polyobj fader unless EFFECT5
2018-09-18 07:31:17 -04:00
mazmazz
9778cc2ad5
455: A line break
2018-09-18 07:30:37 -04:00
mazmazz
56ee711f33
455: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:30:35 -04:00
mazmazz
64b96c7192
455: Don't interrupt current color fading
2018-09-18 07:29:21 -04:00
mazmazz
27aa357053
453: A line break
2018-09-18 07:28:30 -04:00
mazmazz
f5b25c91f5
453: Commented out, but allow existing fade overlap of 2 tics (or speed*2)
2018-09-18 07:28:28 -04:00
mazmazz
5b16590ba2
453: Don't interrupt current FOF fade unless EFFECT5
2018-09-18 07:27:47 -04:00
Monster Iestyn
fab25a451f
Merge branch 'public_next'
2018-09-17 21:50:19 +01:00
Monster Iestyn
1763087844
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
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
Digiku
6f1a44432b
Merge branch 'colormap-overhaul' into 'master'
...
Colormap code overhaul
See merge request STJr/SRB2Internal!189
2018-09-17 11:24:14 -04:00
mazmazz
c462bd4b17
Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade
2018-09-17 10:57:02 -04:00
