Commit Graph

4574 Commits

Author SHA1 Message Date
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
TehRealSalt c67e7f1709 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 f3ea628fea Update server name instantly on change 2018-11-24 21:24:05 -05:00
TehRealSalt 7608055679 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 7dcc55951b Make absolute sure spbplace is set in the right places 2018-11-24 20:48:21 -05:00
TehRealSalt d467399480 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 fccdfc1bfd Weaken slightly 2018-11-24 19:49:18 -05:00
TehRealSalt f47c78832a colorize arrow roulette 2018-11-24 18:00:27 -05:00
Alam Ed Arias 1113849f5c Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 18:00:14 -05:00
TehRealSalt a1f2b8f3f0 Merge branch 'master' into 102-gameplay 2018-11-24 17:44:20 -05:00
Nev3r ec67c4cbd6 Fix uninitialized pointer.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
Alam Ed Arias 1bcfe16933 Do not remove newlines from the end of files 2018-11-24 17:30:49 -05:00
TehRealSalt 14d178ed4b 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 31aa96ecdc Wrong var here 2018-11-24 17:27:48 -05:00
Alam Ed Arias 4ac481bcc6 Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 17:22:11 -05:00
Nevur 3f69e7c9b4
Merge branch 'next' into PK3-BackportNext 2018-11-24 23:08:52 +01:00
Nev3r a1fb333e9b 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 f80691eb6e Revert "Adjust mouse scaling calculation for SDL in windowed mode"
This reverts commit 3b298b7c42.
2018-11-24 15:36:50 -05:00
Alam Ed Arias c1d4ef3296 Merge branch 'next' into PK3-BackportNext 2018-11-24 14:54:42 -05:00
Alam Ed Arias 148d8ec9e0 Merge branch 'PK3-Backport' into PK3-BackportNext 2018-11-24 14:54:07 -05:00
Alam Ed Arias 17528a6aa9 LFS fixup for PK3 support 2018-11-24 14:48:56 -05:00
toaster 2b91e42410 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 6f5e3d42ff Merge branch 'PK3-Backport' into 'PK3-BackportNext'
Pk3 backport

See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
TehRealSalt d3a737f8c1 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 cb0c31fa9a 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 4fdaf448f2 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 cf8b4a6cb1 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
mazmazz 3b298b7c42 Adjust mouse scaling calculation for SDL in windowed mode 2018-11-23 21:43:50 -05:00