vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4069 commits 50 branches 7 tags 75 MiB
Commit graph

3452 commits

Author SHA1 Message Date
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 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 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
Monster Iestyn c1d5c711a9 Be gone ye old texture hack 2018-10-11 21:08:25 +01:00
Latapostrophe 49f2c62b5d More stuff goes in HU_AddChatText, fixed /pm list not having the correct coords if kartspeedometer was on. 2018-10-11 21:39:19 +02:00
Monster Iestyn 9c464742b7 Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now 
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
 2018-10-11 20:00:45 +01:00
Monster Iestyn ef78c942f7 Remove unused ObjectPlace_OnChange prototype (from when Objectplace was a consvar, which it is not anymore) 2018-10-11 20:00:34 +01:00
Monster Iestyn 49c5a6f7e4 Remove unused "runcount" variable from p_local.h 2018-10-11 20:00:23 +01:00
Monster Iestyn 91b2f5e570 "t" is not needed to take out fencepost cases from viewangletox 2018-10-11 20:00:05 +01:00
Monster Iestyn 07dd527e7e Removed unused function prototypes in d_main.h 
Also corrected what appears to be a typo in some comments above?
 2018-10-11 19:59:47 +01:00
Monster Iestyn 61a29bed85 Remove unused sscount variable 
(it's only set to 0 in software, and only ++'d in OpenGL, what kind of sense does that make?)
 2018-10-11 19:59:26 +01:00
Monster Iestyn a4419abfdc debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else 2018-10-11 19:59:09 +01:00
Monster Iestyn 38ec0cc50a These convar externs aren't moving files, I'm just shifting them up to live with their relatives 2018-10-11 19:39:28 +01:00
Monster Iestyn 0ad0f8afc4 Move analog consvars to g_game.h 2018-10-11 19:39:11 +01:00
Monster Iestyn 933508db89 Moved screenshot/movie consvar externs to m_misc.h 2018-10-11 19:38:11 +01:00
Monster Iestyn e2a4c59e21 cv_controlperkey probably belongs in g_input.h too 2018-10-11 19:37:48 +01:00
Monster Iestyn 4b7af892e1 Moved most of d_netcmd.h's 2P mouse consvar externs to the files with their 1P counterparts 2018-10-11 19:37:24 +01:00
Monster Iestyn 72ab305bf4 Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8 2018-10-11 17:05:23 +01:00
Monster Iestyn b9b0a8110c Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency 
...that was a mouthful
 2018-10-11 17:05:13 +01:00
TehRealSalt 005bb7a5e0 para 2018-10-10 17:46:23 -04:00
TehRealSalt da68d40760 Removed bumping 
K_KartBouncing is so flaky, I have no idea why it refuses to work.
 2018-10-10 17:31:09 -04:00
Latapostrophe 346c6bce96 HU_AddChatText cleanup for future use + chat mode Window (Hidden) added. 2018-10-10 21:24:55 +02:00
TehRealSalt 8379bd3d31 Last batch of tweaks 
- Rocket sneaker meter depletes more slowly when idle, but depletes much more when using it. This balances out to give it a couple more boosts when you use it well, but allows you to waste it more quickly when you don't want it anymore. Also demonstrates better to new players to not spam it like a gold shroom!
 - Vibrating frames on sneakers when they aren't being used.
 - Shoe weight is less strong.
 2018-10-10 14:56:50 -04:00
TehRealSalt 0d56f68abc Merge branch 'master' into sweet-new-kicks 2018-10-10 13:43:05 -04:00
toaster 6a0b1526b9 Merge branch 'hellattack' into 'master' 
Hell Attack

See merge request KartKrew/Kart!35
 2018-10-10 13:33:57 -04:00
TehRealSalt cf4adbd318 Merge branch 'master' into net-screen 2018-10-09 21:16:16 -04:00
TehRealSalt 4364caa4ea Merge branch 'master' into net-screen 2018-10-09 21:15:30 -04:00
Sal 2fc3195448 Merge branch 'new-engines' into 'master' 
New engine sounds by VAda

See merge request KartKrew/Kart!38
 2018-10-09 21:12:05 -04:00
