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
c92aaa74a4
I think PT_CLIENT2MIS was meant to do this too, probably
2017-05-23 18:46:34 +01:00
Monster Iestyn
7147e0fcaf
Improve previous PT_TEXTCMD/PT_TEXTCMD2 check, add another one to ignore zero size textcmds!
2017-05-23 17:35:32 +01:00
Monster Iestyn
0b0b738a6f
Don't allow non-servers to receive PT_RESYNCHGET
2017-05-23 16:34:56 +01:00
Monster Iestyn
ff1cc07a1d
Implemented toaster's suggestion to make a macro here
2017-05-23 16:29:09 +01:00
Monster Iestyn
9e3bdc5ee2
Prevent bad PT_TEXTCMD/PT_TEXTCMD2 textcmd[0] sizes?
2017-05-23 16:13:42 +01:00
Monster Iestyn
fdfd6e1c0b
Whoops don't do that for PT_REQUESTFILE
2017-05-22 22:20:08 +01:00
Monster Iestyn
c70839334e
Added a bunch of missing checks to prevent non-server players from sending other non-server players stuff
2017-05-22 22:17:51 +01:00
Monster Iestyn
3784d765e4
Remove extra whitespace I added
2017-05-22 20:47:38 +01:00
Monster Iestyn
28444c12dd
Some more things I overlooked in this fix
2017-05-22 16:54:39 +01:00
Monster Iestyn
247ed56e17
Don't allow nonsense PT_ASKINFOVIAMS packets, nor any at all if offline
2017-05-22 16:44:50 +01:00
Monster Iestyn
6062223eb5
Merge branch 'master' into next
2017-05-22 13:23:46 +01:00
Monster Iestyn
5aeb4b5919
Revert "Loop through rebound packets until you found a good one or ran out of them"
...
On second thought, this was probably unnecessary anyway.
This reverts commit 1078a642df
2017-05-20 21:29:05 +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
1078a642df
Loop through rebound packets until you found a good one or ran out of them
2017-05-19 11:52:50 +01:00
Monster Iestyn
5a1fc6098e
Attempts to prevent stupid stuff from happening
2017-05-19 11:25:28 +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
toasterbabe
bdcd9125d2
Fixed that thing where missiles like sliding up slopes for some reason.
...
This isn't a 1:1 fix for non-slopes - they still like stepping up over the borders of sloped sectors - but this fixes the most egregrious issue.
2017-05-14 14:47:09 +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
Alam Ed Arias
108b0c2732
Merge branch 'master' into disable_gettext
2017-03-29 16:56:44 -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
Monster Iestyn
7424df8180
Make sure I_Ban and Ban_Add are only used by the server
...
Also make sure the server actually uses Ban_Add if an admin banned someone
2017-02-20 19:58:29 +00:00
Monster Iestyn
84727f4205
Created W_OpenWadFile for opening WAD files with the path correction code.
...
This is used by Command_Addfile in the MD5 calculation code, so that it can search subfolders properly and allow addfile in netgames to treat them the same way as in SP
2017-02-16 21:55:17 +00:00
Monster Iestyn
8a421a05d9
admin bans with custom ban messages should now be recognised by the server properly
2017-02-10 20:31:58 +00:00
Monster Iestyn
f9b41898a9
Don't allow skipping stats in record attack/nights attack
2017-02-05 22:04:29 +00:00
Monster Iestyn
dc249c6cd5
D_ModifierKeyResponder now checks for ev_console as a "key down" event
...
console window uses ev_keyup too so don't worry about turning off
2017-02-04 23:26:37 +00:00
Monster Iestyn
9a2b7b2091
Better plan, use ?: for deciding between floorz/ceiling checks based on gravity
2017-02-03 20:13:16 +00:00
Monster Iestyn
659a62db88
Make sure rocks spawned by the rock spawners despawn when they're on the floor and not moving
2017-02-03 18:47:20 +00:00
Monster Iestyn
72bd3e28ed
Fix sprtopscreen from getting integer overflows once and for all in R_DrawRepeatMaskedColumn
...
Fixes TD's terminal from freezing the game this time, oh boy
2017-01-31 22:10:31 +00:00
Monster Iestyn
3212ee0b0f
Fix endless loop of R_DrawRepeatMaskedColumn if both sprtopscreen and sprbotscreen are CLAMPMAX (INT32_MAX)
...
This fixes the grid floors in TD's Lava Mountain freezing the game if they go off the bottom of the screen far enough (they have ACWRFL1A as the wall texture, which is a single patch texture with holes)
2017-01-30 21:08:13 +00:00
toasterbabe
d2d88a919b
* Allowing for changing skins on command line startup again.
...
* Fixing an inconsistency with being able to change skin colours when you shouldn't be able to, much like the previous skin change issue that was fixed.
2017-01-26 12:47:47 +00:00
Alam Ed Arias
a29ced725d
Merge branch 'master' into next
2017-01-16 16:41:38 -05:00
Alam Ed Arias
628d1c4dab
DD: Mingw 3.4.5 build fix
2017-01-16 16:40:16 -05:00
toasterbabe
19cd010091
Fixed a stupid bug involving jumping at spikes on FOFs in reverse gravity caused by my own incompetence/assumptions.
2017-01-16 17:52:06 +00:00
Inuyasha
3169b538be
Hey! If you change this, add 1 to the MODVERSION below!
...
Otherwise we can't force updates!
2017-01-15 16:34:30 -08:00
Monster Iestyn
ba3f001a09
I dun goofed, THIS is why FuriousFox disappears like that
2017-01-15 22:24:38 +00:00
Monster Iestyn
4ac709141a
Added LJSonic to credits, altered how my own name + nick is shown in credits
2017-01-15 19:23:25 +00:00
Monster Iestyn
e59fb38802
Update version number
2017-01-15 18:49:33 +00:00
Monster Iestyn
691d368434
if this is what caused resynching to randomly turn some people spectators then welp
2017-01-15 18:36:38 +00:00
Monster Iestyn
c0fb3fce73
Merge branch 'master' into next
2017-01-14 19:23:31 +00:00
Louis-Antoine
4a4f0ea7ee
Merge branch 'netcode-shit' of https://github.com/LJSonik/SRB2 into netcode-shit
2017-01-14 19:26:31 +01:00
Louis-Antoine
8298ed3559
DEBUGMODE -> _DEBUG =)
2017-01-14 19:24:22 +01:00
Alam Arias
6611b01635
Merge branch 'master' into netcode-shit
2017-01-13 20:48:42 -05:00
Louis-Antoine
b8b720088e
Oh? a cookie on the ground
...
*takes the cookie*
2017-01-13 23:10:00 +01:00
Louis-Antoine
490778cdab
Why does DD exist
2017-01-13 22:34:16 +01:00
Louis-Antoine
da06b9417a
Merge branch 'netcode-shit' of https://github.com/LJSonik/SRB2 into netcode-shit
2017-01-13 22:02:06 +01:00
Louis-Antoine
7cca60a027
Merge branch 'master' into netcode-shit
2017-01-13 21:48:24 +01:00
Louis-Antoine
005485cf9c
Fixed a warning
2017-01-13 21:30:30 +01:00
Louis-Antoine
e9cb6d0331
-Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size
...
-If the server tries to kick a joiner who is downloading the game state, they will get a timeout instead, because a regular kick would only happen once the game state has been downloaded
-Added a timeout for player ticcmd packets, again to prevent freezes to happen in some cases
-File/game state downloading is now faster, the speed is controlled by the "downloadspeed" cvar, in packets per tic
-The reason is now properly shown when the server refuses connection
-Changed the default values of "nettimeout" to 10 seconds (previously 15) and "maxsend" to 4 MB (previously 1)
-Added a "noticedownload" cvar that displays a message in the server console when someone is downloading a file
2017-01-13 20:53:52 +01:00
Alam Ed Arias
e7a1c81355
Merge branch 'cmake_nasm' into 'master'
...
CMake: Fix nasm Linux builds
When compiling under Linux with CMake and nasm/yasm enabled, the operation would fail during linking with undefined symbols related to the tmap files.
This commit adds support for passing flags to the assembler and passes ```-DLINUX``` in order to compile.
After this change, binaries are successfully compiled with either nasm or yasm on Linux systems.
Tested on Ubuntu.
See merge request !153
2017-01-12 17:21:05 -05:00
Alam Arias
456f5cf6e8
Merge branch 'next' into patch-1
2017-01-11 15:50:54 -05:00
Tasos Sahanidis
5216da13f0
Don't check if SRB2_ASM_FLAGS is defined and add docstring for the assembler
2017-01-11 21:52:14 +02:00
Monster Iestyn
e727fea427
Merge branch 'master' into next
2017-01-11 19:40:51 +00:00
Monster Iestyn
b1168b1728
Merge branch 'CMake-inline_ASM' into 'master'
...
CMake: split inline ASM code from vid_copy.s code
See merge request !151
2017-01-11 11:37:21 -05:00
frozenLake
d865877ca2
Merge branch 'next' into patch-1
2017-01-11 10:49:37 -05:00
Tasos Sahanidis
0f52606953
Pass -DLINUX to n/yasm
2017-01-11 03:16:48 +02:00
