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

4157 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sal
6997db11e1 Merge branch 'chat-changes' into 'master' 
New chat mode (Window Hidden) + Player join/leave/rename messages in chat + new console backcolours for console & chat

See merge request KartKrew/Kart!55
 2018-10-25 14:06:11 -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
Sal
af4e4f3fe4 Merge branch 'fz-time-over' into 'master' 
F-Zero time over hardcode

See merge request KartKrew/Kart!62
 2018-10-24 21:40:07 -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