Commit Graph

1840 Commits

Author SHA1 Message Date
Monster Iestyn e20461aa54 Merge branch 'crushfix' into 'next'
A spike bug no more

Jumping at spikes on FOFs in reverse gravity - most notably in ERZ3 - no longer teleports you downwards into the death pit beneath it.

See merge request !157
2017-01-16 16:30:50 -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
Alam Ed Arias c024d313ee Revert "Merge branch 'appveyor' into 'master'"
This reverts commit 6476cf3cd2, reversing
changes made to 0186b90b1d.
2017-01-15 19:47:59 -05:00
Inuyasha 6476cf3cd2 Merge branch 'appveyor' into 'master'
Appveyor: compile with Mingw32 GCC 4.9.3

Let use an old GCC to compile SRB2

See merge request !112
2017-01-15 19:41:26 -05:00
Inuyasha 2903c07a32 Merge branch 'last-few-changes-for-2.1.17' into 'next'
Last few changes for 2.1.17

what it says on the tin

* Updated version number
* Added LJSonic to credits (and changed how I look in the credits to be less stupid)
* fixed resynching players seeing the host turn into a spectator for no reason

See merge request !155
2017-01-15 19:36:48 -05: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
MonsterIestyn 0186b90b1d Merge pull request #158 from LJSonik/netcode-shit
Netcode shit
2017-01-14 18:41:25 +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
MonsterIestyn 6ad64347f3 Merge pull request #156 from frozenLake/patch-1
Added transmaps to non modifying lump list.
2017-01-12 01:14:43 +00: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
frozenLake e3b94c04fd Added transmaps to non modifying lump list. 2017-01-08 18:13:46 -06:00
Alam Ed Arias 55925cabe8 win32: fixup printf warnings 2017-01-08 14:06:30 -05:00
Alam Ed Arias fca88d2e98 Mingw: disable GetText support 2017-01-08 13:54:52 -05:00
Monster Iestyn 87dc33a78d Merge branch 'master' into next 2017-01-08 15:59:34 +00:00
Inuyasha cdc9bf3a60 Merge branch 'cb_update' into 'master'
Update Code::Block project

See merge request !145
2017-01-08 10:32:22 -05:00
Monster Iestyn 22020dda03 Merge branch 'savegame-hotfixes' into 'next'
Savegame hotfixes

Yes, this another netgame related fix! Named this "savegame hotfixes" rather than "ERCZ hotfix" or the like in advance of the fact we probably need a general branch for other $$$.sav fixes?

Anyway, fixes included in by this branch:
* ERCZ's lava falls now act as expected rather than being stuck in place for the map's duration, fixing all other known desynchronisation issues known in the map for the time being (yay)
* Changing sector tags in a map no longer causes joiners to netgames to have their SRB2 application stop responding etc
* Player names should no longer turn red in the console in gametypes outside of CTF/Team Match if a resynch occurs (not $$$.sav related, but it's related to netplay so I lumped it in anyway)

See merge request !150
2017-01-07 18:32:07 -05:00
Monster Iestyn c93101aa74 Merge branch 'eggshield-laser-fix' into 'next'
Eggshield laser fix

Fix for http://mb.srb2.org/showthread.php?t=42250

See merge request !152
2017-01-07 14:33:27 -05:00
Monster Iestyn ad30c41179 Fix egg guard shields being endlessly killed by lasers. Simply make sure they have health first before killing them! 2017-01-07 18:02:55 +00:00
Monster Iestyn 45fdfd9f37 Merge branch 'eggscalibur_fixes' into 'next'
One Eggscalibur fix

Use mobj->watertop instead of mobj->spawnpoint->z. CEZ3 is far from fixed in multiplayer, but this is still one less thing to worry about.

See merge request !148
2017-01-07 10:47:02 -05:00
Monster Iestyn cd0ec0881d Merge branch 'plane-fixes' into 'next'
Software plane rendering fixes/cleanup

This is mostly cleanup, with the exception that polyobject planes should now behave somewhat better than they do in 2.1 currently (translucent polyobj planes should now always be actually translucent regardless of where you view them from, for instance). I can't claim I've fixed their rendering once and for all though, there may still be bugs for all I know...

See merge request !136
2017-01-06 21:19:09 -05:00
Monster Iestyn c601a409e1 Merge branch 'texture-fixes' into 'next'
Some texture-related fixes

Bugs fixed in this branch:
* upper/lower/middle textures with non-existent texture ids being capable of crashing the game. For instance, RVZ1 has colormap codes on non-colormap linedefs, which causes them to wind up with invalid texture ids because of how the game tries to interpret lower/upper textures with "#" followed by characters on normal linedefs. Fortunately these "textures" are normally not visible anyway (since they're all in control sectors) unless they are swapped with in-level textures by some crazy Lua script of some sort...
* animated single-patch textures with holes displaying garbage on first viewing (see this thread: https://mb.srb2.org/showthread.php?t=42195)
* the heights of the lighting (shadows or colormapping) from water/translucent/shadowcasting/etc FOFs become messed up when displayed on repeated midtextures.

See merge request !144
2017-01-06 21:15:22 -05:00
Alam Ed Arias 5a55c4ea8f appveyor: RDP debug is broken 2017-01-06 21:10:10 -05:00
Alam Ed Arias 7213599744 appveyor: MINGW_BIN, not MINGW_EXE 2017-01-06 21:09:20 -05:00
Alam Ed Arias 4fe217f1a6 appveyor: download GCC DLLs and debug issue 2017-01-06 21:07:02 -05:00
Alam Ed Arias fd29d77f1e appveyor: copy files to C:\Mingw 2017-01-06 20:59:54 -05:00
Alam Ed Arias 2ac5fef402 appveyor: fixup 2nd extract and cache lzma 2017-01-06 20:51:04 -05:00
Alam Ed Arias b1c323d87f appveyor: decompress twice 2017-01-06 20:49:31 -05:00
Alam Ed Arias 8d1a2e3453 appveyor:fixup download of mingw gcc lzma 2017-01-06 20:44:28 -05:00
Alam Ed Arias c2ddbed90b appveyor: download GCC 4.8.1-4 and try to abuse it 2017-01-06 20:42:16 -05:00
Alam Ed Arias 5514cca497 Merge branch 'master' into appveyor 2017-01-06 20:27:11 -05:00
Alam Ed Arias 0b572b6eee CMake: split inline AMS code from vid_copy.s code 2017-01-06 15:48:19 -05:00