mazmazz
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
Steel Titanium
95ed3fcf7e
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
mazmazz
894ee02f3f
Fix x64 build issue
2018-11-13 17:12:18 -05:00
Monster Iestyn
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
Monster Iestyn
0d38061db8
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
2018-11-13 18:13:51 +00:00
TehRealSalt
d09fd4b861
Carry over old explosion sfx flags
2018-11-13 01:09:36 -05:00
TehRealSalt
29c9448148
Fix clash sound flags not being carried over
2018-11-13 01:06:13 -05:00
TehRealSalt
b009bddd3b
Lowered volume of drift sparks, made local
2018-11-12 17:18:39 -05:00
TehRealSalt
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
Monster Iestyn
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
TehRealSalt
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
Monster Iestyn
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
TehRealSalt
d0f21ca415
Merge branch 'sfx-clean'
2018-11-12 04:26:02 -05:00
TehRealSalt
91ae26e213
Use S2 rips on the title screen
2018-11-11 19:22:15 -05:00
TehRealSalt
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
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
MPC
eb4a72440a
Render the skies correctly on splitscreen in OpenGL mode
2018-11-10 16:19:41 -03: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
MPC
ff642df1f2
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03: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
Steel Titanium
0f9611df76
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Steel Titanium
2f62a03f6c
Fix up 64-bit gme
2018-10-30 20:50:36 -04: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
Monster Iestyn
834a5e6b35
V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP
2018-10-29 12:06:22 +00:00
toaster
1e4207c1de
Merge branch 'master' into 'toast_pokes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-29 07:04:35 -04:00
toaster
e2399c1638
Fix Sonic's minimap icon not being properly initialised. (Experimenting with the online editor, since I'm low on time, but this is 100% correct and I'll make a new exe later.)
2018-10-29 06:57:45 -04:00
toaster
adcf5a9a4e
Merge branch 'master' into 'chars_cleanup'
...
# Conflicts:
# src/hu_stuff.c
2018-10-29 06:48:18 -04:00
Sal
07a31c20d6
Merge branch 'grow-shrink-fixes' into 'master'
...
Invincibility item & Shrink fixes
See merge request KartKrew/Kart!68
2018-10-29 05:32:20 -04:00
Sal
292a18804a
Merge branch 'splitscreen-tuneup' into 'master'
...
Splitscreen tuneup
See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -04:00
Sal
8dbb636b2f
Merge branch 'div-sounds' into 'master'
...
Divide sound with number of local players
See merge request KartKrew/Kart!66
2018-10-29 05:26:51 -04:00
TehRealSalt
f8d87c8f08
Preface with splitscreen checks
2018-10-29 05:26:17 -04:00
TehRealSalt
14fcda0eca
Make shadows more consistent on slopes for non-players
2018-10-29 05:21:47 -04:00
TehRealSalt
9f18164ad4
The motherload: all of my Lua is hardcoded
...
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
Louis-Antoine
3d0daf2202
Fix desynch when toggling analog mode or flipcam
...
Special thanks to Lat' for asking weird questions
2018-10-29 00:49:23 +01:00
TehRealSalt
9630e01616
Camera crash fixes
...
UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
2018-10-28 17:31:59 -04:00
TehRealSalt
b83286b532
Use k_itemtype as the additional check instead of pw_shield
2018-10-28 14:45:01 -04:00
TehRealSalt
9d6563fcf7
Fix kartspeed/kartweight writes
2018-10-28 14:43:58 -04:00
toaster
75efd3e2c5
Ping offset fixed even more
2018-10-28 18:06:21 +00:00
TehRealSalt
a23c62e60e
Move lap animation up slightly
...
(I'm not gonna remember to do this later either)
2018-10-28 13:52:25 -04:00
toaster
49e25abb60
fix ping drawing offset (this won't be in the exe I uploaded before I disappear for a bit)
2018-10-28 16:34:02 +00:00
toaster
fe00f34562
unused variable [screams]
2018-10-28 16:29:56 +00:00
toaster
a9b4a56d23
Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
...
* Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps.
* Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix).
* Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything.
* Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers.
* Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
TehRealSalt
a885f340ae
Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen
2018-10-28 01:50:27 -04:00
TehRealSalt
84c9dbfcce
Even better: base it off how much timer is left
...
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
2018-10-28 01:38:01 -04:00
TehRealSalt
67a8ee178d
More smoothly decide which invincibility music to use
...
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
2018-10-28 01:22:26 -04:00
TehRealSalt
b6d8c3ea7d
This didn't commit with for some reason...
2018-10-28 01:02:49 -04:00
TehRealSalt
93e989cf61
Fix invincibility item cap
...
It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)
2018-10-28 01:02:30 -04:00
TehRealSalt
5a719afbc1
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 00:58:49 -04:00
TehRealSalt
8d78ee7458
No more rescaling gfx for countdown/finish
2018-10-27 23:14:11 -04:00
TehRealSalt
e9515294e8
Show LOSE/COOL in splitscreen again
...
Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back
2018-10-27 22:43:57 -04:00
TehRealSalt
d0a50ae247
This bothers me, so I might as well do it while I'm in here.
2018-10-27 21:48:50 -04:00
TehRealSalt
dc5a738f7f
"if !splitscreen" instances that SHOULD be "if netgame"
2018-10-27 21:45:04 -04:00
TehRealSalt
f1f8f91aea
Higher default scale, WANTED indicator scales properly
2018-10-27 20:56:11 -04:00
TehRealSalt
339a857cba
Reduce camspeed in splitscreen
2018-10-27 20:44:05 -04:00
toaster
4c7f083d13
toaster: not good at stuff (signpost z offset fix)
2018-10-27 22:23:44 +01:00
toaster
e8410b2575
Fix and then subsequently disable the zoom tube angle setting stuff.
2018-10-27 22:05:15 +01:00
toaster
3d760271e3
Fix the issue with sliding I identified this morning.
...
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
2018-10-27 21:41:45 +01:00
toaster
119c9f34ae
Minor correction - Jeck initially got it wrong, but informed me after lots of testin's.
2018-10-27 21:30:41 +01:00
toaster
8b382d2e40
As requested by Jeck:
...
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.
Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 21:16:19 +01:00
toaster
68da56671e
Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect.
2018-10-27 20:44:18 +01:00
toaster
88b6e9e1bd
Minor things that annoyed me to NO GOOD END.
...
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
2018-10-27 20:43:33 +01:00
toaster
564cfb33b4
Fade stuff!
...
* Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable.
* Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.
2018-10-27 20:39:41 +01:00
Monster Iestyn
32077897b6
Removed all remaining traces of VID_X11 code in hw_drv.h and hw_data.h, the macro is no longer used by Linux etc versions of SRB2.
...
Unlike the rest of the commits in this branch (as of writing), I didn't make this commit between 1 and 2 years ago, I made it right now ;)
2018-10-27 19:58:51 +01:00
Monster Iestyn
aebcf3520b
Remove pointless drawtextured variable and redundant fake planes checks (R_FakeFlat would already have made gr_frontsector/backsector something else if they were)
2018-10-27 19:32:55 +01:00
Monster Iestyn
3d88ee9d55
Added missing checks in HWR_AddLine from the software version, move v** vars to the top since R_PointToAngle calls use the same values anyway
2018-10-27 19:31:24 +01:00
Monster Iestyn
09eecd36b4
Hack to make sure even (extra)subsectors without planepolys have segs adjusted
...
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
2018-10-27 19:29:45 +01:00
Monster Iestyn
90cfa5ef16
Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
...
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
2018-10-27 19:29:31 +01:00
Monster Iestyn
1cf2ce63c0
More optimising and otherwise fixing bizarre formatting in hw_trick.c
2018-10-27 18:58:05 +01:00
Monster Iestyn
2107aab666
Moved my added slope checks in hw_trick.c to isCeilingFloating/isFloorFloating
...
I also optimised those two functions while I was there (why keep a "floating" variable when setting it to false guarantees the functions return false?)
2018-10-27 18:57:28 +01:00
Monster Iestyn
787d5b598d
gr_correcttricks fix: don't check if top/bottom textures are missing for sloped sectors, just ignore and cancel the hack
...
This fixes GFZ2's mysterious flying flats at the ramp to the big room
2018-10-27 18:56:38 +01:00
Monster Iestyn
67a2922558
Ensure file is closed whenever MD2 reading errors happen
2018-10-27 18:53:38 +01:00
Monster Iestyn
b150e842fc
Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version
2018-10-27 18:53:18 +01:00
Monster Iestyn
29d8e34d03
Call V_DoPostProcessor only in software mode (it cancels itself in OGL anyway)
2018-10-27 18:52:34 +01:00
Monster Iestyn
9fb301ecb5
don't bother with inlining the function, on second thoughts
2018-10-27 16:47:56 +01:00
Monster Iestyn
bb3d850bbf
static the buffer, forgot to do this earlier
2018-10-27 16:27:00 +01:00
toaster
bd36816b39
dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident
2018-10-27 16:25:25 +01:00
Monster Iestyn
e4e76f83c3
Use temporary buffer with a max size of 255 bytes instead of having Microsoft's FormatMessageA alloc one for us. Also, provide a fallback message in case no message was available for some reason
2018-10-27 16:09:14 +01:00
Monster Iestyn
3b39a25ade
Save the result of errno (aka WSAGetLastError() for WinSock) as soon as possible, to prevent anything in SOCK_GetNodeAddress resetting the value to 0 while trying to print the message for the error itself!
2018-10-27 15:49:04 +01:00
toaster
d78368d4d2
Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else.
...
Requires charscleanup.kart. Ezo, if you want me to, I can fix up bonuschars for this tweaked system.
2018-10-27 15:43:33 +01:00
Monster Iestyn
ab38e6cebb
Creating a quick get_WSAErrorStr function to act as a wrapper for FormatMessageA so we can string-ify Winsock errors properly
...
Untested!
2018-10-27 15:36:15 +01:00
TehRealSalt
a8dfd45d9c
Merge branch 'master' into div-sounds
2018-10-26 01:15:10 -04:00
TehRealSalt
8058b77743
Combine spinout & wipeout timers
...
Turns out they were only 1 tic apart originally, sooo
2018-10-26 01:07:54 -04:00
TehRealSalt
6dd7718d6e
More consistent face-forward
...
Needs it to still land in a close ballpark, so the timer changes are still needed, but this makes it less prone to error
2018-10-26 01:07:14 -04:00
TehRealSalt
240d7a44c1
CRITICAL BUGFIX
...
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
2018-10-26 00:56:02 -04:00
TehRealSalt
27f118a06c
Adjust spinout times to face your forward about 90% of the time
2018-10-26 00:55:20 -04:00
TehRealSalt
555fbbe2f5
Speed up spinout based on timer left
2018-10-26 00:51:58 -04:00
TehRealSalt
146c8b228b
- Reduce volume reduction
...
- Don't apply to sounds without an origin mobj
2018-10-25 22:53:58 -04:00
toaster
4595328e6d
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
2018-10-25 19:09:22 +01:00
Sal
7f2090aeae
Merge branch 'karma-touchups' into 'master'
...
Karma touchups
See merge request KartKrew/Kart!59
2018-10-25 14:06:22 -04:00
Latapostrophe
b9c6210822
Reimplemented the splitscreen chat fix
2018-10-25 20:02:43 +02:00
Latapostrophe
20cfd80767
Fixed the menu highlight thing
2018-10-25 19:41:14 +02:00
Latapostrophe
e5d4020f3e
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
2018-10-25 13:21:44 +02:00
toaster
19a6bd948c
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
# src/p_enemy.c
# src/p_mobj.c
2018-10-25 10:46:18 +01:00
Latapostrophe
26093de2e9
Merge branch 'master' into chat-changes
2018-10-25 11:14:49 +02:00
TehRealSalt
aa00ca72e2
Fix merges
...
(Don't bother me hastily to merge something in again, please)
2018-10-24 21:51:43 -04:00
TehRealSalt
f2f03d03a7
Merge branch 'master' into fz-time-over
2018-10-24 21:39:02 -04:00
Sal
eef1ba3660
Merge branch 'lat-hardcode' into 'master'
...
Midnight Channel + Mementos hardcode
See merge request KartKrew/Kart!61
2018-10-24 21:26:02 -04:00
TehRealSalt
974f6d47e1
Fullbright explosion and fire
2018-10-24 21:25:22 -04:00
TehRealSalt
25414edb57
Merge branch 'master' into fz-time-over
2018-10-24 21:20:51 -04:00
TehRealSalt
224408210c
Extra safety
...
The turn action happens on (k_timeovercam > 2*TICRATE). This ensures it happens immediately, although it was probably fine as is
2018-10-24 21:18:15 -04:00
TehRealSalt
326955dd30
Turn cam on wall hit
2018-10-24 21:05:02 -04:00
Sal
8109890913
Merge branch 'explosion-spinout-fix' into 'master'
...
Explosion spinout fix
See merge request KartKrew/Kart!60
2018-10-24 20:18:34 -04:00
TehRealSalt
f3a61b43d7
Wrong variable
2018-10-24 19:38:46 -04:00
Latapostrophe
6e67aaa9cd
Resolved conflict
2018-10-25 01:35:55 +02:00
Sal
3e556cde44
Merge branch 'last-netgame-tweaks' into 'master'
...
Last netgame tweaks
See merge request KartKrew/Kart!57
2018-10-24 19:33:47 -04:00
Latapostrophe
474bebaad3
I'm an idiot and keep forgetting to hit trim trailing space.
2018-10-25 00:59:43 +02:00
Latapostrophe
a24507b2eb
Midnight Channel: warning sign hardcode
2018-10-25 00:58:59 +02:00
TehRealSalt
7ab6cefb99
Remove these
2018-10-24 18:14:25 -04:00
Latapostrophe
ac4a2f3d02
Reduced aggravating stationary Shadow range + fixed whitespace
2018-10-24 23:57:08 +02:00
Latapostrophe
77fd7704e8
Midnight Channel: HUD static effect hardcode
2018-10-24 23:55:12 +02:00
TehRealSalt
ac9e00a425
Karma point changes
...
- Number of points needed to come back is now 2.
- Bombs no longer give extra points.
2018-10-24 17:29:13 -04:00
TehRealSalt
43c6e25668
Update SPB hitbox too
...
Even more consistency!
2018-10-24 17:22:58 -04:00
TehRealSalt
0e4d5fd50e
Merge branch 'master' into karma-touchups
2018-10-24 17:21:34 -04:00
TehRealSalt
3dba084fd9
Give karma items their own hitbox size
...
Bombs & fakes get 24, items get 36. Technically a slight nerf to bomb, but it's more consistent and it's so tiny of a change that it'll be unnoticeable I feel :V
2018-10-24 17:16:32 -04:00
toaster
3d2efc751f
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
...
# Conflicts:
# src/info.c
# src/p_inter.c
2018-10-24 22:15:08 +01:00
toaster
03a4cca0b6
SPR_VAPE on S_VVVAPING1
2018-10-24 21:48:09 +01:00
Latapostrophe
0874e6bb8e
Reaper will repeat chain sound + 1 small targetting bugfix
2018-10-24 22:28:44 +02:00
Sal
08791269be
Merge branch 'new-spb' into 'master'
...
New SPB
See merge request KartKrew/Kart!56
2018-10-24 16:04:29 -04:00
Sal
65d9b05966
Merge branch 'battleoffline' into 'master'
...
Battle Offline
See merge request KartKrew/Kart!54
2018-10-24 16:01:58 -04:00
Sal
2a375e0f1c
Merge branch 'howdyalikethemcherries' into 'master'
...
How'd'ya like them cherries
See merge request KartKrew/Kart!53
2018-10-24 16:01:47 -04:00
Sal
d93a4106b6
Merge branch 'some_scaling_stuff' into 'master'
...
Two scale things I noticed.
See merge request KartKrew/Kart!51
2018-10-24 16:01:39 -04:00
Latapostrophe
553013ddbf
Reaper new anim + fast spawn for testing
2018-10-24 21:07:25 +02:00
TehRealSalt
b4fd249742
Partially revert Jawz x2 changes
...
Several races in a row with several people getting x2 Jawz in the same spot... sorry Oni, it's BAD. Kept the increase in the further behind spot, we'll see if it's any better
2018-10-23 21:13:14 -04:00
TehRealSalt
5ff1817c34
Divide sound volume by number of local players
2018-10-23 20:53:05 -04:00
TehRealSalt
9d7163675d
Remove the local dontdraw
...
Not only did I not implement this for everything, but I also REALLY like seeing other player's. If it's a problem, then let's just turn down the fuse and/or tics
2018-10-23 19:45:35 -04:00
TehRealSalt
39bfad150f
Fix camera movement when turning
2018-10-23 19:43:20 -04:00
TehRealSalt
0fcb45a9af
reset these too
2018-10-23 19:08:13 -04:00
TehRealSalt
78ef057f81
Reset cam pan if dead/reset/still
2018-10-23 19:06:26 -04:00
TehRealSalt
017d606828
fzboom.wad hardcode
2018-10-23 17:48:09 -04:00
toaster
2b968a5087
With the permission of Sev, SOC_SEV, SOC_SG, SOC_PEAC and SOC_DHST are now done.
2018-10-23 22:16:40 +01:00
toaster
75669a4b9b
SOC_COAT and SOC_SMOK.
...
To make the MT_PETSMOKER make vaping clouds for Volcanic Valley instead, apply MTF_OBJECTSPECIAL on the spawnpoint.
Since I had to compile, I ALSO discovered SOC_PALM's palmtree was already hardcoded as well!!!! Gosh dang inconsistencies...
2018-10-23 20:44:54 +01:00
toaster
86c4542a98
Remove all of the DKRBALLOON stuff I added from SOC_PALM, as the object already existed as MT_DOOD_BALLOON.
2018-10-23 17:47:15 +01:00
Latapostrophe
5224461184
another few whitepsaces i forgot from copypasting...
2018-10-23 18:35:42 +02:00
Latapostrophe
96877c22d3
I'm an idiot and COMPLETELY forgot about dehacked, also removed whitespaces
2018-10-23 18:31:34 +02:00
Latapostrophe
e8d424784c
Jack In The Box + Color Drive hardcode
2018-10-23 17:59:19 +02:00
toaster
2c06d55f46
SOC_XMAS (untested). Well, mostly. At least, all elements with sprites provided - there are two bushes that, weirdly enough, do not have their graphics provided in gfx.kart but ARE soc'd, and I feel like there's no point hardcoding that stuff..?
...
Also, I'm being cheeky and doing this in the middle of a lecture. :shitsfree:
2018-10-23 14:59:09 +01:00
TehRealSalt
ba6adc39a2
Spread out SPB odds
2018-10-22 22:29:30 -04:00
TehRealSalt
8cc24e61e5
New item odds to accomedate new SPB behavior
2018-10-22 21:09:37 -04:00
toaster
2426d4e348
SOC_PALM (untested)
2018-10-22 23:28:38 +01:00
TehRealSalt
7aa8b94b22
Cam follows faster in 2P
2018-10-22 17:48:21 -04:00
toaster
43bb6749fe
D2 Balloon Panic, plus minor, minor touchup to Rusty Rig lamp's light positioning. (Sorry, Drt.)
2018-10-22 22:36:04 +01:00
TehRealSalt
3dc02a4eb4
Minor mistakes on my part
2018-10-22 17:24:58 -04:00
TehRealSalt
cdbe5fa34f
Fix Thunder Shield not killing SPBs
2018-10-22 17:08:34 -04:00
TehRealSalt
7407c9a8dc
Don't destroy all of your balloons in 3 tics
2018-10-22 17:05:44 -04:00
TehRealSalt
685ccf53cc
Remove restart audio system from the menu
...
Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
2018-10-22 17:03:02 -04:00
toaster
ffa9289cc6
Rusty Rig plus minor touchups to what I did already (I haven't made a new exe this stuff is simple enough, and I'll test it when I do the balloon panic stuff)
2018-10-22 21:56:14 +01:00
TehRealSalt
40b9644e0c
Use COM_ImmedExecute("restartaudio") instead of duplicated code
2018-10-22 16:32:06 -04:00
TehRealSalt
a1da768a87
Keep specator join request on respawn
2018-10-22 16:26:24 -04:00
TehRealSalt
3ec228d34f
No more cheesing Shrink by dying
...
(If that was kept, we'd see it exploited all the time on release :V)
2018-10-22 16:22:41 -04:00
TehRealSalt
ebb0733a3c
Fix camera not noclipping FOFs
2018-10-22 16:16:57 -04:00
TehRealSalt
89887ccf0d
Modify distx/disty to ensure it never goes too low
2018-10-22 16:08:46 -04:00
TehRealSalt
9cd47643df
Falling rocks only collide with players and other rocks
2018-10-22 15:08:04 -04:00
TehRealSalt
9e4937d07f
Don't f12 time over'd players
2018-10-22 15:06:07 -04:00
toaster
dceab0ce70
Hardcoding start! toast's stuff specifically.
...
* Marble Zone!
* Torch decoration.
* Incense burner decoration.
* CD Special Stage 1!
* The UFO, now with improved death animation!
* Turns out I duplicated sounds that already existed in sounds.kart. When we touch up the files later, yalls can remove both `DSFUFOx`'s from it.
2018-10-22 00:34:47 +01:00
toaster
3a87596fbe
Initial commit, revert this before merging the branch: Make it so it uses a seperate copy of gfx.kart with the Lua lumps hardcoded taken out, for easier work without conflict.
2018-10-22 00:29:17 +01:00
Monster Iestyn
e95b54e64f
missed this ESLOPE-needed area from a few commits ago apparently :V
2018-10-21 20:35:14 +01:00
Monster Iestyn
772004d3fd
Fix editing slope xydirection with Lua
2018-10-21 18:25:13 +01:00
Monster Iestyn
3ec8743c1b
Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing)
2018-10-21 17:32:53 +01:00
Monster Iestyn
e15ed742c1
add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved
2018-10-21 16:27:54 +01:00
Monster Iestyn
bd0c187e68
Merge branch 'next' into lua-slopes
2018-10-21 16:03:48 +01:00
Monster Iestyn
10f9403619
Merge branch 'master' into next
2018-10-21 15:39:30 +01:00
Monster Iestyn
87afae9cf5
Fix unarchiving of mapheader_t userdata Lua variables
2018-10-21 15:15:54 +01:00
Monster Iestyn
efff869e6e
Add mobj.standingslope to Lua
2018-10-21 15:12:51 +01:00
Monster Iestyn
2ec4f2024f
Added support for pslope_t userdata variables in Lua archive/unarchive code
2018-10-21 15:00:07 +01:00
Latapostrophe
e695eba570
Console color default changed to Black + resolved mergeconflict hopefully
2018-10-21 14:58:50 +02:00
Latapostrophe
db60bdd49d
Merge branch 'chat-changes' of git.magicalgirl.moe:KartKrew/Kart into chat-changes
2018-10-21 14:53:22 +02:00
Latapostrophe
10d8105a52
Console background color default changed to Black + Resolved merge conflict (hopefully)
2018-10-21 14:51:34 +02:00
toaster
791dc079ec
Merge branch 'master' into 'chat-changes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Latapostrophe
e2394d47a1
More messages in chatbox + new console backcolours
2018-10-21 14:09:25 +02:00
toaster
cbb1a0dd28
Fix gametype being clobbered when starting up a one-player server by marking it as netgame.
...
(There were other ways to fix this, but I figured we'd want to keep the netgame pause menu, so this was the simplest solution...)
2018-10-21 12:51:18 +01:00
Latapostrophe
1bd7959b20
ReaperThinker: Changed the conditions in the th iterations and moved that i=0 at the start of the loop.
2018-10-21 10:05:05 +02:00
TehRealSalt
04212cc506
Karma SPB instead of confusing Mine gfx
2018-10-20 21:02:25 -04:00
Monster Iestyn
9296aaa28c
zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it
2018-10-20 23:36:06 +01:00
toaster
e193353c08
There's no spike or moon, but there sure is fruit, and that fruit is slightly awkward in that it pops out of existence when it slows down!
...
Instead, I've made it flicker out of existence on a second-long timer.
This is the *absolute* last in-game thing I'm doing before the original freeze deadline. Hardcoding and menu pokes are all that remain of my code development...
2018-10-20 23:32:38 +01:00
Monster Iestyn
4edeeb6953
Add P_GetZAt to Lua
2018-10-20 21:08:59 +01:00
Latapostrophe
39d24f2319
Mementos hardcode
2018-10-20 21:17:13 +02:00
TehRealSalt
e02a86ceae
Finish visuals
...
Sprites, animation, & speed lines
2018-10-20 14:41:49 -04:00
Monster Iestyn
61fa7026a1
add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal
2018-10-20 19:00:37 +01:00
Monster Iestyn
7d4e27937d
Merge branch 'next' into lua-slopes
...
# Conflicts:
# src/lua_maplib.c
2018-10-20 18:31:06 +01:00
Latapostrophe
4db656db1a
Midnight Channel hardcode
2018-10-20 16:10:40 +02:00
Monster Iestyn
d57c54f93b
Merge branch 'master' into next
2018-10-20 14:13:13 +01:00
mazmazz
cc0d1db9d8
Merge remote-tracking branch 'steeltitanium/music-clean' into test-public-music-cleanup
2018-10-19 23:56:56 -04:00
mazmazz
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
TehRealSalt
2021897972
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
Monster Iestyn
29b242a5bd
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
toaster
1f15d87b68
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 21:53:02 +01:00
toaster
fc86c87465
Two scale things I noticed.
...
* Change spacing of bustable FOF debris with scale (plus increase its default a bit for less lag).
* Make a few instances of scalespeed take mapheader scaling into account.
2018-10-19 21:32:29 +01:00
TehRealSalt
553066b48b
Merge branch 'master' into net-screen
2018-10-19 15:59:13 -04:00
Sal
27a4cbd52d
Merge branch 'specs_of_dust' into 'master'
...
Specs of dust
See merge request KartKrew/Kart!50
2018-10-19 15:50:58 -04:00
Sal
22aa01b35e
Merge branch 'thundertweak' into 'master'
...
Thundertweak
See merge request KartKrew/Kart!49
2018-10-19 15:50:47 -04:00
Sal
9a818ae7fb
Merge branch 'you_can_sometimes_have_too_many_rings' into 'master'
...
You can sometimes have too many rings
See merge request KartKrew/Kart!47
2018-10-19 15:50:37 -04:00
Sal
734b7008c4
Merge branch 'democam' into 'master'
...
If I were a bad Democam, I wouldn't be sittin' here discussin' it with ya now would I?!
See merge request KartKrew/Kart!48
2018-10-19 15:50:28 -04:00
Sal
4994e9749f
Merge branch 'no-spectate-griefing' into 'master'
...
Prevent spectate griefing
See merge request KartKrew/Kart!43
2018-10-19 15:50:18 -04:00
Sal
adb2fad43c
Merge branch 'sp_fixes' into 'master'
...
Singleplayer fixes (no, not record attack, the *other* one)
See merge request KartKrew/Kart!46
2018-10-19 15:50:06 -04:00
Sal
ab4bf563e0
Merge branch 'sweet-new-kicks' into 'master'
...
Sweet new kicks
See merge request KartKrew/Kart!39
2018-10-19 15:49:51 -04:00
Sal
d6cf424aed
Merge branch 'unlock-hard' into 'master'
...
Hard Mode is an unlockable
See merge request KartKrew/Kart!40
2018-10-19 15:49:32 -04:00
Sal
524ab75a6a
Merge branch 'remove-prints' into 'master'
...
Remove most gameplay prints
See merge request KartKrew/Kart!42
2018-10-19 15:49:01 -04:00
TehRealSalt
8366defae1
Slows down in the air
2018-10-19 14:02:55 -04:00
TehRealSalt
8ab8df6789
Completely stop when there's no targets possible
...
(if'd out self-destruct code too)
2018-10-19 02:37:45 -04:00
TehRealSalt
f8fc6862b5
SPB knockback is more punishing
...
Hopefully to prevent instances like the Megablock video, where SPB double-dips just because the 1st one wasn't enough but another is overkill
2018-10-18 20:49:30 -04:00
TehRealSalt
7556cca505
Huge restructuring & more fine-tuned speed, following, & turn behavior
2018-10-18 19:51:36 -04:00
toaster
9db5e6a330
A bunch of spectator-joining-round tweaks.
...
* Re-enable the flashing-set thing on attempting to join with the item key. I spoke to Sal privately about this - turns out some keys ALWAYS send key presses instead of only sending one, and shift - what I have item bound to - is one of the problematic ones.
* Make the no-joining-game-after-20-seconds thing happen 20 seconds after the TIMER has started, not the level (ie, take starttime into account)
2018-10-18 18:13:00 +01:00
toaster
3c4cd4e51c
Fix indentation.
2018-10-18 16:18:54 +01:00
toaster
b03ae92253
Play the traditional thundershield manifestation sound when a thundershield is manifested, plus a minor eye towards forward compatibility in the condition for manifestation.
2018-10-18 16:15:59 +01:00
TehRealSalt
8d6e203bd2
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
TehRealSalt
36595b06af
Merge branch 'master' into update-version
2018-10-17 20:31:56 -04:00
TehRealSalt
39ca58d0a4
Add more hash stuff
...
UNFINISHED, still need to add in legitimate hashes for non-CMake builds when we've finalized the content.
2018-10-17 20:30:34 -04:00
TehRealSalt
c8cd84ca34
No more vanilla democam, for real
2018-10-17 19:10:23 -04:00
TehRealSalt
9f05e14c99
Merge branch 'master' into democam
2018-10-17 18:17:42 -04:00
toaster
9ab5a74b00
Disable rings, NiGHTS wing-emblems, special placement patterns, and team rings.
...
Also, tweak the hoop spawning routine to correctly P_SetTarget the hnexts and hprevs, since I'm mucking around in there.
2018-10-17 19:27:45 +01:00
TehRealSalt
1ca823f981
<
2018-10-17 13:38:31 -04:00
toaster
ce443712b2
Some token efforts to make singleplayer mode (accessible only via -warp
and map mapxx -force
) not COMPLETELY broken.
...
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 13:40:17 +01:00
TehRealSalt
7f4228c37b
Merge branch 'master' into net-screen
2018-10-16 21:40:06 -04:00
TehRealSalt
5a1e40f987
Quick fix for attack/protect being too big
2018-10-16 21:39:39 -04:00
TehRealSalt
9047780e29
Prevent point grief
...
(Needs tested)
2018-10-16 20:56:04 -04:00
toaster
41b684e63e
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen
2018-10-16 22:13:45 +01:00
toaster
b34cbe4032
[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it
...
The Menu Queen is in the house~ ✨
* Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional.
* Death to NOFOURPLAYER, now that the cat's out the bag.
* Clean up NONET, assuming people try to make DD builds on release.
* Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 22:11:47 +01:00
TehRealSalt
c9b0786a3b
Merge branch 'master' into fix-nextlevel
2018-10-16 17:05:47 -04:00
TehRealSalt
362cbeb6b5
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00
Sal
bcc1911672
Merge branch 'nextmerge_plus_rain' into 'master'
...
Next-merge plus rain
See merge request KartKrew/Kart!41
2018-10-16 16:36:18 -04:00
TehRealSalt
a919260fd2
Default sound channels
...
Now that we figured out that the sound cut-outs were due to a race condition and not this option, I feel content putting it with these other engine tweaks.
2018-10-16 13:26:03 -04:00
TehRealSalt
b23a798978
1 minor, non-engine related change I wanted to make while I was at it:
...
Minor priority change to two voice lines; the "passing someone" line has the same priority as every other line, and gave it's boosted priority to the way more gameplay-important "hit 'em" line.
2018-10-16 12:48:46 -04:00
TehRealSalt
5701fe8a51
Give engines SF_TOTALLYSINGLE, and bug-fix it so that it can work like a flag
...
Sryder's request
2018-10-16 12:30:47 -04:00
TehRealSalt
35528276d2
Optimize
2018-10-16 12:25:51 -04:00
TehRealSalt
e24cbb2c86
== --> >=
2018-10-16 12:23:05 -04:00
TehRealSalt
496e0df9d0
Smoother
...
NOW this is good enough to ship
2018-10-15 23:13:59 -04:00
TehRealSalt
8024ad74b5
Quick fix for banana cheat not showing all unlockables
...
Plus, this is generally better, as a mod could let you unlock stuff "out-of-order"
2018-10-15 22:02:10 -04:00
TehRealSalt
bca6e9165b
Merge branch 'master' into net-screen
2018-10-15 21:57:11 -04:00
TehRealSalt
32f3088e01
Minor whitespace
2018-10-15 20:34:53 -04:00
TehRealSalt
ec048b73c4
Show Spectator controls for P2-P3 again
2018-10-15 20:31:26 -04:00
TehRealSalt
ba16f2bfcf
Spectate/Enter menu for online splitscreen
...
Just like the menu option
2018-10-15 20:28:35 -04:00
TehRealSalt
d158b3848e
Fix the earlier attempt at patching over this
2018-10-15 19:05:23 -04:00
TehRealSalt
01c48c88d0
Prevent spectate griefing
...
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 18:41:34 -04:00
TehRealSalt
d89fb8fcf7
remove all hit msgs & cv_hazardlog
2018-10-15 17:40:25 -04:00
toaster
6098a36bfe
More sensible drawdist_precip_cons_t
maximum (slightly more conservative than Sryder's suggestion)
2018-10-14 23:13:11 +01:00
TehRealSalt
b81da3f000
restore
2018-10-14 17:54:18 -04:00
TehRealSalt
e23da397e4
Remove most gameplay prints
...
A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 17:45:28 -04:00
toaster
880e4c0631
Final weather stuff.
...
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
2018-10-14 22:32:34 +01:00
toaster
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
Monster Iestyn
fe2af34ee5
Merge branch 'master' into next
2018-10-14 20:49:35 +01:00
Monster Iestyn
423403eab5
Merge branch 'sound-handle-fix' into 'master'
...
Handle fix for SDL Mixer
See merge request STJr/SRB2!301
2018-10-14 15:46:25 -04:00
Monster Iestyn
b720cb10dc
Merge branch 'pris_accurate-gif-delay' into 'master'
...
More accurate GIF delay
See merge request STJr/SRB2!276
2018-10-14 15:44:33 -04:00
Sryder
3886888b30
Fix missing commas and missed interface
2018-10-14 10:14:07 +01:00
toaster
b01643e043
Fix to itembar visual length problem
2018-10-13 23:38:29 +01:00
Sryder
6184f91dd3
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
TehRealSalt
001e2aa42c
Hard Mode is an unlockable
...
Unlocks at 30 emblems, or 100 matches played
2018-10-13 17:54:53 -04:00
TehRealSalt
c4d1b80e97
Engine tweak
2018-10-13 17:07:30 -04:00
Monster Iestyn
80cbad61c0
Do lightlist height stepping *after* the heights are used by the FOF rendering code, not before (yes, I caught that they remove a heightstep beforehand for FOFs, but that wasn't done for midtextures it seems?)
...
Additionally add some macros for repeated slope end assignments and overflow tests
2018-10-13 18:57:40 +01:00
Monster Iestyn
bedfed2f00
Move shared code here instead of duplicating it for both dc_numlights and non-dc_numlights rendering code
...
Also added a few comments, and include the out of range check in the "shared code" above
2018-10-13 15:37:11 +01:00
Steel Titanium
450b536147
Remove the condition in restartaudio command.
...
No longer needed as S_RegisterSoundStuff will return early if in
dedicated mode.
2018-10-11 20:11:37 -04:00
Steel Titanium
b3faed190b
Move commands and console variable into s_sound.c
2018-10-11 16:29:43 -04:00
Monster Iestyn
feceaf6d30
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
...
Only real difference here is that CEcho messages will always be cleared when going to credits/evaluation, but that's hardly a loss tbh.
2018-10-11 21:25:15 +01:00
Monster Iestyn
2bb7df5f49
G_ExitLevel tweak: Use HU_ClearCEcho() instead of HU_DoCEcho(""), the latter causes an empty line to appear in log.txt
2018-10-11 21:25:04 +01:00
Monster Iestyn
31f3f8b8e7
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00