toasterbabe
5b595c0ecc
Fixed titlemap wipe lasting too long/happening twice over
2017-03-28 17:54:54 +01:00
toasterbabe
ded781ddfa
miru asked me for help and im a smelly toast
...
* Fix Crashes With Respect To Switching Between The Normal Title And Her Magic One
* Clean Up A Bit Of Code
2017-03-28 00:13:20 +01:00
yellowtd
f076ff2ca7
Titlemap - Maincfg variables, unplayability crash fixes
2017-03-27 16:45:41 -04:00
yellowtd
e87bb36c03
begin titlemap
...
idk my bff jill
2017-03-21 01:58:01 -04:00
yellowtd
30c5fd9cc3
Fix g_setdisplayer compile warning
2017-03-18 19:12:16 -04:00
yellowtd
cfaf49ab86
Version number change
2017-03-18 19:01:08 -04:00
yellowtd
01a2f9e1f0
p_mobj.c postimg compile error fix
2017-03-16 02:18:20 -04:00
yellowtd
6fbdcb76b4
misc indentation fixups
2017-03-16 02:08:26 -04:00
yellowtd
e4cb8e7597
viewroll code indentation fixup
2017-03-16 02:00:25 -04:00
yellowtd
932e0b2c88
viewrollangle: fill the empty hom with black by default
...
fills this mess with a blank color by default
2017-03-16 01:57:38 -04:00
yellowtd
58d02e6f2b
Fix Viewrollangle in water
...
viewrollangle never worked in water, it does now
2017-03-16 01:51:43 -04:00
yellowtd
29161ec1f9
Replace default windows icon
2017-03-16 01:15:19 -04:00
yellowtd
6c6499caa0
Viewrollangle indentation fixup
2017-03-16 00:11:30 -04:00
yellowtd
f1108b438b
levelwipe p_setup code downscale
2017-03-15 03:37:41 -04:00
yellowtd
14e695537a
code downscale
2017-03-15 03:37:21 -04:00
yellowtd
2247de431c
fug
2017-03-15 03:37:12 -04:00
yellowtd
191bd8ec41
indentation sucks and so do datatypes
2017-03-15 03:37:00 -04:00
yellowtd
55b31841d5
Add: bootmap
...
Added bootmap into MAINCFG as an optional map booter (without -warp)
2017-02-03 21:50:59 -05:00
yellowtd
7af7b7f494
Merge remote-tracking branch 'refs/remotes/STJr/master' into plus_v2.1.17_main
...
# Fixed Conflicts:
# src/r_things.c
2017-01-16 22:09:33 -05: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
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 6476cf3cd20186b90b1d
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
