Commit graph

4424 commits

Author SHA1 Message Date
Steel Titanium
c031801daa Add newline to end of file 2018-11-25 14:24:50 -05:00
Steel Titanium
157502310f Save sound toggles to config 2018-11-25 14:22:52 -05:00
Monster Iestyn
72fc63eb8a 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
358e84f56d 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
235c23ded8 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
1983f3bfde 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
0897adcf98 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
058b5bcbda 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
151404f33f 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
3cbf6962d3 Sound volume distance indication now scales with mapheader scale. 2018-11-25 13:30:43 +00:00
mazmazz
91f2c4f8a7 Whitespace 2018-11-25 08:17:57 -05:00
mazmazz
22d0d8cb2e Print GPL license notice and SEGA disclaimer in console on start 2018-11-25 08:12:19 -05:00
Digiku
f79adecdef 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
951b78ee2d Update source copyrights to 2018, outdated targets 2018-11-25 07:35:53 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
bacdb3a392 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
e179e1bfba Merge branch 'master' into 102-gameplay 2018-11-25 07:12:36 -05:00
TehRealSalt
5af6c33ca6 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
4acadbf66f Mess with display offset for some Battle objects 2018-11-25 05:43:17 -05:00
Nev3r
df819f2329 Forgot the alignment for compact structs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
Nev3r
63dabd87cd 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
34facc7c60 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
be2a977ce5 Take out the ifdef?
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
TehRealSalt
4edcc94c08 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
TehRealSalt
2485e25268 Game saves when you use the cheat
Because of other G_SaveGameData instances added in the last patch, this cheat can get saved anyway. Since this is just supposed to be convenience for server hosts, we might as well make it work like other console Kart racers and just make it save anyway!
2018-11-25 02:24:33 -05:00
Steel Titanium
0023f8d7eb Update server name instantly on change 2018-11-24 21:24:05 -05:00
TehRealSalt
d5270a8b91 More in-depth countdown calculation
Hooooopefully this makes sure time over doesn't happen prematurely at random
2018-11-24 20:59:22 -05:00
TehRealSalt
0a303dfde9 Make absolute sure spbplace is set in the right places 2018-11-24 20:48:21 -05:00
TehRealSalt
d3fb778a52 Keep track of the place SPB is following
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
TehRealSalt
82988cdb0c Weaken slightly 2018-11-24 19:49:18 -05:00
TehRealSalt
0846d2cb2c colorize arrow roulette 2018-11-24 18:00:27 -05:00
Alam Ed Arias
0642d7e2c9 Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 18:00:14 -05:00
TehRealSalt
9288f4563d Merge branch 'master' into 102-gameplay 2018-11-24 17:44:20 -05:00
Nev3r
b4110fdb8b Fix uninitialized pointer.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
Alam Ed Arias
8ebb775da9 Do not remove newlines from the end of files 2018-11-24 17:30:49 -05:00
TehRealSalt
5767a25b14 Infinite wall bump fix(?)
Couldn't replicate it at all after this change, but I also have trouble replicating it before it :v
2018-11-24 17:28:53 -05:00
TehRealSalt
1acbb77efb Wrong var here 2018-11-24 17:27:48 -05:00
Alam Ed Arias
ee4e86fc67 Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 17:22:11 -05:00
Nevur
7dd7608006 Merge branch 'next' into PK3-BackportNext 2018-11-24 23:08:52 +01:00
Nev3r
f360e3431c Revamped the lumpinfo_t array generation code.
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
mazmazz
b8850b5819 Revert "Adjust mouse scaling calculation for SDL in windowed mode"
This reverts commit 65b5d74844.
2018-11-24 15:36:50 -05:00
Alam Ed Arias
bd576c8e80 Merge branch 'next' into PK3-BackportNext 2018-11-24 14:54:42 -05:00
Alam Ed Arias
40f7bb5afe Merge branch 'PK3-Backport' into PK3-BackportNext 2018-11-24 14:54:07 -05:00
Alam Ed Arias
faaf5262da LFS fixup for PK3 support 2018-11-24 14:48:56 -05:00
toaster
18c0d5d7bd Fix a bug where zoomtubes could cause ridiculous acceleration (ie, because PF_SPINNING was applied, causing ridiculously low friction, and then no mechanism was able to remove it) 2018-11-24 18:22:01 +00:00
Nev3r
34c472dfb7 Merge branch 'PK3-Backport' into 'PK3-BackportNext'
Pk3 backport

See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
TehRealSalt
4c003cabe1 More SPB tweaks
- SPB can switch off if its target if that person lost the lead for 7 seconds
- Make sure lastlook gets reset when going back to SEEKING
2018-11-24 03:42:25 -05:00
Nev3r
48cf6572b3 Final touches
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.

Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
TehRealSalt
b1ee5de058 Change how SPB rush works
Instead of enabling Frantic for the person in 2nd, it doubles the gap between them. Now it's 2nd's job to catch up and ruin 1st's day.
2018-11-24 02:56:39 -05:00
mazmazz
354037b251 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00