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
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
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
c0fb3fce73
Merge branch 'master' into next
2017-01-14 19:23:31 +00: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
Monster Iestyn
be21588761
Merge branch 'master' into next
2017-01-03 16:06:50 +00:00
Monster Iestyn
0e6e52eabe
Start mobjnums at 1 instead of 0, so that the first found mobj can be relinked as a target etc to other mobjs properly
...
This fixes Brak's electric barrier disappearing for joiners to ERZC. There seems to be some issues with the lava falls there too I've found, but the electric barrier actually stays around now at least
2017-01-01 17:03:13 +00:00
Louis-Antoine
d4f153d3ca
Random changes in the netcode lol
2016-12-31 19:26:33 +01:00
toasterbabe
31d569a15b
No more changing skins when you're in singleplayer and manage to enter a hole in the gamestate defenses!
2016-10-29 18:12:41 +01:00
ZTsukei
d631d0ef04
S_PLAY states, HUD stuff
2016-08-14 23:51:25 -04:00
ZTsukei
4112d44529
Some Color code, Kart powers
2016-08-11 21:42:16 -04:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Alam Ed Arias
35b254feaa
D_MD5PasswordPass, fixup
2016-05-28 19:51:10 -04:00
Alam Ed Arias
3aea4a7601
replace strcpy with memmove in D_MD5PasswordPass()
2016-05-28 19:48:52 -04:00
Alam Ed Arias
d9aa430817
use memmove in D_MD5PasswordPass() and drop noreturn
2016-05-28 19:42:38 -04:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Inuyasha
bd935a6a5c
that should be skin2, not skin
2016-05-04 05:45:18 -07:00
Inuyasha
652ddfef9a
invalid skins when starting a local game no longer break
...
see https://mb.srb2.org/showthread.php?t=41370
2016-05-04 03:23:29 -07:00
Monster Iestyn
8fd8f2c316
Disable "splats" command unless WALLSPLATS is enabled
...
apparently it was never used for what exists of floor splats' code, huh
2016-04-29 18:01:05 +01:00
Inuyasha
ac03ce39c8
*_Random is now *_RandomByte.
...
P_RandomChance is now a macro for something that should happen a
certain percentage of time.
P_SignedRandom was moved to a macro. Nobody cared.
# Conflicts:
# src/p_inter.c
2016-03-29 16:27:55 -07:00
ZTsukei
88bbe008ae
Menu toggles pt2. Missed a spot.
2016-02-27 11:15:50 -05:00
ZTsukei
fbdb98c8b1
Menu toggles. Doesn't work yet.
2016-02-27 11:11:14 -05:00
ZTsukei
ba18d968e5
Added vars to d_clisrv, renamed autoexec.cfg, added menu variables to d_netcmd.h, added powers to dehacked.c for LUA, and made sure things can actually compile correctly as-is (squished two errors).
2016-02-21 12:40:01 -05:00
Inuyasha
8fc484cea9
Just a few more changes to TUNES, nothing special
...
(cherry picked from commit 63a9c66317c263124567234897ed6240b5e34f9e)
2016-02-09 02:48:35 -08:00
Inuyasha
04d112276e
Fixed some oddities with TUNES.
...
(cherry picked from commit a4d05350f711db76676e9b48c36d88bd7dbec274)
2016-02-09 02:48:35 -08:00
Inuyasha
8c17dac589
The concept of "music slots" doesn't exist anymore.
...
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
(cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457)
# Conflicts:
# src/p_user.c
2016-02-09 02:48:33 -08:00
Inuyasha
06dea3ab78
Branch and revision information in builds
...
Also makes comptime.bat work with git if able.
Development builds will now show the branch and the SHA1 hash of the revision. Also been tested to work with subversion, where it displays "Subversion r####". You know, just in case.
2016-01-14 07:46:27 -08:00
MonsterIestyn
9b0e09877e
gametype command now prints gametype NAMES instead of numbers. Even prints "Single player" when appropriate!
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8997 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 20:42:12 -05:00
Alam Ed Arias
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
7cb77075d1
SRB2 2.1.11 release
2014-08-26 23:56:30 -04:00
Alam Ed Arias
d6c29e19ab
SRB2 2.1.10 release
2014-08-05 19:59:40 -04:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
Alam Ed Arias
02a3b0776c
SRB2 2.1.7 release
2014-04-14 01:14:58 -04:00
Alam Ed Arias
32de698f5e
SRB2 2.1.6 release
2014-03-24 22:17:59 -04:00
Alam Ed Arias
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
Alam Ed Arias
ed72bd8fa1
SRB2 2.1.4 release
2014-03-21 19:21:06 +00:00
Alam Ed Arias
2fed5d1270
SRB2 2.1.3 release
2014-03-18 13:56:54 -04:00
Alam Ed Arias
a03da73115
SRB2 2.1.2 release
2014-03-17 08:13:16 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00