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
