Monster Iestyn
89d7c55878
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
Monster Iestyn
afd62ec071
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
Monster Iestyn
98317cc7de
Merge branch 'ogl-fof-slope-skew-support' into 'fof-slope-skew-backport'
...
OpenGL FOF slope skewing
See merge request STJr/SRB2!283
2018-10-09 15:20:17 -04:00
Monster Iestyn
7407ee6c0e
Merge branch 'movechasecamera-crashfix' into 'next'
...
Fix for Chicmunk's weird camera related crash
See merge request STJr/SRB2!284
2018-10-09 15:20:06 -04:00
Monster Iestyn
9914353758
Merge branch 'tiny-joystick-fix' into 'master'
...
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
See merge request STJr/SRB2!292
2018-10-09 15:19:41 -04:00
Sryder
a7ba0b958a
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
...
No memory leak here, just a very tiny thing I noticed.
2018-10-09 19:43:18 +01:00
Monster Iestyn
bda6a1195b
Merge branch 'freeSOC_stoagoodhome' into 'master'
...
Free SOC_s to a good home
See merge request STJr/SRB2!291
2018-10-08 18:07:23 -04:00
toaster
d62566e3ea
* Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!)
...
* Optimise the repeated strlen usage into a single call, which is stored for later.
2018-10-08 18:50:17 +01:00
Monster Iestyn
19eb6ba7de
Merge branch 'drwhoandthesleepingweather' into 'master'
...
Dr. Who And The Sleeping Weather
See merge request STJr/SRB2!288
2018-10-08 09:36:18 -04:00
Monster Iestyn
049d123d1f
Merge branch 'sp-savegame-continue-crash-fix' into 'master'
...
SP savegame continues icon crash
See merge request STJr/SRB2!290
2018-10-08 09:20:45 -04:00
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
Monster Iestyn
3ef4b7db0d
searchfilemenu: Replace first with 0 here as toaster suggested
2018-09-23 14:17:29 +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
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
0a35e11e2c
Merge branch 'public-musicplus-core' into public-musicplus-le-changemusic
2018-09-19 19:57:19 -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
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
fae377b896
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:33 -04:00
mazmazz
9042f1a23b
Initialize foundrover to NULL (for debug checking)
2018-09-19 17:50:05 -04:00
