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
cf6a30a8ef
Merge branch 'master' into next
2018-04-03 15:48:06 -04:00
7848e9f42b
Merge branch 'openglquickfixes' into 'master'
...
Opengl Quick Fixes
See merge request STJr/SRB2!237
2018-04-03 15:34:24 -04:00
f1258ea88c
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 16:18:28 -04:00
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
f9db3620f4
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-31 00:44:47 -04:00
c051dd4832
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 00:33:20 -04:00
ae8da8491f
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-31 00:27:35 -04:00
0f6c79d983
I'm a huge idiot
2018-03-31 00:12:26 -04:00
8f69d14716
reset randmapbuffer in G_DeferedInitNew
2018-03-31 00:11:03 -04:00
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
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
0aaae501d3
Warnings must die
2018-03-30 18:53:23 +01:00
88b278e7bb
oop
2018-03-30 13:33:01 -04:00
f3aa02e26d
Start with lightnum on sector lightlevel
2018-03-30 18:13:52 +01:00
66f220d6ad
Merge branch 'master' into openglquickfixes
2018-03-30 18:09:41 +01:00
fe645f8a53
Actually, I messed this up
2018-03-30 12:17:48 -04:00
7516a1dc0c
Doing one more step to totally ensure that matchesplayed is unlocking stuff
2018-03-30 12:16:15 -04:00
a10a068f15
zzzzz
2018-03-30 00:53:32 -04:00
e974b6e4b7
MK rules for Battle scoring
...
and quick fix for karma items
2018-03-30 00:53:25 -04:00
3d8441fe54
Unsuck start boosts
2018-03-29 21:43:02 -04:00
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
e86aa94f74
Zigs & better scroll
2018-03-29 18:11:06 -04:00
2cc2b68e38
Oh boy another real name
2018-03-29 14:48:45 -04:00
0fe06a0089
Add the accent
2018-03-29 13:35:40 -04:00
6fa54576f6
Real naaaames
2018-03-29 12:57:41 -04:00
e9c2b09c24
Forgot to remove some debug stuff
2018-03-29 12:01:04 -04:00
cde733f850
Finished checklist
2018-03-29 11:43:56 -04:00
713fba7111
More full names, and more names
2018-03-29 01:34:31 -04:00
d4fba3be49
:(
2018-03-29 01:14:47 -04:00
84a5fac5e9
Start of a better unlockable checklist
...
Still WIP, doesn't display properly
2018-03-29 01:14:29 -04:00
9fccf62124
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-28 23:28:10 -04:00
9aa19e3c39
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-28 23:09:48 -04:00
f2bc7d16c9
Allow skipping (for real this time)
2018-03-28 22:12:45 -04:00
d07419b6ac
Allow skipping
2018-03-28 21:52:35 -04:00
ad42a9f63c
Some more credit adjustments
2018-03-28 20:32:53 -04:00
9dd14531ee
More credit stuff
2018-03-28 19:27:26 -04:00
38b59aaaf1
Actually, ehhh, let's remove full names for everyone who hasn't went "yes, I want my full name on Kart's credits
2018-03-28 16:25:43 -04:00
caa000d5d6
A quick credits draft
...
Please give me corrections and people to add. I've not been here as long
as some people, so there is 100% probably people I missed
2018-03-28 16:17:04 -04:00
8e9d09121e
Actually, this makes more sense :U
2018-03-28 15:28:50 -04:00
d7bb7734d3
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-28 15:25:12 -04:00
84944f1a52
Idea: Make Boo make you invisible instead of flash in splitscreen
...
There's no way atm to make you flash on your screen but not on everyone else's, so I think just making you invisible on all of them keeps the original SMK intent of "you have to pay extra close attention to their screen to know where they are at all" better
2018-03-27 18:30:02 -04:00
ac6a996c0d
HUD improvements
...
Most notably, Karma & Boo no longer appear on the minimap
2018-03-27 18:22:33 -04:00
acc9abca55
Items respawn in Battle properly again
...
and in a slightly less wasteful way.
2018-03-27 17:53:47 -04:00
e16bf1cf75
WIP karma item stuff
2018-03-26 20:36:16 -04:00
8bc2fa7b6c
Fix errors
2018-03-24 08:13:33 -04:00
a980e8b0d9
Merge remote-tracking branch 'refs/remotes/origin/sal-misc'
2018-03-24 08:03:55 -04:00
61f929168e
Splitscreen sound improvements
...
- Fixed a simple oversight that prevented P3 and P4's sounds from ever
playing
- Changed how sound priority works, now compares distances between
(Untested as of commit since my computer wants a quick restart before it
compiles :V)
2018-03-23 22:50:42 -04:00
c1a32c609f
Merge remote-tracking branch 'refs/remotes/origin/master' into sal-misc
2018-03-23 22:24:01 -04:00
f62cb3a30a
I've commented out the call to HWR_CorrectSWTricks.
...
I don't think it does anything for us anymore, and might even break things with slopes.
Someone let me know if I'm wrong and am breaking things horribly here.
2018-03-23 22:27:29 +00:00
TehRealSalt