Steel Titanium
29e80c5300
Don't increment totalplaytime if a demo is playing.
2018-05-08 18:16:01 -04:00
Monster Iestyn
8e5ac64d7c
Merge branch 'dedicated-nosoundinit' into 'master'
...
Don't init the sound system on dedicated servers
See merge request STJr/SRB2!225
2018-04-21 17:40:45 -04:00
Monster Iestyn
452aef4981
Merge branch 'connect-empty-address-fix' into 'master'
...
Fixed "invalid pointer" error when passing "" to Command_connect().
See merge request STJr/SRB2!234
2018-04-21 17:32:50 -04:00
Monster Iestyn
83a84d5a81
Merge branch 'connect-server-fix' into 'master'
...
Removed contradictory `-connect` check
See merge request STJr/SRB2!236
2018-04-21 16:25:28 -04:00
Monster Iestyn
eb0f9681d7
Merge branch 'findfile-rewrite' into 'master'
...
Rewrite of d_netfil.c's findfile
See merge request STJr/SRB2!240
2018-04-21 16:22:21 -04:00
Monster Iestyn
48a85512a0
Merge branch 'dedicated-debug-hotfix' into 'master'
...
Dedicated debug hotfix
See merge request STJr/SRB2!239
2018-04-21 16:13:38 -04:00
Monster Iestyn
6c7acdbd9e
Merge branch 'movie-spec-stage-fade-fix' into 'master'
...
Movie mode: special stage intro fade recording fix
See merge request STJr/SRB2!229
2018-04-21 16:12:46 -04:00
Monster Iestyn
9cdf87404e
Rewrote findfile to store whether any of the three paths searched had a bad MD5 rather than just simply being not there.
...
This means that, if the three paths are not the same, you should be able to tell if at least one of them has a file that just had a bad MD5. Most relevant for Linux peeps I expect.
Note: Untested as of writing
2018-04-15 22:00:31 +01:00
Monster Iestyn
3fb12cf337
Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode
2018-04-15 19:59:57 +01:00
TehRealSalt
36b52e1c67
Merge remote-tracking branch 'refs/remotes/srb2public/next'
...
# Conflicts:
# src/f_finale.c
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/m_misc.c
2018-04-07 18:43:59 -04:00
Steel Titanium
d446f3420e
Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit
2018-04-03 16:16:20 -04:00
Steel Titanium
759ea8cb42
Indentation fixup
2018-04-03 16:11:07 -04:00
Alam Ed Arias
cf6a30a8ef
Merge branch 'master' into next
2018-04-03 15:48:06 -04:00
toaster
7848e9f42b
Merge branch 'openglquickfixes' into 'master'
...
Opengl Quick Fixes
See merge request STJr/SRB2!237
2018-04-03 15:34:24 -04:00
TehRealSalt
eaaf708381
This little thing slipped by the merge
2018-04-02 06:43:03 -04:00
TehRealSalt
428a134cda
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
2018-04-02 06:39:26 -04:00
TehRealSalt
f1258ea88c
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 16:18:28 -04:00
TehRealSalt
15f0e16344
Race lap linedef executor
...
Set up similar to NiGHTS Mare linedef executors. Give a sector the "Race
Lap" sector type, tag it, then set the frontside x-offset on the trigger
line to the lap it should activate on minus 1. There are a few flags you
can check on the trigger line to modify its behavior.
- Normally the executor will only trigger if its exactly on the lap
specified. Check Not Climbable to make it execute on laps equal to or
greater than, or check Block Enemies to make it execute on laps equal to
or less than.
- By default, the executor will check current lap with the person in
last's lap. Check E4 to instead find the current lap from the player who
triggered it. This flag is better for triggering events ahead of the
players, while the default effect is better for triggering events behind
the players.
2018-03-31 14:48:49 -04:00
TehRealSalt
f9db3620f4
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-31 00:44:47 -04:00
TehRealSalt
00e913bbcc
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/k_kart.c
# src/k_kart.h
# src/lua_baselib.c
# src/p_inter.c
# src/p_spec.c
2018-03-31 00:44:03 -04:00
TehRealSalt
c051dd4832
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 00:33:20 -04:00
TehRealSalt
ae8da8491f
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 00:27:35 -04:00
TehRealSalt
0f6c79d983
I'm a huge idiot
2018-03-31 00:12:26 -04:00
TehRealSalt
8f69d14716
reset randmapbuffer in G_DeferedInitNew
2018-03-31 00:11:03 -04:00
Sryder
6f2de824fb
Uncomment HWR_CorrectSWTricks but set gr_correcttricks to be off by default
...
I wasn't aware of the cvar, this should do for now since I don't believe any maps use these software tricks, probably an old leftover from DOOM.
2018-03-30 23:12:44 +01:00
TehRealSalt
1c0e9eb12c
I just realized that SRB2's credits are listed in alphabetical order of last name
...
(I had to research the Polish alphabet to figure out where Fooruman's
name should've been, hah)
2018-03-30 14:14:08 -04:00
Sryder
0aaae501d3
Warnings must die
2018-03-30 18:53:23 +01:00
TehRealSalt
88b278e7bb
oop
2018-03-30 13:33:01 -04:00
Sryder
f3aa02e26d
Start with lightnum on sector lightlevel
2018-03-30 18:13:52 +01:00
Sryder
66f220d6ad
Merge branch 'master' into openglquickfixes
2018-03-30 18:09:41 +01:00
TehRealSalt
fe645f8a53
Actually, I messed this up
2018-03-30 12:17:48 -04:00
TehRealSalt
7516a1dc0c
Doing one more step to totally ensure that matchesplayed is unlocking stuff
2018-03-30 12:16:15 -04:00
TehRealSalt
a10a068f15
zzzzz
2018-03-30 00:53:32 -04:00
TehRealSalt
e974b6e4b7
MK rules for Battle scoring
...
and quick fix for karma items
2018-03-30 00:53:25 -04:00
TehRealSalt
3d8441fe54
Unsuck start boosts
2018-03-29 21:43:02 -04:00
Sryder
65c893da86
static tempsec for R_FakeFlat
...
I don't fully understand this, but it's what software does and it fixes the issue of the lighting in DSZ3. Also don't need the extra call to R_Prep3DFloors.
2018-03-29 23:28:54 +01:00
TehRealSalt
e86aa94f74
Zigs & better scroll
2018-03-29 18:11:06 -04:00
TehRealSalt
2cc2b68e38
Oh boy another real name
2018-03-29 14:48:45 -04:00
TehRealSalt
0fe06a0089
Add the accent
2018-03-29 13:35:40 -04:00
TehRealSalt
6fa54576f6
Real naaaames
2018-03-29 12:57:41 -04:00
TehRealSalt
e9c2b09c24
Forgot to remove some debug stuff
2018-03-29 12:01:04 -04:00
TehRealSalt
cde733f850
Finished checklist
2018-03-29 11:43:56 -04:00
TehRealSalt
713fba7111
More full names, and more names
2018-03-29 01:34:31 -04:00
TehRealSalt
d4fba3be49
:(
2018-03-29 01:14:47 -04:00
TehRealSalt
84a5fac5e9
Start of a better unlockable checklist
...
Still WIP, doesn't display properly
2018-03-29 01:14:29 -04:00
TehRealSalt
9fccf62124
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-28 23:28:10 -04:00
TehRealSalt
9aa19e3c39
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-28 23:09:48 -04:00
TehRealSalt
f2bc7d16c9
Allow skipping (for real this time)
2018-03-28 22:12:45 -04:00
TehRealSalt
d07419b6ac
Allow skipping
2018-03-28 21:52:35 -04:00
TehRealSalt
ad42a9f63c
Some more credit adjustments
2018-03-28 20:32:53 -04:00
