ZTsukei
87d09228fa
Roulette timer stops manually again - as more players join the game, the player in first will have to wait longer to stop the roulette manually. Players further back will also wait slightly longer, while the person in last will always only take 1 second to stop the roulette.
...
Fixed drifting so it stops when you're too slow.
2017-02-27 23:54:02 -05:00
ZTsukei
f1f78a2349
Reverting friction, but left a note for iceman's magic number.
...
Intermission timer is back down to 20 seconds unless something breaks with auto-transmissions again.
Also I remembered to enable Magnets this time. Super low odds on it though.
2017-02-27 18:16:53 -05:00
ZTsukei
5d0b9ef551
Friction updated. Added KARTSTUFF to lua. Added ->kartstuff to network syncing stuff (surprised it even worked before now???), also maybe items correctly reset at the end of level now.
2017-02-27 17:55:26 -05:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
ZTsukei
98137822b8
Fake Items working - Still a weird bug where the item won't throw if you're turning.
2017-02-26 10:19:33 -05:00
ZTsukei
e7280fc53a
Some drift adjustments
2017-02-24 20:01:06 -05:00
ZTsukei
d9944e9c41
Steering fixes, drifting changed, weight has effect now
2017-02-23 20:37:16 -05:00
ZTsukei
66a206cc55
Driftboosting now increases player accleration
...
Consolidated the turning and drifting values to k_kart functions for easier editing
Removed 200cc. 50/100/150ccs are a weird amalgamation of the prior values.
2017-02-21 23:42:21 -05:00
ZTsukei
226e7ead59
DevEXE version 1.1.00: Added some MD5 checks, increased md2 triagle limit, temporarily disabled magnet
2017-02-20 20:08:24 -05:00
ZTsukei
28544af035
Star works, configured to work in multiplayer with just speed items for now... Will return to look for color stuff later.
2017-02-19 19:42:10 -05:00
ZTsukei
493436dc1a
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 15:54:23 -05:00
ZTsukei
7b7a6e5458
Added fancypants mega shroom, fixed drift boosting
2017-02-19 12:19:02 -05:00
ZTsukei
d83cbe0b72
BooTake working now, maybe BooSteal does too ¯\_(ツ)_/¯
2017-02-18 16:46:08 -05:00
ZTsukei
3fecdd7658
Item boxes no longer solid
2017-02-18 15:51:35 -05:00
ZTsukei
0a782bf79e
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 13:39:50 -05:00
ZTsukei
559607dfe2
version num 1.0.04; Removed unneeded files from the md5 check
2017-02-17 19:39:10 -05:00
Sryder
35b789d330
Fix random duplicate code from merge in hw_main.c and r_segs.c
...
Whitespace cleanup
2017-02-18 00:25:16 +00:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Sryder
2d6c7959ed
Merge branch 'SRB2_release_2.1.15' into zarrotsu_vanillamerge
...
# Conflicts:
# .gitignore
# libs/zlib/projects/visualc10/zlib.vcxproj
# src/Makefile
# src/am_map.c
# src/d_main.c
# src/dehacked.c
# src/doomdef.h
# src/g_game.c
# src/hardware/hw_main.c
# src/hardware/hw_md2.c
# src/info.c
# src/p_inter.c
# src/p_map.c
# src/p_mobj.c
# src/p_spec.c
# src/p_user.c
# src/r_bsp.c
# src/r_plane.c
# src/r_segs.c
# src/r_things.c
# src/s_sound.c
# src/s_sound.h
# src/sdl/Srb2SDL-vc10.vcxproj
# src/win32/Srb2win-vc10.vcxproj
# src/win32/Srb2win.ico
# src/y_inter.c
2017-02-17 20:03:10 +00:00
ZTsukei
5cc8445812
Finished the item roulette numbers, thank god.
2017-02-17 10:26:41 -05:00
ZTsukei
370f290a08
Fixed position code, added some item numbers
2017-02-16 21:33:15 -05:00
ZTsukei
b0b51f9a61
Some position code
2017-02-12 23:25:06 -05:00
ZTsukei
fadcd17022
Some accelcode changes to let CC's work.
2017-02-09 23:57:36 -05:00
ZTsukei
580f909c6c
Added Accelcode, start boosting, reverted drifting, etc.
2017-02-07 17:19:58 -05: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
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
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