TehRealSalt 5435737258 Some code cleanup & minor adjustments 2018-10-09 21:11:00 -04:00
TehRealSalt 94c92c2262 x2 distance, fix priority 2018-10-09 18:04:25 -04:00
toaster 52dc945804 4 -> 5 2018-10-09 23:02:21 +01:00
Monster Iestyn 8196c59557 Merge branch 'master' into next 2018-10-09 22:55:55 +01:00
toaster e248cf9421 Sal's request 2018-10-09 22:44:43 +01:00
toaster a8a1f1b444 Spawn a poof if you get hit while karmegg. 
(I've moved the comebacktimer set into one level up from that conditional; don't worry, I checked - there's nowhere that accesses this field while you have bumpers, it's just always set here for some dastardly reason.)
 2018-10-09 22:40:42 +01:00
toaster 66d00b7cc6 HitEm sound for K_ExplodePlayer 2018-10-09 22:24:44 +01:00
toaster 83bfca8009 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg 2018-10-09 21:09:52 +01:00
toaster 76eebe6cf7 If you hit a one-bumper person with a karma fake, you get to come back immediately! 2018-10-09 21:09:39 +01:00
TehRealSalt 7900af2a0a Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt 431ccce0e4 Merge branch 'master' into new-engines 2018-10-09 15:35:50 -04:00
TehRealSalt 8836cdeeee Merge branch 'master' into new-engines 2018-10-09 15:34:26 -04:00
Sal b349063431 Merge branch 'sal-cleanup' into 'master' 
Sal cleanup

See merge request KartKrew/Kart!23
 2018-10-09 15:33:52 -04:00
TehRealSalt aa12bbf039 Fix tabbing 2018-10-09 15:28:52 -04:00
Monster Iestyn c469fc242f Merge branch 'movechasecamera-crashfix' into 'next' 
Fix for Chicmunk's weird camera related crash

See merge request STJr/SRB2!284
 2018-10-09 15:20:06 -04:00
Sryder 497314fdc4 Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close. 
No memory leak here, just a very tiny thing I noticed.
 2018-10-09 19:43:18 +01:00
TehRealSalt 8132dd6be5 Merge branch 'master' into net-screen 2018-10-09 14:41:59 -04:00
Sryder 44726e1db7 Merge branch 'fix-mixed-declarations' into 'master' 
Fix the mixed declaration and code warnings

See merge request KartKrew/Kart!37
 2018-10-09 14:09:33 -04:00
TehRealSalt 5811ff521c Many adjustments 
- Volume of your own engine is lower than default
 - Engine sounds get quieter with more people around, ala SMK. 16 player servers should hopefully not be loud as fuck :V
 - Starting countdown and drop dash revs up your engine now
 - Doubled sound distance
 2018-10-09 14:07:05 -04:00
TehRealSalt 3a1d58ceb6 Reduce update frequency to match the sfx length better 2018-10-08 22:35:17 -04:00
TehRealSalt bb3d01495a New engine sounds 
9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
 2018-10-08 21:31:55 -04:00
TehRealSalt a6a229dea8 boostcam scales based on previous boost 2018-10-08 16:20:30 -04:00
TehRealSalt a41cddc94a use cvar mins 2018-10-08 14:49:48 -04:00
TehRealSalt 7838a29f3d Scale chat in splitscreen 
Only covers things on P1's screen now
 2018-10-08 14:38:29 -04:00
TehRealSalt 1807466474 Simpler loop 2018-10-08 13:58:16 -04:00
toaster 1324e0bfcd * Fix a memory leak regarding implementation of SOC_ (improperly copypasted code from LUA_LoadLump!!) 
* Optimise the repeated strlen usage into a single call, which is stored for later.
 2018-10-08 18:50:17 +01:00
Monster Iestyn 12e0222929 Merge branch 'drwhoandthesleepingweather' into 'master' 
Dr. Who And The Sleeping Weather

See merge request STJr/SRB2!288
 2018-10-08 09:36:18 -04:00
Monster Iestyn 1049f3451a Merge branch 'sp-savegame-continue-crash-fix' into 'master' 
SP savegame continues icon crash

