3206ce716f
I like working on Kart...
2018-11-27 19:00:48 -05:00
e158206e55
backport string len tweaks I made to LUA_LoadLump in internal
2018-11-27 23:06:31 +00:00
cb53bc8afe
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
e2a9aeb34c
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
28488cc0dc
Merge branch 'netcode-vars-strict' into 'master'
...
Make netcode var defaults stricter, add Advanced Server Options
See merge request KartKrew/Kart!110
2018-11-27 12:27:47 -05:00
ed4477705d
Separated the damage hooks into multiple more precise hooks for players.
2018-11-27 18:27:43 +01:00
a2ab230bfa
Merge branch '102-gameplay' into 'master'
...
v1.0.2 gameplay
See merge request KartKrew/Kart!107
2018-11-27 12:25:37 -05:00
cc8af2acdb
Merge branch 'better-buffering' into 'master'
...
Better vote level buffering
See merge request KartKrew/Kart!109
2018-11-27 12:25:02 -05:00
59f59c8042
Merge branch 'rotate-the-md2' into 'master'
...
Rotate the MD2
See merge request KartKrew/Kart!108
2018-11-27 12:23:48 -05:00
f0b042a4b6
Advanced Server Options menu
...
More accessible way of modifying ping limit, timeouts, max file send, etc now that the defaults are stricter
2018-11-27 12:10:46 -05:00
cd57be640c
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
969801ef09
SEVERELY nerf jointimeout & resynchattempts, too
...
All of these previous defaults are "this is an insane time to reach, by that point you might as well disconnect"
2018-11-27 11:23:28 -05:00
3e6388c183
use UINT8 * instead of void or Bytef *
2018-11-27 15:49:41 +00:00
6e839d30a2
Merge branch 'master' into next
2018-11-27 15:31:28 +00:00
95e13d9ad3
Merge branch 'save-soundmenu-toggles' into 'master'
...
Save sound toggles to config
See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
1889c36dea
add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)
2018-11-27 13:57:32 +00:00
92225748e5
Fix order so the new sound can actually play
2018-11-26 23:34:43 -05:00
b7f7c2ecf7
PK3: fixup support for newer version of zlib
2018-11-26 20:08:26 -05:00
9a042cd5e2
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
78a1931bdf
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
5a3f469593
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
ac2ec6c982
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
4e332b3848
Fix MSVC build
2018-11-26 18:27:07 -05:00
ab5dc3226b
Revert change to P_SlopeLaunch
...
Don't call slopelaunch just from object z difference if the slope has no physics.
2018-11-26 23:10:24 +00:00
a2678dcb2e
Merge branch 'public-nights-invertloopfix' into 'next'
...
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2!300
2018-11-26 16:08:24 -05:00
fd891aa21d
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
2018-11-26 15:48:08 -05:00
4b0d45afd8
Merge branch 'opengl-noloading' into 'master'
...
Hide OpenGL loading screen
See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
ec279da272
classic lat forgot whitespaces meme
2018-11-26 21:24:57 +01:00
0175e5b6a5
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
732e0447a5
Merge branch 'master' into 102-gameplay
2018-11-26 10:14:41 -05:00
38ebc4d838
Update version to v1.0.2
2018-11-26 09:34:15 -05:00
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
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
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
1c907667fc
Slow down animation
2018-11-26 07:43:05 -05:00
4ad32b23d9
Find bestrank for 7 sec limit enforcement
2018-11-26 07:18:21 -05:00
5dbd747237
Flush map buffer early, again
...
Now it's directly in G_AddMapToBuffer
2018-11-26 06:09:26 -05:00
4bd6ae3f04
Calculate buffer size manually
...
(Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 05:09:56 -05:00
494fa55390
Accidental removal
2018-11-26 04:42:14 -05:00
e59a675eb3
Mistakes
2018-11-26 04:28:39 -05:00
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
62b9754407
This sound doesn't exist yet, but I'm defining it anyway
2018-11-26 03:19:31 -05:00
2a573c2072
Merge branch 'master' into 102-gameplay
2018-11-26 03:13:17 -05:00
ba28f1c65f
Add confirmation to reset controls
2018-11-26 03:12:22 -05:00
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
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
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
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
b68a58d5b2
Make sure spbplace is set better during SEEKING
2018-11-25 20:24:47 -05:00
e82c7cb230
Make the WAIT phase work better with SPB rush
2018-11-25 20:23:09 -05:00
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
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
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
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
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
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
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
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
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
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
e5fef95d94
Sound volume distance indication now scales with mapheader scale.
2018-11-25 13:30:43 +00:00
e4d7ba39a9
Whitespace
2018-11-25 08:17:57 -05:00
83531469d7
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
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
bd4743007e
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
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
680f95bb57
Merge branch 'master' into 102-gameplay
2018-11-25 07:12:36 -05:00
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
e35e00f94e
Mess with display offset for some Battle objects
2018-11-25 05:43:17 -05:00
d7b3cf9314
Forgot the alignment for compact structs.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
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
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
7c44054aa3
Take out the ifdef?
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
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
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
f3ea628fea
Update server name instantly on change
2018-11-24 21:24:05 -05:00
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
7dcc55951b
Make absolute sure spbplace is set in the right places
2018-11-24 20:48:21 -05:00
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
fccdfc1bfd
Weaken slightly
2018-11-24 19:49:18 -05:00
f47c78832a
colorize arrow roulette
2018-11-24 18:00:27 -05:00
1113849f5c
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 18:00:14 -05:00
a1f2b8f3f0
Merge branch 'master' into 102-gameplay
2018-11-24 17:44:20 -05:00
ec67c4cbd6
Fix uninitialized pointer.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
1bcfe16933
Do not remove newlines from the end of files
2018-11-24 17:30:49 -05:00
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
31aa96ecdc
Wrong var here
2018-11-24 17:27:48 -05:00
4ac481bcc6
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 17:22:11 -05:00
3f69e7c9b4
Merge branch 'next' into PK3-BackportNext
2018-11-24 23:08:52 +01:00
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
f80691eb6e
Revert "Adjust mouse scaling calculation for SDL in windowed mode"
...
This reverts commit 3b298b7c42
2018-11-24 15:36:50 -05:00
c1d4ef3296
Merge branch 'next' into PK3-BackportNext
2018-11-24 14:54:42 -05:00
148d8ec9e0
Merge branch 'PK3-Backport' into PK3-BackportNext
2018-11-24 14:54:07 -05:00
17528a6aa9
LFS fixup for PK3 support
2018-11-24 14:48:56 -05:00
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
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
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
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
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
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
3b298b7c42
Adjust mouse scaling calculation for SDL in windowed mode
2018-11-23 21:43:50 -05:00
b60c10dc9b
Change default mouse sensitivity
2018-11-23 20:51:57 -05:00
e265d910d3
Item roulette fun-times
...
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
794d27b49e
Kill CheckMissileImpact, it has been useless for probably a decade and a half
2018-11-23 23:14:49 +00:00
0a0336a674
Merge branch 'master' into fof-slope-skew-backport
...
# Conflicts:
# src/r_segs.c
2018-11-23 22:40:28 +00:00
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
9e09dd7563
Don't show "Attack or Protect" for spectators
2018-11-23 16:00:21 -05:00
d228e35fcb
Merge branch 'responsefile-fix' into 'master'
...
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
9c444b64a9
Fix divide by 0 bug
2018-11-23 15:45:46 -05:00
97dd291f3f
Merge branch 'master' into responsefile-fix
2018-11-23 15:29:52 -05:00
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
...
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
...
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
3d0fd7ff2e
Merge pull request #258 from light2yellow/master
...
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
08af33c51f
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
0487558a98
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
3c95a63fc2
Merge branch 'public-darker-credits' into 'master'
...
Make the credits pics darker
See merge request STJr/SRB2!336
2018-11-23 07:35:44 -05:00
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
e51ed406ac
Swap out SDL_INIT_JOYSTICK for SDL_INIT_GAMECONTROLLER
...
First step in improving controller support.
2018-11-23 00:01:20 -06:00
3f35ffd7c6
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
933c1311cd
Make the error less confusing
2018-11-22 22:59:46 -05:00
c4335a5524
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-22 22:56:33 -05:00
00fc67ba36
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
c2c799c885
Change defaults of these
...
nettimeout being 10 seconds is INSANITY, and maxping of 500 is when it starts being unplayable (I could also be bargained to raise it to 750 or 1000 though). Not sure if jointimeout causes any freezing, if it does then I'd also like to lower that
2018-11-22 20:54:28 -05:00
fe6832f559
Merge branch 'medal_unlocks' into 'master'
...
Immediate Time Medal Unlock Fix
See merge request KartKrew/Kart!104
2018-11-22 20:52:30 -05:00
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
f7eea7ade3
Fix compiler errors
2018-11-22 20:08:57 +00:00
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
37c0e646e4
Merge branch 'ms-update-alert-fix' into 'master'
...
Master Server Update alert fix
See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
de02c0bca9
Turns out your unlocks are delayed a little bit! The medals are saved, but the unlocks due to the medals aren't immediate... which is a problem for Hell Attack, since there's no indication you need to play another level for it all to work!!!
2018-11-22 18:28:27 +00:00
c6268253eb
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it).
...
Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out.
In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
3832ffcc42
Make SPB slightly fairer on conveyors
...
It is possible to outrun SPB on gramet now
2018-11-21 22:26:33 -05:00
8f2210fb2f
Allow turning while respawning
...
This makes rubber-burn turning even more useless, but I don't think there's a way to fix the rubber-burn turn without breaking demo playback, so let's just do the part that is needed for now. I kinda want to redo how that mechanic works anyway.
2018-11-21 20:29:21 -05:00
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
1cb602aec6
Fix squishing on mobj scale maps
2018-11-21 19:40:56 -05:00
a30563da22
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -05:00
f65a8796df
SPB retargets the same person after death
2018-11-21 19:22:28 -05:00
e07e89055d
Remove drift & pogo spring on hit and a few other places
2018-11-21 19:00:14 -05:00
3acc312923
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
2018-11-21 20:45:03 +00:00
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
b03d87c80a
Be more consistent with how we lock kartspeed/kartweight
...
- The skin values are now locked between 1 and 9.
- kartspeed & kartweight are no longer locked on skin-switch. Combined with the above, this results in no gameplay change, other than the character select showing the proper value.
- Values used for the engine sounds are locked. No longer can overflow into character voices or freeslotted sounds.
- Removed the overzealous weight locking when in offroad.
If we want to ACTUALLY lock speed/weight for Lua too then we should do that in the Lua stuff.
2018-11-20 02:59:10 -05:00
5c67e22c22
Random map buffer only gets added to when
...
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
9a4ebb916a
Allow yeah in splitscreen
2018-11-20 00:10:54 -05:00
9b1c2b8dc0
Make Map Hell a 1% chance
2018-11-19 23:41:15 -05:00
9b7eea408d
Change "player" to "user" to make it easier to read
2018-11-19 23:13:09 -05:00
0a3183aa82
Don't shrink spectators
...
Another typo here
2018-11-19 23:07:53 -05:00
c6053c8265
Don't do wipeout dust for spectators
2018-11-19 23:06:31 -05:00
555deddb6a
Offroad effect fixes
...
- Make dust retain some of your speed so it's more visible
- Only play effect when moving and on the ground
2018-11-19 22:45:12 -05:00
4590d5c5cf
Fix SKINCOLOR_ prefix not registering in Lua
2018-11-19 22:38:54 -05:00
39e644a7f5
Move countdown setting to P_CheckRacers
...
This fixes two bugs:
- Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before
- Means that the countdown timer can be set on disconnect
2018-11-19 22:37:24 -05:00
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
418943acdc
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
797f9d180e
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
2018-11-19 17:46:38 +00:00
20ac8ed126
Mistake
2018-11-18 23:31:36 -05:00
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
b58cbd2c08
Move Shrink out of P_DamageMobj
2018-11-18 17:51:49 -05:00
a3211df748
Apply banana drag effect to offroad
2018-11-18 17:01:43 -05:00
22b3a29d12
Merge branch 'countdown-on-all-win' into 'master'
...
Finish countdown only starts when all winners are declared
See merge request KartKrew/Kart!99
2018-11-18 16:09:09 -05:00
ddff42d9e0
Merge branch 'avoid_fixing_manual' into 'master'
...
Avoid Modifying Default Controller Layout Manual Page
See merge request KartKrew/Kart!102
2018-11-18 16:07:33 -05:00
b47d10645a
Merge branch 'show16playersinrankings' into 'master'
...
Fix the player in 16th not being visible in rankings
See merge request KartKrew/Kart!103
2018-11-18 16:02:32 -05:00
0aa251b18a
Merge branch 'nextmerge_again' into 'master'
...
Nextmerge again
See merge request KartKrew/Kart!101
2018-11-18 16:01:09 -05:00
ffcb6eb6ab
Merge branch 'fix-memory-leak' into 'master'
...
Fix the Memory Leak
See merge request KartKrew/Kart!100
2018-11-18 15:11:49 -05:00
a6d48f0ef4
Fix the player in 16th not being visible in rankings
2018-11-18 20:05:17 +00:00
cdeeac6ba1
Swap gc_lookback and gc_brake's default binded keys on controllers. (see the first issue in http://mb.srb2.org/showpost.php?p=802758&postcount=30 )
2018-11-18 19:31:07 +00:00
c5a6460e18
Update ASSET_HASH_PATCH_KART for the latest patch.kart
2018-11-18 18:28:46 +00:00
aa607ecf4c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
4ee48194c4
Fix the Memory Leak
...
The Kart Minimap heads I believe should use GTC_CACHE as they're shown in level, only(?) Not using it causes the memory to keep creeping up as more colourmaps are loaded but not freed, while OpenGL by extention endlessly keeps making new textures for the "new" colourmaps.
2018-11-18 14:43:31 +00:00
0720264bc2
Negate `(netgame || multiplayer)` condition for countdown to use `defaultvalue` instead of `value` per the specifics of the previous implementation
2018-11-18 09:10:26 -05:00
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
24a551238d
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git
2018-11-18 12:33:27 +00:00
dac8a4ab93
Move the player 3 and 4 CMD defines to the correct place.
2018-11-18 12:32:59 +00:00
9acd0ffe8b
Fix for waiting player screen animation
2018-11-18 06:34:29 -05:00
12ee59bdfa
Finish countdown only starts when all winners are declared
...
Still removing/changing crusty vanilla holdovers, one at a time. :shitsfree:
2018-11-18 06:17:42 -05:00
9ffcc79288
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git
2018-11-18 11:05:20 +00:00
5a96a0d0a4
Fix potential warning from string truncation
...
Also the MS seems to just throw the entire char array into the website and ignore null terminators, so I'm memsetting maptitle all to 0 before we do anything with it.
2018-11-18 11:05:05 +00:00
7b142dbad1
Updated the one important modified game print that most people see to be more descriptive
...
(I could've SWORN there were more...)
2018-11-18 05:48:10 -05:00
fb3d0da38f
v1.0.1 prep
...
Enable patch.kart, up version number
2018-11-18 04:00:05 -05:00
0e3b225011
Remove duplicate/removed objects
...
As well as other compile errors
2018-11-18 03:43:33 -05:00
b20d76719b
Merge branch 'fix-opengl-screentexture-hack' into 'master'
...
Fix textures in GL being wacky with the screen.
See merge request KartKrew/Kart!91
2018-11-17 20:58:52 -05:00
516cda90ec
Default gr_md2 to on
2018-11-17 20:55:12 -05:00
bd3f398a04
Fix cvar bugs
...
- karteliminatelast uses CV_YesNo instead of CV_OnOff
- chatbacktint defaults to on
- soniccd defaults to off
2018-11-17 20:47:11 -05:00
c419d973a3
Merge branch 'chat-changes' into 'master'
...
Fix capslock wonkyness
See merge request KartKrew/Kart!98
2018-11-17 16:54:56 -05:00
52e0379398
Merge branch 'introfadefix' into 'master'
...
Make level white fade use timeinmap instead of leveltime
See merge request KartKrew/Kart!93
2018-11-17 16:54:19 -05:00
b27a44e79b
Merge branch 'serverinfo_fix' into 'master'
...
Serverinfo Fixes
Closes #33 and #31
See merge request KartKrew/Kart!92
2018-11-17 16:54:08 -05:00
37596d445c
Merge branch 'savedata_fixes' into 'master'
...
Gamedata fixes
Closes #35
See merge request KartKrew/Kart!97
2018-11-17 16:53:56 -05:00
f17f5d08f5
Merge branch 'fix-splitscreen-join' into 'master'
...
Prevent more local players than the server maxplayers limit joining
Closes #30
See merge request KartKrew/Kart!90
2018-11-17 16:29:11 -05:00
8981093c85
Merge branch 'dedicated-battle-fix' into 'master'
...
Fix Battle Causing the game to crash in dedicated servers
Closes #36
See merge request KartKrew/Kart!88
2018-11-17 16:27:15 -05:00
e4cb1bc430
Merge branch 'shrinkegg_fix' into 'master'
...
Fix Eggman shrink bug
Closes #38
See merge request KartKrew/Kart!89
2018-11-17 16:24:40 -05:00
477400020d
forgot whitespaces....
2018-11-17 22:23:23 +01:00
e9767df4ff
Fix capslock not working outside of chat/console and shifting non letter characters
2018-11-17 22:21:10 +01:00
4abb03a231
Two tweaks to gamedata saving:
...
* Save gamedata in Y_UpdateRecordReplays(), so that you never unfairly lose out on your spoils by setting modifiedgame before the game ends.
* Always save your matchesplayed/totalplaytime increase at the successful completion of a level.
2018-11-17 20:16:27 +00:00
176dc6e5ca
Fix the first digit of all exiting players in positions 10 or worse flashing the first-place rainbow.
2018-11-17 18:02:04 +00:00
69228715fe
Make level white fade use timeinmap instead of leveltime
2018-11-17 16:54:56 +00:00
56ed67397d
* Fix the in-game MS browser thinking gametypes are unknown.
...
* Fix the website MS browser mapname output being incomplete.
* Hide hell maps on the website MS browser mapname output.
* (unrelated) tweak Command_Showmap_f's logic for a more accurate name.
2018-11-17 15:48:10 +00:00
c46efa7c41
Set the screen textures to use max higher texture IDs
...
This should hopefully alleviate the issue where textures overwrite the screen, or the screen overwrites the texture for now.
THIS IS NOT A FULL SOLUTION TO THE PROBLEM, but I highly doubt we'll ever be loading 4 billion textures at once, ever.
2018-11-17 15:23:12 +00:00
5d991b6f2a
Prevent more local players than the server maxplayers limit joining
2018-11-17 15:00:15 +00:00
8735dcd24b
Fix Eggman shrink bug.
...
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
2018-11-17 14:41:08 +00:00
8845043d31
Fix Battle Causing the game to crash in dedicated servers
...
Check that the displayplayer mo exists before trying to use it for scaling on Player Arrow
2018-11-16 23:07:27 +00:00
e85e621d2c
Minor credits issues
2018-11-16 12:05:57 -05:00
0de2d52bfd
add TOL_TV to dehacked
2018-11-16 12:04:24 -05:00
cb8bbf8e4c
Ensure MS packets are sent correctly
2018-11-16 12:01:57 -05:00
692ea23a42
Final credits
2018-11-15 22:55:01 -05:00
879267a709
Don't allow kart files to be downloaded
2018-11-15 19:18:04 -05:00
6b772aab59
Add Kart files to Makefile
2018-11-15 19:17:49 -05:00
82f353be61
Remove music.dta from loading
...
We've replaced/changed out all vanilla songs, so we no longer need it.
2018-11-15 19:17:06 -05:00
5d6e15f8af
More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner).
2018-11-15 14:30:11 +00:00
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
b8477b4067
Squash various warnings
...
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
4695841b8d
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
09f9572a8f
Merge branch 'master' into next
2018-11-14 21:49:11 +00:00
3e6fcf1b8b
Merge branch 'opengl-hud-scale-fix' into 'master'
...
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
fb08950c19
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
2018-11-14 16:32:57 -05:00
4e9fc881a2
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
2018-11-14 16:26:46 -05:00
1b79b9527c
Properly check if cmake is running on wwindows
...
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
ad79b4b83b
Add S_StopSoundByID to Lua
...
It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose.
Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.
2018-11-14 15:35:16 -05:00
514cd0794b
This effect assumed that it was spawned at base scale anyway...
2018-11-14 14:48:16 -05:00
2d5551ca5b
Double spectator movement speed to keep up with action better, scale it with map size
2018-11-14 14:41:28 -05:00
1201acce4b
Slightly less duplication
2018-11-14 14:39:37 -05:00
772c072064
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
887f4150c1
Hide unlockables with ???s
2018-11-14 14:15:24 -05:00
97fd69951a
Merge branch 'master' into next
2018-11-14 11:07:12 -05:00
de5b626520
Fix misleading indentation
2018-11-14 11:06:45 -05:00
f81d01edca
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
938bf1605c
Merge branch 'master' into next
2018-11-14 10:52:49 -05:00
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
3b48bf0079
Hide SMK Cup until you've unlocked the Chao Cup on EXTRAS unless you've unlocked the Chao Cup. Fits with our modus operandi of minimising Mario exposure, while still having it for the committed.
2018-11-14 15:29:32 +00:00
d9b1d33d89
Bugfixes:
...
* Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything).
* Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits).
* Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.
2018-11-14 15:28:17 +00:00
8777d5c6c9
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
51768e7dd1
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
ba9818c8ca
Skip errors for staff ghosts
2018-11-14 05:20:51 -05:00
6afcde4aa5
More lenient balloon color setting
2018-11-14 04:45:40 -05:00
9119191b43
maps.kart quick patch
2018-11-14 04:16:13 -05:00
106d8c6d3f
Remove "Kart" in front of the version number
...
Just looks silly :V
2018-11-14 01:12:58 -05:00
f10e7bade4
Merge branch 'disable-develop' into 'master'
...
Disable DEVELOP mode
See merge request KartKrew/Kart!85
2018-11-14 00:52:00 -05:00
682599def8
Update hashes
...
NO MORE FILE EDITING FOR V1!!
2018-11-14 00:51:36 -05:00
f859139353
Final title screen
2018-11-14 00:30:51 -05:00
0b97b2a76c
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
7c2535808f
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-13 21:02:49 -05:00
1ab5ac58a7
Title demos don't interrupt the music
2018-11-13 21:01:59 -05:00
2ca5e29110
Make sure the new option only works on Windows.
...
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
6fb45fa2a9
replacement quit sounds per sal
2018-11-14 01:30:26 +00:00
5d2e638e8a
final menu tweaks before i fall asleep in my chair
2018-11-14 01:27:01 +00:00
d0b64222f7
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
5a06ae76ea
Switch Chao Cup & SMK Cup
2018-11-13 18:34:37 -05:00
302358c403
Merge branch 'mixer-sound-x64-fix' into 'master'
...
mixer_sound fix x64 build issue
See merge request STJr/SRB2!323
2018-11-13 17:42:23 -05:00
9029cf5d9c
Fix skybox disappearing after using objectplace command
2018-11-13 17:25:42 -05:00
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
95ed3fcf7e
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
894ee02f3f
Fix x64 build issue
2018-11-13 17:12:18 -05:00
e9fe0ebae1
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
2018-11-13 18:14:59 +00:00
0d38061db8
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
2018-11-13 18:13:51 +00:00
d09fd4b861
Carry over old explosion sfx flags
2018-11-13 01:09:36 -05:00
29c9448148
Fix clash sound flags not being carried over
2018-11-13 01:06:13 -05:00
b009bddd3b
Lowered volume of drift sparks, made local
2018-11-12 17:18:39 -05:00
13b51823ba
Some tweaking
...
- Swap order of Silver & Gold, for menu appearances & bug fixing
- Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse
- Set sensible defaults for emblem sprite/color
2018-11-12 17:09:37 -05:00
e85f73117c
Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set!
2018-11-12 20:07:45 +00:00
faaea8abe3
Final emblem setup
...
- Added silver time medals for the new maps
- Added gold dev time medals for all maps
- Added 4 more matches played milestone medals
- Changed requirements for most silver time medals to be easier, especially in the early game
- Made all unlockable requirements higher, in both medals & matches, to balance out with the additional medals and make sure stuff is unlocked further into the first release week
2018-11-12 14:42:52 -05:00
63ba59341b
Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing
2018-11-12 16:23:59 +00:00
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
91ae26e213
Use S2 rips on the title screen
2018-11-11 19:22:15 -05:00
93ab9850a3
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
71c72bf0c5
Realign YOU ARE THIS PLAYER highlight on non-green-res voting
2018-11-11 14:36:24 +00:00
799efd5b31
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge
2018-11-10 22:29:37 +00:00
aece934083
Fix not found 40833
2018-11-10 22:27:04 +00:00
6af56273bf
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
eb4a72440a
Render the skies correctly on splitscreen in OpenGL mode
2018-11-10 16:19:41 -03:00
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
c7e58b7cd5
Merge branch 'opengl-new-clipping-backport' into 'master'
...
OpenGL new clipping backport
See merge request STJr/SRB2!315
2018-11-10 13:57:16 -05:00
46b58cba55
Merge branch 'alias-recursion-hotfix' into 'next'
...
Alias recursion hotfix
See merge request STJr/SRB2!314
2018-11-10 13:56:43 -05:00
51df32dd3d
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
ff642df1f2
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03:00
e1a28bbe1c
Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.)
2018-11-10 18:50:19 +00:00
45fc2c46e9
Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git
2018-11-10 18:27:13 +00:00
a0165f1ac1
Merge branch 'com_cleanup_redo' into 'master'
...
Improved "HELP" command
See merge request KartKrew/Kart!82
2018-11-10 12:51:51 -05:00
323c89dbaf
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
dd83652b71
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
8ba0f2a177
clipping code didn't seem so bad this time (at least compared to without), let's enable it now?
2018-11-10 16:09:52 +00:00
c4569e61a8
Made some efforts to improve efficiency of new code, hard to tell if I've made it better or worse though honestly
...
R_IsEmptyLine is now a thing too btw
2018-11-10 16:09:21 +00:00
1e98e3b4f2
More progress, NEWCLIP added to doomdef.h, sadly it actually all lags the game so I've disabled it for now
...
Other notes:
* on second thought I'll keep the hw_clip functions' gld prefixes rather than HWR, not like it matters either way
* despite the extra lag it does fix the issues with translucent walls and such when displayed at different vertical angles, such as with the GFZ1 waterfall
2018-11-10 16:08:56 +00:00
a733a29f4c
Starting work on porting hw_clip.c/h code, Makefiles and CMake can compile them at least
...
Other notes:
* Renamed all new functions to have HWR_ prefix instead of gld_, for consistency
* HWR_FrustrumSetup and HWR_SphereInFrustum are disabled and require HAVE_SPHEREFRUSTRUM. This is because 1) SRB2CB did not need the code, so presumably neither will we, and 2) there are some OpenGL API functions used there that due to our way of using OpenGL we don't use outside of r_opengl.c, which makes dealing with HWR_FrustrumSetup complicated in theory
* The new clipping functions are not added to OpenGL's "main" rendering code itself just yet, they're just available to use now once hw_clip.h is included
2018-11-10 16:08:26 +00:00
31301660cd
Merge branch 'master' into next
2018-11-10 14:27:27 +00:00
925a56ad98
Merge branch 'opengl-improvements-backport' into 'master'
...
Opengl improvements backport
See merge request STJr/SRB2!304
2018-11-10 09:25:18 -05:00
e01c7ae743
Merge branch 'copyright-info-update' into 'master'
...
Update copyright info
See merge request STJr/SRB2!309
2018-11-10 08:33:09 -05:00
2da335a1c4
Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion
2018-11-10 13:08:26 +00:00
5b286d89a8
Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...)
2018-11-10 12:34:04 +00:00
a0badacd22
* Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first.
...
* Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
fa989f2f7f
Shorter Karma sticker
2018-11-10 01:03:34 -05:00
0f01e9513a
Use Silver for brake drift effect
2018-11-10 00:02:21 -05:00
571ef7173e
Ranking face highlights
2018-11-10 00:01:44 -05:00
60dcd3470b
Separate grow & invincibility alarms, donated by VAda
2018-11-09 21:47:36 -05:00
4b8232d777
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
1c22c6a1f9
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
ad625296c2
Buff the fuck out of item drop speed
...
no, dude, don't turn right back around and pick your shit right back up, stop
2018-11-09 15:37:33 -05:00
2f5e8ceee2
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-09 15:34:59 -05:00
b0246d6cba
Prevent using kartdebug cvars in Time Attack.
...
(None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
b3befae143
Merge branch 'public-op-nightsbumper-fix' into 'next'
...
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS
See merge request STJr/SRB2!299
2018-11-09 12:11:11 -05:00
17223aa520
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
f974bb96ac
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
6c5acd6e0d
A few mobj_scale fixes I missed on signposts
2018-11-08 20:39:18 -05:00
3ad8d1c4ce
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-08 19:36:05 -05:00
68d2d00a07
Log "Speeding off to level..."
...
It's not disruptive, but it looks a bit goofy since the "Map is now x" print is no longer directly printed either, so it's the only thing sticking around in the console :V
2018-11-08 17:56:26 -05:00
1e4d196e5e
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
98fd9f8e42
WHY DID I FORGET THIS
2018-11-08 21:22:45 +00:00
82c738ea4b
Remove hasslope, per colette's warning about it potentially causing desyncs
2018-11-08 21:13:58 +00:00
0feb1d557d
Foolish typo
2018-11-08 16:04:26 -05:00
d8f3a20e65
Merge branch 'Playerquit_hook' into 'next'
...
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
a9cfd6a781
Merge branch 'lua-slopes' into 'next'
...
Lua support for slopes
See merge request STJr/SRB2!307
2018-11-08 15:52:44 -05:00
91113cb79c
Merge branch 'master' into next
2018-11-08 20:50:58 +00:00
7cc5caf69c
Merge branch 'winsock-error-handling-fixes' into 'master'
...
Winsock error handling fixes
See merge request STJr/SRB2!303
2018-11-08 15:49:35 -05:00
11595a501a
Fix connecting w/ -splitscreen set
2018-11-08 15:24:10 -05:00
df3c6051e8
Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe
2018-11-08 15:11:22 -05:00
f50f10ef30
d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0
2018-11-08 20:09:00 +00:00
03bf72bf9e
This fake Lua function is probably no longer needed, now.
2018-11-08 15:02:19 -05:00
f5a45534fa
Make the texture stuff completely integer-based again, but expose R_TextureNumForName
...
Decided that being able to set a string and then have it return an integer when retrieving would ultimately be confusing, so let's just let the user handle the string functions.
2018-11-08 14:58:31 -05:00
ed1c108992
Merge branch 'master' into lua-improvement
2018-11-08 14:50:30 -05:00
94066638bc
Merge branch 'master' into lua-improvement
2018-11-08 14:49:56 -05:00
69287984db
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -05:00
c32d0df6c2
Merge branch 'lua-hudlib' into 'master'
...
Small Lua hud library improvements
See merge request KartKrew/Kart!73
2018-11-08 14:43:58 -05:00
393fee317e
Fix for the Y_FollowIntermission change hurting Record Attack
...
Should probably be ported to vanilla
2018-11-08 14:43:06 -05:00
fa80d61799
byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness
2018-11-08 17:16:54 +00:00
fd20bbb54e
More doomtype.h cleaning up:
...
* Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t
* Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds
* Add more comments to make clear the main sections of the file
2018-11-08 17:05:35 +00:00
5c61c40551
Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable
2018-11-08 16:31:20 +00:00
0bdbdd1b1e
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
aa3ad733af
Textures' string bits are now optional.
...
I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.
2018-11-07 22:01:57 -05:00
bc7e865e6b
Serious deep-cleaning to most of the kartstuff
...
More optional fields, more careful eye placed on return values and other checks
2018-11-07 21:04:57 -05:00
2b9b1e3bff
These are integers, whoops
2018-11-07 18:37:06 -05:00
95a1637437
Add Kart globals
2018-11-07 18:31:07 -05:00
b9161871a1
typo
2018-11-07 18:24:44 -05:00
7ad0347ab0
Add missing K_ functions
2018-11-07 18:23:28 -05:00
868118d0cd
IsPlayerAdmin support, since admin was removed
2018-11-07 18:07:34 -05:00
68c46cdca3
toptexture, bottomtexture, and midtexture use strings instead of magic numbers
2018-11-07 17:53:49 -05:00
c8c7b63be6
Fix disabling music on the menu.
2018-11-07 22:18:46 +00:00
e1d46e0122
Merge branch 'master' into 'lua-hudlib'
...
# Conflicts:
# src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
c47f0045d6
ST_Ticker also should not have FUNCMATH, as it also has side effects
2018-11-07 21:45:27 +00:00
8e6ecb5e98
* Add numbers to the staff name strings as Sryder requested.
...
* Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)
2018-11-07 21:42:10 +00:00
b3e8a1ed88
HU_Start should not have FUNCMATH, it has side effects
2018-11-07 21:37:42 +00:00
4a4e07e138
D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function.
2018-11-07 21:21:36 +00:00
9a18b83c2a
Disable DEVELOP mode
2018-11-07 16:19:02 -05:00
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
f66979ba1a
P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)
2018-11-07 21:00:38 +00:00
e63099f3de
Log this
2018-11-07 14:56:36 -05:00
a09d7489d8
Merge branch 'info_tidy' into 'master'
...
Murder the fancharacters and associated
See merge request KartKrew/Kart!83
2018-11-07 14:50:10 -05:00
cf16959ad5
Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year.
2018-11-07 18:05:29 +00:00
a3bc7ddfa0
Add Lua Ultimate Mode global variable so people can use it.
2018-11-06 18:09:45 -06:00
7866e88292
No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding.
2018-11-06 18:54:00 +00:00
390d2b4114
Fix replaying guest demos
2018-11-06 13:38:53 +00:00
935c0da7d2
Fix startbumps.
...
A more detailed explanation:
* P_CheckPosition is the function which determines collisions.
* In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is).
* Even with tailspickup off, on-spawn player collisions do not affect momentum.
* However, in kart, player collisions cause the player to get bumped.
* It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps.
* It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.*
* The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players.
* Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot.
* The reason we didn't see this MUCH before is that it can only ever happen in the case of ties.
I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.
2018-11-06 13:33:27 +00:00
5ccfc111e8
Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own.
2018-11-05 23:18:34 +00:00
e958dfc909
MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.
2018-11-05 23:06:28 +00:00
1cc8619c9e
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
77d6e578f5
Blank out the fancharacters as requested, but don't remove them from the info lists... a fun thing for TCRF to look at eventually, maybe, and I don't want to have to do a from-scratch build at this stage in the game or risk any instability that could arise from sweeping info cleanups.
...
In fact, the only reason I even considered doing this is that the sprites had to be removed, leaving these actively causing errors when placed.
2018-11-05 19:58:20 +00:00
bb251c4fbf
* Re-add support for command "help" (ie, basically no help at all).
...
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
2018-11-05 19:02:34 +00:00
f2e9186c7b
You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints.
2018-11-05 14:33:39 +00:00
7be7c600bf
Cleaner code logic. Should make no real difference to exe, so not gonna upload another.
2018-11-05 14:28:32 +00:00
0d0eaf5f99
Fix "laststaff" setting
2018-11-05 14:03:09 +00:00
a0c3283303
Merge branch 'master' into staff_names
2018-11-05 13:46:10 +00:00
75d08f2048
TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!!
...
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +00:00
9eafb61fd3
Black out the background around the GAMEQUIT picture, since we removed the automatic doing of that for non-green resolutions.
2018-11-05 12:52:15 +00:00
8d4ce113e4
Redo the `help` command stuff, this time with much less impact on other areas of the code for sanity as we approach R1.
2018-11-05 12:49:28 +00:00
263b29a4a6
Merge branch 'fix-mixed-declarations' into 'master'
...
Literally a single compiler warning.
See merge request KartKrew/Kart!80
2018-11-04 16:49:45 -05:00
3a53d6d3b9
Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot).
2018-11-04 21:48:47 +00:00
6c0fae421c
Literally a single compiler warning.
2018-11-04 17:37:18 +00:00
b8446effe8
Correctly disable OGL-only menus/options in software.
2018-11-04 14:41:24 +00:00
e2f57e5ca0
Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things.
...
https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
34baa5ae74
Mixed up validity check...
2018-11-03 22:53:12 -04:00
6604d0181c
Staff attack ghost names on the `REPLAY...` menu.
...
Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00:00
d3944fe29b
Battle arrow fixes and cleanup
2018-11-03 17:45:38 -04:00
4cbc270b6d
Merge branch 'master' into lua-hudlib
2018-11-03 22:25:33 +01:00
e7f35307c9
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 22:24:45 +01:00
f9ad07da5f
Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...)
2018-11-03 13:20:02 +00:00
02b14959cc
Merge branch 'master' into next
2018-11-03 12:29:04 +00:00
924c3164b0
Merge branch 'soc-sanitising-the-sequel' into 'next'
...
SOC sanitising the sequel!
See merge request STJr/SRB2!308
2018-11-03 08:18:16 -04:00
0d79cbdd27
Keep the old y offsets, though.
2018-11-03 03:38:41 -04:00
cb1380ae51
Changed this randomly changed instance back to vanilla, due to compile errors
...
https://i.imgur.com/SEdmZpC.png
2018-11-03 03:29:06 -04:00
69faf1cbc7
Remove NOFOURPLAYER from Makefile
...
Seems that someone already removed it from the other code anyway...?
2018-11-03 03:21:08 -04:00
9de7a9d5cc
Add textures.kart, re-define DEVELOP mode,
...
Disabling DEVELOP can be another branch; this means this can get in master quicker
2018-11-03 03:17:20 -04:00
0eab0c5a14
Merge branch 'master' into update-version
2018-11-02 23:57:28 -04:00
9ae9e7ec3a
Check for valid source in A_JawzChase, change 1 target rule
2018-11-02 23:51:06 -04:00
0f37411e2b
Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
...
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
2018-11-02 20:48:12 +00:00
cb699c1770
fullbright points
2018-11-02 15:06:56 -04:00
6bb33b9d16
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-02 14:59:48 -04:00
ba67c7aa70
Fix for "became a spectator" text repeating
2018-11-02 14:59:26 -04:00
87dd8cd0ce
Merge branch 'all_hardcode' into 'master'
...
Truly all-hardcode
See merge request KartKrew/Kart!71
2018-11-02 14:54:09 -04:00
399bccd2c7
use gfx.kart
2018-11-02 14:52:08 -04:00
7b268d15b1
Merge branch 'lua-hudlib-addition' into 'next'
...
Lua: hud.enabled and v.getLocalTransFlag()
See merge request STJr/SRB2!306
2018-11-02 14:29:02 -04:00
8d5fb13111
wrong var fix
2018-11-02 14:01:29 -04:00
f37a573834
Merge branch 'master' into next
2018-11-02 11:02:35 +00:00
ba5f5be3bb
Merge branch 'patch-offsets-fix' into 'master'
...
Patch offsets fix
See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
37893cc523
Merge branch 'master' into all_hardcode
2018-11-02 02:30:36 -04:00
1bdaad3f06
quick merge fix
2018-11-02 02:28:34 -04:00
5c1cc6e1df
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
667e636631
Use chars.kart
2018-11-02 01:22:52 -04:00
6fd0f3f0ba
Fix ghost rankings issue
2018-11-02 01:19:25 -04:00
89276b739f
Merge branch 'master' into chars_cleanup
2018-11-01 23:48:22 -04:00
950bca1217
Actually lets just do this now, like how its done below
2018-11-01 21:05:52 -04:00
78299c5fee
0xFFFF to 0xFFFFFFFF
...
I'll implement proper bit-setting later, just gotta see if it works first
2018-11-01 20:50:19 -04:00
67dd962fb9
Change out the hex used for hnext/hprev consistancy
2018-11-01 20:46:20 -04:00
e758e0f8fd
Merge branch 'master' into resync
2018-11-01 20:39:50 -04:00
5c7de75592
Fix random crash on squishing
...
Why does this cause a crash? I dunno, beats me, but this seemed to fix it.
2018-11-01 19:50:31 -04:00
0c2a5cf9d3
Merge branch 'master' into more-fixes
2018-11-01 18:10:53 -04:00
7e103be393
Change default brake color from Yellow to White
2018-11-01 17:37:59 -04:00
6a31959381
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
03d64cbced
Merge branch 'master' into brake-drift
2018-11-01 17:35:45 -04:00
deb51d1eb4
Merge branch 'master' into battle-visuals
2018-11-01 17:35:01 -04:00
a2da81243e
Double length of msg
2018-11-01 17:08:30 -04:00
43d72d72f9
Properly center this
2018-11-01 17:06:10 -04:00
7e9300c420
Lap hands touch-up
2018-11-01 16:15:25 -04:00
5a0cfc10f4
Update copyright info on some files
2018-11-01 14:47:19 -04:00
4cf9476510
First frame lasts longer
2018-11-01 13:44:09 -04:00
7891a11fba
Battle points are visible
2018-11-01 00:57:38 -04:00
a193a4adf2
YOU GOT EM
...
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-10-31 23:34:13 -04:00
6c557407d5
Added judging hands (if'd out)
2018-10-31 23:10:38 -04:00
4369917912
Fix offsets, add colormapping
2018-10-31 22:38:43 -04:00
ea4ca2eb1f
Brake drfit effect
2018-10-31 21:35:17 -04:00
659e6fa617
That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case.
...
* Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'!
* Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites.
* Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
4dd5abf534
Merge branch 'master' into next
2018-10-31 23:10:57 +00:00
c450a1aee2
Merge branch 'mi-minor-refactoring-backport' into 'master'
...
MI minor refactoring
See merge request STJr/SRB2!294
2018-10-31 16:49:30 -04:00
61c1b12960
Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master'
...
Multi-patch texture support for transparency AND translucency
See merge request STJr/SRB2!293
2018-10-31 16:48:38 -04:00
e9ea1b47d5
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
2018-10-31 19:26:29 +00:00
2999c45d05
Item distribution experiments based on my experience in netgames
...
Needs tested tonight.
- Grow & Rocket Sneakers are slightly more in the back
- Sneaker x3 gets handed out more in the back-middle
- Removed 5% from Ballhog towards the front
- Removed 5% from Shrink in the forward-most column it was in
2018-10-31 15:14:53 -04:00
007ef084c6
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-31 16:19:50 +00:00
668acad8a7
Order of state enums was different to that of info table, so corrected.
2018-10-31 16:18:44 +00:00
1928dd86f1
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01:00
TehRealSalt
