Monster Iestyn
12752e0a43
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
Steel Titanium
0c9e8cff07
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
4d883e740d
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
fa1377d540
Move the ifdef
2018-10-07 14:45:03 -04:00
Monster Iestyn
ef9cbb5fe1
Merge branch 'fixer-mixer' into 'master'
...
Fixer mixer: Mixer Memory Leaks
See merge request STJr/SRB2!287
2018-10-07 13:10:26 -04:00
Sryder
e24a5181df
I'm fairly sure GCC64 should enable GCC63.
...
No wonder I never got mixed declaration and code warnings.
2018-10-07 15:44:44 +01:00
toaster
2ad2cbcc0a
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
Sryder
d9d98ec1a9
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
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
mazmazz
9fd7fac3ae
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:41:40 -04:00
mazmazz
82c049e80d
MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots)
2018-09-20 08:23:29 -04:00
mazmazz
65314be0ec
MP Libopenmpt: Fix UINT32->double cast (buildbots)
2018-09-20 07:42:35 -04:00
mazmazz
bde488215f
MP Libopenmpt: SDL header in load_libraries
2018-09-20 07:39:53 -04:00
mazmazz
28b456c05d
MP Libopenmpt: Separate loading into sdl/load_libraries.c
2018-09-19 23:18:06 -04:00
mazmazz
e29f8432e8
MP libopenmpt: Remove from Linux buildbots due to explicit OPENMPT=1 change
2018-09-19 23:05:46 -04:00
mazmazz
f771c12701
MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms
2018-09-19 23:03:35 -04:00
mazmazz
0a35e11e2c
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:57:19 -04:00
mazmazz
c737b18924
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:56:49 -04:00
mazmazz
67e89f9425
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:46:57 -04:00
mazmazz
ef9b2b633f
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:32:51 -04:00
mazmazz
494f172597
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:32:49 -04:00
mazmazz
85e028c1bf
MP Core s_sound: Mixed D+C fix (buildbots)
2018-09-19 19:19:18 -04:00
mazmazz
43f6038d98
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:18:35 -04:00
mazmazz
8eb2171fcd
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:06:24 -04:00
mazmazz
b5e1856377
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 18:55:00 -04:00
mazmazz
a45d4e31be
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 18:54:58 -04:00
mazmazz
fae377b896
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:33 -04:00
mazmazz
ec61164765
MP Core: 2.1 dehacked typo
2018-09-18 23:29:18 -04:00
mazmazz
15dc28144b
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-18 22:24:44 -04:00
mazmazz
9d40bf57fe
Mixer: Add back var_cleanup in I_LoadSong
...
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:24:07 -04:00
mazmazz
4fa7a4ca37
musicplus-le-changemusic 2.2 -> 2.1 backport
2018-09-18 15:28:57 -04:00
mazmazz
a3664c3083
Lua P_RestoreMusic else if fix
2018-09-18 15:11:37 -04:00