See merge request STJr/SRB2!290
 2018-10-08 09:20:45 -04:00
Monster Iestyn 1115f41f8e Merge branch 'zlib-split' into 'master' 
Makefile: Split zlib and libpng

See merge request STJr/SRB2!285
 2018-10-08 07:20:27 -04:00
TehRealSalt 640e0e09c6 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
TehRealSalt 9e51c10337 Fix Hyudoro arrows being visible 2018-10-08 00:16:27 -04:00
TehRealSalt 3101eb1a18 Don't let chat/console eat inputs from anyone besides player 1 2018-10-08 00:14:29 -04:00
TehRealSalt 42766db48c Merge branch 'master' into net-screen 2018-10-07 23:26:56 -04:00
Sal 36696b1fbb Merge branch 'noclip-cam' into 'master' 
Noclip cam

See merge request KartKrew/Kart!32
 2018-10-07 23:15:06 -04:00
Sal b8d86bb096 Merge branch 'thinkerclean' into 'master' 
Nuke a bunch of iteration things that have no purpose in SRB2Kart.

See merge request KartKrew/Kart!25
 2018-10-07 23:14:53 -04:00
TehRealSalt e5183523a5 Merge branch 'master' into net-screen 2018-10-07 18:54:22 -04:00
TehRealSalt 842430dbdb Rocket Sneakers appear beside you 2018-10-07 18:53:46 -04:00
Steel Titanium 027e6e8e3c Change win_snd.c also 2018-10-07 15:00:48 -04:00
Steel Titanium 232a7ae7b7 Change order of the ifdef 2018-10-07 14:52:25 -04:00
Steel Titanium def090c9f0 Move the ifdef 2018-10-07 14:45:03 -04:00
Sryder e4f2a3d7b6 Merge branch 'skill-option' into 'master' 
-skill launcher option

See merge request KartKrew/Kart!34
 2018-10-07 12:25:06 -04:00
Sryder d3e489e986 Fix the mixed declaration and code warnings that only don't appear currently because of a tiny Makefile issue. 2018-10-07 15:35:54 +01:00
toaster 42307c0ea0 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into karmegg 
# Conflicts:
#	src/p_inter.c
 2018-10-07 15:17:31 +01:00
toaster b1e02467bf Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more! 2018-10-07 15:00:58 +01:00
Sryder eebde386cf Merge branch 'frameperfectegg' into 'master' 
Frame Perfect Egg

See merge request KartKrew/Kart!31
 2018-10-07 09:39:45 -04:00
Sryder 64ceed280a Merge branch 'colors' into 'master' 
Edit Pink, Navy, and Jet, add brown text

See merge request KartKrew/Kart!28
 2018-10-07 09:39:22 -04:00
Sryder da4853f4d5 Merge branch 'droptweaks' into 'master' 
Droptweaks

See merge request KartKrew/Kart!27
 2018-10-07 09:37:02 -04:00
toaster 2f061a531a Karma Eggman. Does what it says on the egg. Tried very hard not to merge conflict with frameperfectegg. 
Also includes some adjustments to:
* Horizontal offset of Eggman countdown in splitscreen again. It's not perfectly centered either way, but on second thought I like this better.
* Sound of Lat`'s Mine/SPB explosions - now uses same sound as Karma bombing, instead of that shitty paraloop.
* Correctly wipe k_eggmanblame when it is appropriate to do so.
 2018-10-07 11:40:06 +01:00
Sryder fb6c329870 Fix the crashing bug hopefully 
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
 2018-10-07 10:37:45 +01:00
Sryder 02597e0bf9 Fix compiler warnings. 2018-10-07 09:26:18 +01:00
TehRealSalt 8ba3f88553 Don't need thissec 2018-10-06 23:37:27 -04:00
TehRealSalt ff7b402dc5 OGL support 2018-10-06 19:25:59 -04:00
Sryder d072dd2725 I think that should be NULL, not 0 actually. 2018-10-07 00:22:23 +01:00
Sryder 7b417b573c Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound. 
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
 2018-10-07 00:15:42 +01:00