toasterbabe
2aa1215716
Fix a thing where the host adds a WAD and you have too many WADs loaded to add it.
2017-05-25 15:22:32 +01:00
Monster Iestyn
6062223eb5
Merge branch 'master' into next
2017-05-22 13:23:46 +01:00
Monster Iestyn
284e539c66
Don't bail out in Y_StartIntermission in dedicated mode, this causes the game not to add on score bonuses for players from the server's view of things!
2017-05-19 16:31:23 +01:00
Monster Iestyn
1781ccf4ca
Merge branch 'master' into next
2017-05-17 16:16:50 +01:00
Monster Iestyn
17a06dd6c4
I_GetConsoleEvents: Split KEY_EVENT code into a function of its own, like with I_GetEvent's event types
...
One benefit of this is that event_t data need only be created if KEY_EVENT is found, since the other event types never do anything anyway
2017-05-15 18:39:59 +01:00
Monster Iestyn
87085f2475
SDLSetMode: merge wasfullscreen/windowed mode code into one block
2017-05-15 16:35:32 +01:00
Monster Iestyn
a340f2c8ed
Impl_CreateWindow: re-use "flags" for SDL_RENDERER_* flags, remove unnecessary curly braces
2017-05-15 16:19:28 +01:00
Monster Iestyn
4979ab6b8e
Not really important or anything, but checking render_soft == rendermode rather than rendermode == render_soft always bugged me. And it's not consistent with the rest of the source code (or at least most of it) anyway.
2017-05-15 15:43:31 +01:00
Monster Iestyn
d1bbd1261e
VID_SetMode: SDLSetMode should use vid.width/vid.height, not windowedModes[modeNum].
...
If modenum was < 0 or >= MAXWINMODES, that would make windowedModes[modeNum] be out of bounds and possibly crash the game.
2017-05-15 15:36:51 +01:00
Monster Iestyn
093800cb06
I_FinishUpdate: OglSdlFinishUpdate should never run for render_soft, even if screens[0] somehow is NULL
2017-05-15 15:24:40 +01:00
Monster Iestyn
f8482421e5
Don't need to use WADFILENUM/LUMPNUM in this function, since W_CheckNumForNamePwad returns just the lump number, not a combined WAD + lump number frankenstein's monster
...
This is just in case someone actually tries to dump in C_START/C_END and "add" colormaps using them, not that they would ever be used currently anyway.
2017-05-15 14:38:55 +01:00
Monster Iestyn
222807c6f6
Fix R_InitExtraColormaps reporting 6 or more colormaps every time you loaded the game, even though we haven't used C_START/C_END in more than a decade now
...
Note to self: W_ functions are awfully confusing with returning with LUMPERROR or INT16_MAX. Should sort out what's going on there if necessary
2017-05-15 14:29:31 +01:00
Monster Iestyn
b8ffeeb59f
Update version number to v2.1.18
...
Don't worry, I remembered to update MODVERSION as well this time :)
2017-05-12 16:06:27 +01:00
Monster Iestyn
55fd0aba91
Merge branch 'master' into next
2017-05-11 20:47:12 +01:00
Monster Iestyn
96c63bf95b
Whoops forgot this bit too
2017-05-09 20:17:46 +01:00
Monster Iestyn
8582406dd2
prevent invalid nodes from crashing Net_CloseConnection, print a warning and return instead
2017-05-09 15:13:19 -04:00
Monster Iestyn
41130465b4
Use NF instead of normal P_SetMobjState to prevent endless looping
2017-05-07 22:21:17 +01:00
Monster Iestyn
18fa73ba05
Merge branch 'admin-ban-fix' into 'next'
...
Admin ban fix
Okay, THIS time admin bans should work properly. Turns out the relevant code for banning did not properly consider the case of admins doing the banning, at least until now.
Unlike my last attempt at fixing admin bans (!165 ), this one would require both host and admin to have the fix exe assuming everyone else would be using 2.1.17, so I'm merging to next instead of master.
See merge request !167
2017-04-30 21:05:07 -04:00
Monster Iestyn
0dabef730d
Merge branch 'allowteamchange-fix' into 'next'
...
Allowteamchange fix
Fixes "allowteamchange no" to actually work properly and NOT desync you from the game in most cases. You can now switch TO spectator freely (as intended it turns out), and switching FROM spectator is prohibited. The "Enter Game" menu option in Match/Tag now displays one of those blue window notices just like with "Change Teams" in CTF/Team Match if you cannot change teams right now. Everything else works as you'd expect.
The de-sync issue was originally reported here https://mb.srb2.org/showthread.php?p=789965#85
See merge request !168
2017-04-30 21:04:07 -04:00
Monster Iestyn
058ad4df88
Merge branch 'master' into next
2017-04-26 16:15:40 +01:00
Monster Iestyn
c16ae57f91
Merge branch 'addfile-directories-fix' into 'next'
...
Addfile directories fix
This is a fix for this bug: https://mb.srb2.org/showthread.php?t=42279
See merge request !166
2017-04-24 20:46:38 -04:00
Monster Iestyn
e03577d957
Merge branch 'falling-rocks-fix' into 'next'
...
Falling rocks fix
This fixes the rock spawners' rocks not being removed if they rolled down to the ground from a slope rather than bouncing (see https://mb.srb2.org/showthread.php?t=41963 )
See merge request !162
2017-04-24 20:41:32 -04:00
Monster Iestyn
7f7c7c58ab
Use less-than, not less-than-or-equals, since deststop is off-screen
2017-04-24 17:41:50 +01:00
Inuyasha
5e4f960f3a
fixed drawfill to be more consistent w/ other functions
...
doesn't draw off of the sides, and doesn't ignore snapping or widths for reasons that don't make sense
(for instance: the green bar in MI's test script showed *above* the blue one in non-green resolutions in 2.1.17)
2017-04-12 15:34:13 -07:00
Monster Iestyn
81c3d6820e
Merge branch 'commandline_skinselect' into 'next'
...
Command-line skin selecting fix
Fixed http://mb.srb2.org/showthread.php?t=42312 .
Also, fixed being able to change your skin colour during credits/cutscenes in singleplayer.
See merge request !158
2017-04-04 16:49:55 -04:00
Alam Ed Arias
4fa188cf01
build: fix 64-bit builds
2017-04-01 17:22:24 -04:00
Monster Iestyn
bf29b5c6d1
Print warning message in console if line->next is NULL
2017-04-01 20:16:48 +01:00
Alam Ed Arias
8f25dc62cc
Merge branch 'master' into next
2017-03-30 08:11:26 -04:00
Alam Ed Arias
4c992845e7
Merge branch 'next' into allowteamchange-fix
2017-03-29 17:03:03 -04:00
Alam Ed Arias
70677817bb
Merge branch 'next' into admin-ban-fix
2017-03-29 17:01:47 -04:00
Alam Ed Arias
114d295f89
Merge branch 'next' into addfile-directories-fix
2017-03-29 17:00:42 -04:00
Alam Ed Arias
0ffc0f1974
Merge branch 'next' into falling-rocks-fix
2017-03-29 16:59:30 -04:00
Alam Ed Arias
74db3b51ac
Merge branch 'next' into commandline_skinselect
2017-03-29 16:58:19 -04:00
Monster Iestyn
48777e60ed
check i not add, silly
2017-03-29 21:27:44 +01:00
Alam Ed Arias
8f4f8c6e77
Merge branch 'master' into next
2017-03-24 00:14:14 -04:00
Alam Ed Arias
59d91e0793
build: r_bsp.c:213:23: warning: inlining failed in call to 'R_DoorClosed': call is unlikely and code size would grow [-Winline]
2017-03-23 23:13:31 -04:00
Alam Arias
7d25ab361a
Merge branch 'next' into allowteamchange-fix
2017-03-12 21:50:31 -04:00
Alam Ed Arias
cb98c2d972
Merge branch 'master' into next
2017-03-12 21:34:19 -04:00
Alam Ed Arias
4e8972cd24
build: no warning or error about logical-ip or tautological-compare
2017-03-12 21:16:37 -04:00
Alam Ed Arias
9cac1e9e62
build: fixup WFALGS/WFLAGS mistake
2017-03-12 21:09:06 -04:00
Alam Ed Arias
81fe46213d
build: do not overwrite the -Wno-error switchs
2017-03-12 20:51:45 -04:00
Alam Ed Arias
42ecca817d
build: disable tautological-compare and logical-op
2017-03-12 20:43:35 -04:00
Alam Ed Arias
b01d5da60f
build: fixup GCC54 endif
2017-03-12 20:23:30 -04:00
Alam Ed Arias
e0b2a4a779
build: add suport for GCC 6.3
2017-03-12 17:45:18 -04:00
Alam Ed Arias
2823c7bffb
build: fixup warnings from GCC 6.2.1
2017-03-12 17:23:56 -04:00
Monster Iestyn
0f014fe20a
Merge branch 'master' into next
2017-03-04 17:16:33 +00:00
Monster Iestyn
b0f4bbb44b
Played TD's Stormy Streets enough to know precipitation sprites didn't get an overflow test of their own
...
(various large invisible blocks used in the level cause rain to make splashes high above the main level, high enough to make ghostly rain splash sprite artifacts appear sometimes in nearby areas)
2017-03-02 19:37:21 +00:00
Monster Iestyn
c43b41815f
Make "Enter Game" option use the big blue window notice if you cannot switch teams, instead of falling back on changeteam's own console notice
2017-03-02 14:28:52 +00:00
Monster Iestyn
b837d5b23d
Fix teamchange/teamchange2 to block changing FROM spectator rather than changing TO spectator
...
This way they're consistent with Got_Teamchange, which is the cause of the "illegal team change" desyncs
2017-03-02 14:25:46 +00:00
Monster Iestyn
6efb15c6e8
Fix Ban_Add usage for NONET
2017-02-20 21:36:05 +00:00
