Monster Iestyn
ae68bae4a7
Merge branch 'no-doubling-texture-heights-plz-backport' into 'next'
...
No doubling texture heights plz
See merge request STJr/SRB2!296
2018-10-14 15:43:57 -04:00
Monster Iestyn
9f710ffbe1
Be gone ye old texture hack
2018-10-11 21:08:25 +01:00
Monster Iestyn
afd62ec071
Merge branch 'master' into next
2018-10-09 22:55:55 +01: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
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
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
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
Monster Iestyn
94b02c8e44
Merge branch 'mario-block-sync' into 'next'
...
Fix for Mario block FOF texture synchronisation in netgames
See merge request STJr/SRB2!279
2018-09-15 10:15:47 -04:00
Monster Iestyn
128e5fd2bb
Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items
2018-09-14 21:01:07 +01:00
Monster Iestyn
d097bb7e9e
Merge branch 'thwomp-fixes' into 'next'
...
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS
See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
Digiku
8f59606199
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
mazmazz
a7ec620ea4
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
Monster Iestyn
d8f73b0d97
Merge branch 'master' into next
2018-09-11 16:34:16 +01:00
Monster Iestyn
bf6379c3df
Merge branch 'colormap-code-cleanup' into 'master'
...
Colormap code cleanup
See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
Monster Iestyn
22b799a655
Remove commented out stuff, now I've confirmed everything works fine without them
2018-09-10 15:49:21 +01:00
Monster Iestyn
a5ba47cb3a
R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
...
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
Monster Iestyn
ae6085ef1a
Merge branch 'netcode-nitpicking' into 'next'
...
Netcode nitpicking
See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
Monster Iestyn
6774933263
Merge branch 'addfile-verify-fix' into 'next'
...
Addfile command verify fix.
See merge request STJr/SRB2!272
2018-09-03 17:17:46 -04:00
Monster Iestyn
d68585a9d0
SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general
2018-09-03 20:53:40 +01:00
Monster Iestyn
339ffe8d08
UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses
2018-09-03 15:56:02 +01:00
