toaster
71c72bf0c5
Realign YOU ARE THIS PLAYER highlight on non-green-res voting
2018-11-11 14:36:24 +00:00
Sryder
799efd5b31
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge
2018-11-10 22:29:37 +00:00
toaster
aece934083
Fix not found 40833
2018-11-10 22:27:04 +00:00
Sryder
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
Monster Iestyn
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
toaster
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
toaster
45fc2c46e9
Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git
2018-11-10 18:27:13 +00:00
Sryder
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
Monster Iestyn
323c89dbaf
fix using abs() on unsigned
2018-11-10 17:40:09 +00:00
Monster Iestyn
dd83652b71
Whoops, this broke my non-NEWCLIP test build
2018-11-10 16:10:25 +00:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
31301660cd
Merge branch 'master' into next
2018-11-10 14:27:27 +00:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
toaster
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
toaster
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
TehRealSalt
fa989f2f7f
Shorter Karma sticker
2018-11-10 01:03:34 -05:00
TehRealSalt
0f01e9513a
Use Silver for brake drift effect
2018-11-10 00:02:21 -05:00
TehRealSalt
571ef7173e
Ranking face highlights
2018-11-10 00:01:44 -05:00
TehRealSalt
60dcd3470b
Separate grow & invincibility alarms, donated by VAda
2018-11-09 21:47:36 -05:00
Monster Iestyn
4b8232d777
Merge branch 'master' into next
2018-11-09 23:18:14 +00:00
Alam Arias
1c22c6a1f9
Merge pull request #320 from monster-psychic-cat/remote_view_fixes
...
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
TehRealSalt
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
TehRealSalt
2f5e8ceee2
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-09 15:34:59 -05:00
toaster
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
Monster Iestyn
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
Monster Iestyn
17223aa520
Merge branch 'master' into next
2018-11-09 16:09:49 +00:00
Monster Iestyn
f974bb96ac
Merge branch 'music-clean' into 'master'
...
Some code cleanup.
See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05:00
TehRealSalt
6c5acd6e0d
A few mobj_scale fixes I missed on signposts
2018-11-08 20:39:18 -05:00
TehRealSalt
3ad8d1c4ce
Lap emblem gets replaced with a stopwatch in Record Attack
2018-11-08 19:36:05 -05:00
TehRealSalt
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
TehRealSalt
1e4d196e5e
Merge remote-tracking branch 'srb2public/next'
2018-11-08 17:37:05 -05:00
Monster Iestyn
98fd9f8e42
WHY DID I FORGET THIS
2018-11-08 21:22:45 +00:00
Monster Iestyn
82c738ea4b
Remove hasslope, per colette's warning about it potentially causing desyncs
2018-11-08 21:13:58 +00:00
TehRealSalt
0feb1d557d
Foolish typo
2018-11-08 16:04:26 -05:00
Monster Iestyn
d8f3a20e65
Merge branch 'Playerquit_hook' into 'next'
...
"PlayerQuit" Lua Hook
See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
Monster Iestyn
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
Monster Iestyn
91113cb79c
Merge branch 'master' into next
2018-11-08 20:50:58 +00:00
Monster Iestyn
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
TehRealSalt
11595a501a
Fix connecting w/ -splitscreen set
2018-11-08 15:24:10 -05:00
TehRealSalt
df3c6051e8
Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe
2018-11-08 15:11:22 -05:00
Monster Iestyn
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
TehRealSalt
03bf72bf9e
This fake Lua function is probably no longer needed, now.
2018-11-08 15:02:19 -05:00
TehRealSalt
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
TehRealSalt
ed1c108992
Merge branch 'master' into lua-improvement
2018-11-08 14:50:30 -05:00
TehRealSalt
94066638bc
Merge branch 'master' into lua-improvement
2018-11-08 14:49:56 -05:00
TehRealSalt
69287984db
Merge branch 'master' into staff_names
2018-11-08 14:47:38 -05:00
Sal
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
TehRealSalt
393fee317e
Fix for the Y_FollowIntermission change hurting Record Attack
...
Should probably be ported to vanilla
2018-11-08 14:43:06 -05:00
Monster Iestyn
fa80d61799
byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness
2018-11-08 17:16:54 +00:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
TehRealSalt
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
TehRealSalt
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
TehRealSalt
2b9b1e3bff
These are integers, whoops
2018-11-07 18:37:06 -05:00
TehRealSalt
95a1637437
Add Kart globals
2018-11-07 18:31:07 -05:00
TehRealSalt
b9161871a1
typo
2018-11-07 18:24:44 -05:00
TehRealSalt
7ad0347ab0
Add missing K_ functions
2018-11-07 18:23:28 -05:00
TehRealSalt
868118d0cd
IsPlayerAdmin support, since admin was removed
2018-11-07 18:07:34 -05:00
TehRealSalt
68c46cdca3
toptexture, bottomtexture, and midtexture use strings instead of magic numbers
2018-11-07 17:53:49 -05:00
toaster
c8c7b63be6
Fix disabling music on the menu.
2018-11-07 22:18:46 +00:00
toaster
e1d46e0122
Merge branch 'master' into 'lua-hudlib'
...
# Conflicts:
# src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
Monster Iestyn
c47f0045d6
ST_Ticker also should not have FUNCMATH, as it also has side effects
2018-11-07 21:45:27 +00:00
toaster
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
Monster Iestyn
b3e8a1ed88
HU_Start should not have FUNCMATH, it has side effects
2018-11-07 21:37:42 +00:00
Monster Iestyn
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
TehRealSalt
9a18b83c2a
Disable DEVELOP mode
2018-11-07 16:19:02 -05:00
TehRealSalt
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
Monster Iestyn
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
TehRealSalt
e63099f3de
Log this
2018-11-07 14:56:36 -05:00
Sal
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
toaster
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
GoldenTails
a3bc7ddfa0
Add Lua Ultimate Mode global variable so people can use it.
2018-11-06 18:09:45 -06:00
toaster
7866e88292
No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding.
2018-11-06 18:54:00 +00:00
toaster
390d2b4114
Fix replaying guest demos
2018-11-06 13:38:53 +00:00
toaster
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
toaster
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
toaster
e958dfc909
MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone.
2018-11-05 23:06:28 +00:00
MPC
1cc8619c9e
Minor remote viewpoint bugfixes.
2018-11-05 20:40:51 -02:00
toaster
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
toaster
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
toaster
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
toaster
7be7c600bf
Cleaner code logic. Should make no real difference to exe, so not gonna upload another.
2018-11-05 14:28:32 +00:00
toaster
0d0eaf5f99
Fix "laststaff" setting
2018-11-05 14:03:09 +00:00
toaster
a0c3283303
Merge branch 'master' into staff_names
2018-11-05 13:46:10 +00:00
toaster
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
toaster
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
toaster
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
toaster
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
toaster
3a53d6d3b9
Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot).
2018-11-04 21:48:47 +00:00
Sryder
6c0fae421c
Literally a single compiler warning.
2018-11-04 17:37:18 +00:00
toaster
b8446effe8
Correctly disable OGL-only menus/options in software.
2018-11-04 14:41:24 +00:00
toaster
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
TehRealSalt
34baa5ae74
Mixed up validity check...
2018-11-03 22:53:12 -04:00
toaster
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
TehRealSalt
d3944fe29b
Battle arrow fixes and cleanup
2018-11-03 17:45:38 -04:00
Latapostrophe
4cbc270b6d
Merge branch 'master' into lua-hudlib
2018-11-03 22:25:33 +01:00
Latapostrophe
e7f35307c9
Remove indents on #ifdefs and take K_drawInput in the hud_position check
2018-11-03 22:24:45 +01:00
toaster
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
Monster Iestyn
02b14959cc
Merge branch 'master' into next
2018-11-03 12:29:04 +00:00
Monster Iestyn
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
TehRealSalt
0d79cbdd27
Keep the old y offsets, though.
2018-11-03 03:38:41 -04:00
TehRealSalt
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
TehRealSalt
69faf1cbc7
Remove NOFOURPLAYER from Makefile
...
Seems that someone already removed it from the other code anyway...?
2018-11-03 03:21:08 -04:00
TehRealSalt
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
TehRealSalt
0eab0c5a14
Merge branch 'master' into update-version
2018-11-02 23:57:28 -04:00
TehRealSalt
9ae9e7ec3a
Check for valid source in A_JawzChase, change 1 target rule
2018-11-02 23:51:06 -04:00
Monster Iestyn
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
TehRealSalt
cb699c1770
fullbright points
2018-11-02 15:06:56 -04:00
TehRealSalt
6bb33b9d16
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-02 14:59:48 -04:00
TehRealSalt
ba67c7aa70
Fix for "became a spectator" text repeating
2018-11-02 14:59:26 -04:00
Sal
87dd8cd0ce
Merge branch 'all_hardcode' into 'master'
...
Truly all-hardcode
See merge request KartKrew/Kart!71
2018-11-02 14:54:09 -04:00
TehRealSalt
399bccd2c7
use gfx.kart
2018-11-02 14:52:08 -04:00
Monster Iestyn
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
TehRealSalt
8d5fb13111
wrong var fix
2018-11-02 14:01:29 -04:00
Monster Iestyn
f37a573834
Merge branch 'master' into next
2018-11-02 11:02:35 +00:00
Monster Iestyn
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
TehRealSalt
37893cc523
Merge branch 'master' into all_hardcode
2018-11-02 02:30:36 -04:00
TehRealSalt
1bdaad3f06
quick merge fix
2018-11-02 02:28:34 -04:00
TehRealSalt
5c1cc6e1df
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
TehRealSalt
667e636631
Use chars.kart
2018-11-02 01:22:52 -04:00
TehRealSalt
6fd0f3f0ba
Fix ghost rankings issue
2018-11-02 01:19:25 -04:00
TehRealSalt
89276b739f
Merge branch 'master' into chars_cleanup
2018-11-01 23:48:22 -04:00
TehRealSalt
950bca1217
Actually lets just do this now, like how its done below
2018-11-01 21:05:52 -04:00
TehRealSalt
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
TehRealSalt
67dd962fb9
Change out the hex used for hnext/hprev consistancy
2018-11-01 20:46:20 -04:00
TehRealSalt
e758e0f8fd
Merge branch 'master' into resync
2018-11-01 20:39:50 -04:00
TehRealSalt
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
TehRealSalt
0c2a5cf9d3
Merge branch 'master' into more-fixes
2018-11-01 18:10:53 -04:00
TehRealSalt
7e103be393
Change default brake color from Yellow to White
2018-11-01 17:37:59 -04:00
TehRealSalt
6a31959381
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
TehRealSalt
03d64cbced
Merge branch 'master' into brake-drift
2018-11-01 17:35:45 -04:00
TehRealSalt
deb51d1eb4
Merge branch 'master' into battle-visuals
2018-11-01 17:35:01 -04:00
TehRealSalt
a2da81243e
Double length of msg
2018-11-01 17:08:30 -04:00
TehRealSalt
43d72d72f9
Properly center this
2018-11-01 17:06:10 -04:00
TehRealSalt
7e9300c420
Lap hands touch-up
2018-11-01 16:15:25 -04:00
Steel Titanium
5a0cfc10f4
Update copyright info on some files
2018-11-01 14:47:19 -04:00
TehRealSalt
4cf9476510
First frame lasts longer
2018-11-01 13:44:09 -04:00
TehRealSalt
7891a11fba
Battle points are visible
2018-11-01 00:57:38 -04:00
TehRealSalt
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
TehRealSalt
6c557407d5
Added judging hands (if'd out)
2018-10-31 23:10:38 -04:00
TehRealSalt
4369917912
Fix offsets, add colormapping
2018-10-31 22:38:43 -04:00
TehRealSalt
ea4ca2eb1f
Brake drfit effect
2018-10-31 21:35:17 -04:00
toaster
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
Monster Iestyn
4dd5abf534
Merge branch 'master' into next
2018-10-31 23:10:57 +00:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
TehRealSalt
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
toaster
007ef084c6
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-31 16:19:50 +00:00
toaster
668acad8a7
Order of state enums was different to that of info table, so corrected.
2018-10-31 16:18:44 +00:00
Latapostrophe
1928dd86f1
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01:00
toaster
8370064706
Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
2018-10-31 15:19:39 +00:00
Latapostrophe
7a04fd1097
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01:00
TehRealSalt
80b8aefdb2
Nerfed squishing
...
After fixing flashing tics not being set properly, 2 seconds of being fully stopped and then another 1.5 seconds minimum of being unable to be hit just feels like an eternity :V
2018-10-31 05:35:06 -04:00
TehRealSalt
e76da7d5ca
No item usage while squished or respawning
2018-10-31 05:32:59 -04:00
TehRealSalt
54f71d3dbf
Use frameangle for rocket sneakers so they rotate around you when you spinout
2018-10-31 05:28:39 -04:00
TehRealSalt
6da700629f
Fix incorrect scale of player arrows in non-splitscreen
...
whoops
2018-10-31 04:55:00 -04:00
TehRealSalt
66a7adfc34
Push fakes away from other items
...
Prevents stupid item stacking in Battle (you can still do it with bananas, but THOSE are removable, and don't have a similar sprite)
2018-10-31 04:46:24 -04:00
TehRealSalt
cc5d248c90
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
TehRealSalt
20d86f01c7
Cancel pogo spring when bumping a wall
...
Prevents instances where you can use it to stick in one spot in Battle
2018-10-31 03:07:33 -04:00
TehRealSalt
db731209e5
Fix ENTER GAME option not working
2018-10-31 03:06:36 -04:00
TehRealSalt
69354856b7
"Joined with" kicks display in the chat instead of console
2018-10-31 02:46:16 -04:00
wolfy852
932f1f929a
SOC_CHAO hardcode
...
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
TehRealSalt
aea453f6f2
Set stats to what we want them to be for R2 anyway
...
(Eggman's will need updating in the wad)
2018-10-30 20:11:15 -04:00
toaster
26241d32ce
Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit.
...
Hopefully this solves our disconnect woes.
2018-10-30 23:01:17 +00:00
toaster
fe177975ca
Fix ping alignment.
2018-10-30 22:44:05 +00:00
TehRealSalt
f1ea725319
Clean up for player->mo resyncing
...
Make most of the order match the struct, make sure proper type conversions are used when needed
2018-10-30 18:20:56 -04:00
Latapostrophe
f2eea0b31a
I'm a genius and forgot to rename the stuff correctly
2018-10-30 23:10:56 +01:00
toaster
ad78c75430
Make the horizontal line at the bottom of the tab rankings use the duptweaks.
2018-10-30 22:09:04 +00:00
Latapostrophe
b6b19c8250
Removed some useless stuff
2018-10-30 23:08:58 +01:00
toaster
f36d58dd09
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
2018-10-30 22:08:17 +00:00
toaster
6c020aab2e
Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...)
2018-10-30 22:07:35 +00:00
Latapostrophe
6841458546
got rid of the settop as well
2018-10-30 22:51:05 +01:00
Latapostrophe
799d8d2749
remove gL check
2018-10-30 22:29:28 +01:00
TehRealSalt
f9d559b03c
Fuck it, add back in the old vars
...
If we want a smaller resync packet, let's actually remove these FOR REAL
2018-10-30 17:03:11 -04:00
TehRealSalt
7fbfed535b
Add hnext/hprev to consistancy, add marescore to resynchend
2018-10-30 16:24:27 -04:00
Latapostrophe
a0495142df
Small hud library additions
2018-10-30 19:40:59 +01:00
Latapostrophe
232a19edf4
A few additions to the hud library
2018-10-30 18:24:03 +01:00
Monster Iestyn
22e8dd1f9d
now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore
2018-10-30 14:22:21 +00:00
Monster Iestyn
2fa0896fd0
Fix an error I made in HWR_DrawFixedPatch
2018-10-30 13:44:01 +00:00
toaster
98f9d73ca8
No fucking wonder these weren't showing up, I set their duration to 1 tic instead of -1 tic
...
(The Volcanic Valley issue is because the most recent Volcanic Valley update in maps.kart lost all the Objectspecial flags from mapthing 2018)
2018-10-30 11:08:53 +00:00
TehRealSalt
48a400c347
Clean up resync pak
2018-10-30 01:23:21 -04:00
toaster
7f24836d00
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:47:34 +00:00
TehRealSalt
08144b96f1
Fix SMK RR thwomps casuing bounce-up
2018-10-29 17:45:59 -04:00
toaster
52523fc4b4
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:37:06 +00:00
toaster
f1a6e1e6cd
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
...
# Conflicts:
# src/info.c
# src/info.h
# src/p_mobj.c
2018-10-29 21:36:39 +00:00
LJSonik
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01:00
toaster
318d692c3c
Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!)
2018-10-29 14:43:21 +00:00
Monster Iestyn
b022ff02a5
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
2018-10-29 13:34:54 +00:00
Monster Iestyn
f8fd8f8ec5
HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields
2018-10-29 13:29:16 +00:00
Monster Iestyn
df9c3ef3cd
Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own
2018-10-29 12:36:09 +00:00
