Monster Iestyn
e2a4c59e21
cv_controlperkey probably belongs in g_input.h too
2018-10-11 19:37:48 +01:00
Monster Iestyn
4b7af892e1
Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts
2018-10-11 19:37:24 +01:00
Monster Iestyn
72ab305bf4
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
2018-10-11 17:05:23 +01:00
Monster Iestyn
b9b0a8110c
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
...
...that was a mouthful
2018-10-11 17:05:13 +01:00
Monster Iestyn
a13f076792
Merge branch 'translucency-transparency-transactions' into 'master'
...
Translucency transparency transactions
See merge request STJr/SRB2Internal!195
2018-10-10 14:26:10 -04:00
Monster Iestyn
77e85394d8
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
2018-10-10 14:59:44 +01:00
Monster Iestyn
d3da4cb527
Merge branch 'fof-slope-skew-backport'
2018-10-10 14:53:01 +01:00
Monster Iestyn
291ebf302c
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
8196c59557
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
Monster Iestyn
bedbfa048c
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
c469fc242f
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
1b531ddcfe
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
497314fdc4
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
44ed8cebbb
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
1324e0bfcd
* 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
12e0222929
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
1049f3451a
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
1115f41f8e
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
027e6e8e3c
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
232a7ae7b7
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
def090c9f0
Move the ifdef
2018-10-07 14:45:03 -04:00
Monster Iestyn
a5fb2143fd
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
toaster
b1e02467bf
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
fb6c329870
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
02597e0bf9
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
Sryder
d072dd2725
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
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
Monster Iestyn
6a6d32e7c2
searchfilemenu: Replace first with 0 here as toaster suggested
2018-09-23 14:17:29 +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
mazmazz
b7947554e2
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:42:28 -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
03367bdc60
Merge branch 'musicplus-core' into musicplus-feature-postboss
2018-09-19 20:07:03 -04:00
mazmazz
f52659d9f9
MP Postboss: strnicmp -> boolean remove cast (buildbots)
2018-09-19 19:54:14 -04:00
mazmazz
7084fc89bd
MP Core s_sound: I_FadeSongFromVolume call fix (buildbots)
2018-09-19 19:47:21 -04:00
