Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
d2172fc54b
Bot amount & difficulty is now controlled by cvars
2020-05-07 02:37:06 -04:00
Sally Coolatta
cb12d1ebf8
Merge branch 'master' into pet-robo
2020-05-03 21:30:40 -04:00
James R
2e963a46f5
For fun, let the bots vote
2020-04-02 14:16:29 -07:00
James R
1243d0940a
Merge remote-tracking branch 'origin/master' into more-debug
2020-03-31 16:44:04 -07:00
Sally Cochenour
e5ae9d1513
Merge branch 'master' into pet-robo
2020-03-28 08:43:40 -04:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -04:00
Sally Cochenour
751fd9ad1b
Start on bots, doesn't work
2020-03-27 23:51:49 -04:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
7f1d55421a
Merge branch 'master' into new-items
2020-03-22 14:23:51 -04:00
Sryder
da2f1fc972
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2020-03-21 23:27:55 +00:00
James R
c3b967468a
Revert "Remove kartdebugitem"
...
This reverts commit 803884c55a
2020-03-21 15:56:40 -07:00
James R
4a973e2906
Revert "...Also remove kartdebugamount"
...
This reverts commit 22cb7451e9
2020-03-21 15:56:38 -07:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
Sal
68bec970a3
Merge branch 'viewpoint-text-toggle' into 'master'
...
Option to hide/show viewpoint text
See merge request KartKrew/Kart!209
2020-03-20 22:07:30 -04:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
James R
70d46ebb0a
Merge branch 'parties-only' into parties
2020-03-03 20:05:30 -08:00
James R
dd29a44ecc
cancelinvite command to rescind a party invitation
2020-03-03 19:17:27 -08:00
James R
f9b5f71171
Merge branch 'gentlemen' into parties
2020-02-23 23:22:37 -08:00
James R
46ac563eaf
Implement big bad parties (splitscreen with network players)
...
Use the 'invite' command to invite another player to your party.
If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.
Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20:20 -08:00
James R
56f6b058d0
Make host lag optional with "lagless", lag by default (lagless off)
2020-02-23 23:07:57 -08:00
James
94a00bb497
Option to hide/show viewpoint text
2019-11-16 16:28:48 -05:00
TehRealSalt
674c0aec17
Merge branch 'master' into new-items
2019-10-24 10:08:37 -04:00
James R
22cb7451e9
...Also remove kartdebugamount
2019-10-07 13:35:07 -07:00
James R
803884c55a
Remove kartdebugitem
2019-10-07 13:12:22 -07:00
James R
392aec38f8
Rename kartdebug_giveitem to kartallowgiveitem
2019-10-07 13:11:14 -07:00
James R
833c8e2bed
Give item command
2019-10-07 12:42:08 -07:00
TehRealSalt
a5ea6a9799
Merge speed/encore scrambles into the normal cvars as an "auto" option
2019-10-03 01:48:16 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
Latapostrophe
ec1272dd14
remove join passwords
2019-08-04 11:26:26 +02:00
Sryder
622c2eac07
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2019-06-02 18:15:30 +01:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
Sryder
43936013f7
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/d_netcmd.h
# src/k_kart.c
# src/p_setup.c
2019-05-25 12:09:47 +01:00
TehRealSalt
480d56838f
Add cvars to prevent issues
2019-05-20 00:50:44 -04:00
TehRealSalt
3d129ad4ca
Merge branch 'v1' into rings
2019-05-06 23:54:20 -04:00
TehRealSalt
435862b29d
finished scrambles
2019-04-26 13:34:30 -04:00
TehRealSalt
6f6bc3333f
Put behind cvar
2019-04-23 01:10:16 -04:00
TehRealSalt
ea2bcb3b99
Update from master
2019-04-19 20:14:06 -04:00
James R
03c27101df
"NEWPING" might as well be the only ping
2019-04-08 15:48:20 -07:00
TehRealSalt
40093a9213
Merge branch 'master' into rings
2019-03-12 01:27:11 -04:00
fickleheart
180bc0eaee
Add join password to server host menu
2019-03-09 15:00:48 -06:00
wolfy852
2dc5dde769
Merge remote-tracking branch 'remotes/origin/master' into waypoints
...
# Conflicts:
# src/k_kart.c
2019-03-08 12:24:03 -06:00
TehRealSalt
74a757ad69
Merge remote-tracking branch 'kartpublic/next' into rings
2019-03-07 21:31:45 -05:00
TehRealSalt
129268121d
Added rings.
2019-03-07 17:11:31 -05:00
fickleheart
b9543d18b4
hblurgle spburgle this code sucks
2019-03-05 22:27:25 -06:00
Sally Cochenour
e81df9474f
Modify a few colors
...
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
wolfy852
da82535475
Ping kick changes + other quality of life improvements [REDO]
2019-02-15 20:51:44 -06:00
