stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-30 14:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
3795 commits 60 branches 11 tags 94 MiB
Commit graph

3194 commits

Author SHA1 Message Date
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
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
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
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
TehRealSalt
7aa8b94b22 Cam follows faster in 2P 2018-10-22 17:48:21 -04: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
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
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
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
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
Latapostrophe
4db656db1a Midnight Channel hardcode 2018-10-20 16:10:40 +02:00
TehRealSalt
2021897972 Merge branch 'master' into new-spb 2018-10-19 17:45:06 -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
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