Commit graph

4650 commits

Author SHA1 Message Date
Monster Iestyn
a71ca1d259 Merge branch 'fof-slope-skew-backport' into 'master'
FOF wall slope skewing backport

See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
Sal
fcba636616 Merge branch 'deadtweaks' into 'master'
Update HUD anim counters when dead.

Closes #49

See merge request KartKrew/Kart!106
2018-11-26 08:03:17 -05:00
Sal
159d8040b8 Merge branch 'sounddistfix' into 'master'
Sound volume distance indication now scales with mapheader scale.

See merge request KartKrew/Kart!105
2018-11-26 08:02:26 -05:00
TehRealSalt
1c907667fc Slow down animation 2018-11-26 07:43:05 -05:00
TehRealSalt
4ad32b23d9 Find bestrank for 7 sec limit enforcement 2018-11-26 07:18:21 -05:00
mazmazz
9e025cfd33 Debian packaging adjustments 2018-11-26 07:11:10 -05:00
TehRealSalt
5dbd747237 Flush map buffer early, again
Now it's directly in G_AddMapToBuffer
2018-11-26 06:09:26 -05:00
TehRealSalt
4bd6ae3f04 Calculate buffer size manually
(Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 05:09:56 -05:00
TehRealSalt
494fa55390 Accidental removal 2018-11-26 04:42:14 -05:00
TehRealSalt
e59a675eb3 Mistakes 2018-11-26 04:28:39 -05:00
TehRealSalt
478f895ea0 Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 04:27:31 -05:00
TehRealSalt
62b9754407 This sound doesn't exist yet, but I'm defining it anyway 2018-11-26 03:19:31 -05:00
TehRealSalt
2a573c2072 Merge branch 'master' into 102-gameplay 2018-11-26 03:13:17 -05:00
TehRealSalt
ba28f1c65f Add confirmation to reset controls 2018-11-26 03:12:22 -05:00
TehRealSalt
b5bf8e09c3 Karma fireworks
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
2018-11-26 02:17:14 -05:00
Steel Titanium
ba111d42ca Last minute changes. 2018-11-26 00:24:11 -05:00
Steel Titanium
cf01e820c4 Take the command line params into account
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
TehRealSalt
b68a58d5b2 Make sure spbplace is set better during SEEKING 2018-11-25 20:24:47 -05:00
TehRealSalt
e82c7cb230 Make the WAIT phase work better with SPB rush 2018-11-25 20:23:09 -05:00
TehRealSalt
0f1206af6f Shrink no longer causes old-style wipeout, getting squished reduces the timer on it.
Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p
2018-11-25 20:14:01 -05:00
Sryder
683ebec120 Rotate All MD2s to match their standing slopes
Needs to be tested in gravity flip
Also flips the normal on linedef based slopes so that it's facing the correct direction
Also makes it so slopelaunch doesn't always remove the standingslope (going down some slopes would cause it to be constantly unset and reset)
2018-11-26 00:17:34 +00:00
Monster Iestyn
1c5bd554c2 Merge branch 'ms-sqlexample' into 'master'
Add example SQL file.

See merge request STJr/SRB2!330
2018-11-25 15:59:17 -05:00
Monster Iestyn
1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
Steel Titanium
7d4c9dda91 Add newline to end of file 2018-11-25 14:24:50 -05:00
Steel Titanium
981a1192fb Save sound toggles to config 2018-11-25 14:22:52 -05:00
Monster Iestyn
aaabf062b8 Merge branch 'ms-cvars-fix' into 'master'
Update server name insantly

See merge request STJr/SRB2!344
2018-11-25 14:04:12 -05:00
Monster Iestyn
5069acb110 Merge branch 'mpc-software-yslope-fix' into 'master'
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)

See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
Monster Iestyn
028236006b Merge branch '21-copyright-followup' into 'master'
Print copyright notice in stdout console on program start

See merge request STJr/SRB2!347
2018-11-25 11:07:34 -05:00
Monster Iestyn
8b4a64ac05 Merge branch 'last-min-cleanup' into 'master'
Last min cleanup

See merge request STJr/SRB2!342
2018-11-25 10:14:34 -05:00
Monster Iestyn
11cb2e05ba Merge branch 'cmake-use-internal-libs' into 'master'
CMake: Use internal libs.

See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
Monster Iestyn
85305791d8 Merge branch 'objectplace-skybox-fix' into 'next'
Objectplace skybox fix.

See merge request STJr/SRB2!319
2018-11-25 09:30:16 -05:00
toaster
3c480277aa Update HUD anim counters when dead.
* Split out the HUD-related counters from K_KartPlayerThink() into their own function.
* Called this function in P_DeathThink().
2018-11-25 13:48:46 +00:00
toaster
e5fef95d94 Sound volume distance indication now scales with mapheader scale. 2018-11-25 13:30:43 +00:00
mazmazz
e4d7ba39a9 Whitespace 2018-11-25 08:17:57 -05:00
mazmazz
8e7fc9afd8 Add README and LICENSE to cmake install 2018-11-25 08:12:34 -05:00
mazmazz
83531469d7 Print GPL license notice and SEGA disclaimer in console on start 2018-11-25 08:12:19 -05:00
Digiku
40dfe89273 Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018

See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
bd4743007e Update source copyrights to 2018, outdated targets 2018-11-25 07:35:53 -05:00
mazmazz
ea7162a76a Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
62443c9090 Merge branch '21-credits-update' into 'master'
Extra credits update .21

See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
TehRealSalt
680f95bb57 Merge branch 'master' into 102-gameplay 2018-11-25 07:12:36 -05:00
TehRealSalt
92d5a6b8fb Quick patch-over to dedicated server husk bug
Whenever a 16th player would join, it would wrap around and overwrite the dedicated server ghost host player. This is possibly a bug in vanilla as well, but it'd only occur at 32 players so it's no wonder no one figured that out. :V

As a quick patch, I just capped cv_maxplayers to MAXPLAYERS-1 in dedicated servers only. To fix this for real, we'd need to give dedicated servers their own player & node instead of clumping in into the start of the normal ones.
2018-11-25 07:10:45 -05:00
TehRealSalt
e35e00f94e Mess with display offset for some Battle objects 2018-11-25 05:43:17 -05:00
Nev3r
d7b3cf9314 Forgot the alignment for compact structs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
Nev3r
b48c1d1ce6 Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
# Conflicts:
#	src/w_wad.c
2018-11-25 11:18:28 +01:00
Nev3r
7dd6692f40 Merge branch 'ghPK3-Backport' into PK3-BackportNext 2018-11-25 11:14:32 +01:00
Nev3r
32a9e40baa Progress?
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.

Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:11:50 +01:00
Nev3r
7c44054aa3 Take out the ifdef?
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
TehRealSalt
01f5787e51 Unlock all secrets for dedicated
If wanted we can just add dedicated checks to Encore & Hard Mode, but I figured this would be quicker and more future-proof.
2018-11-25 02:30:08 -05:00