stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-29 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
4648 commits 60 branches 11 tags 94 MiB
Commit graph

4648 commits

This branch
This branch
All branches
Author SHA1 Message Date
TehRealSalt
7608055679 More in-depth countdown calculation 
Hooooopefully this makes sure time over doesn't happen prematurely at random
 2018-11-24 20:59:22 -05:00
TehRealSalt
7dcc55951b Make absolute sure spbplace is set in the right places 2018-11-24 20:48:21 -05:00
TehRealSalt
d467399480 Keep track of the place SPB is following 
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
 2018-11-24 20:41:17 -05:00
TehRealSalt
fccdfc1bfd Weaken slightly 2018-11-24 19:49:18 -05:00
TehRealSalt
f47c78832a colorize arrow roulette 2018-11-24 18:00:27 -05:00
Alam Ed Arias
1113849f5c Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 18:00:14 -05:00
TehRealSalt
a1f2b8f3f0 Merge branch 'master' into 102-gameplay 2018-11-24 17:44:20 -05:00
Nev3r
ec67c4cbd6 Fix uninitialized pointer. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-24 23:39:31 +01:00
Alam Ed Arias
1bcfe16933 Do not remove newlines from the end of files 2018-11-24 17:30:49 -05:00
TehRealSalt
14d178ed4b Infinite wall bump fix(?) 
Couldn't replicate it at all after this change, but I also have trouble replicating it before it :v
 2018-11-24 17:28:53 -05:00
TehRealSalt
31aa96ecdc Wrong var here 2018-11-24 17:27:48 -05:00
Alam Ed Arias
4ac481bcc6 Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 17:22:11 -05:00
Nevur
3f69e7c9b4
Merge branch 'next' into PK3-BackportNext 2018-11-24 23:08:52 +01:00
Nev3r
a1fb333e9b Revamped the lumpinfo_t array generation code. 
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
 2018-11-24 22:58:35 +01:00
mazmazz
f80691eb6e Revert "Adjust mouse scaling calculation for SDL in windowed mode" 
This reverts commit 3b298b7c42.
 2018-11-24 15:36:50 -05:00
Alam Ed Arias
c1d4ef3296 Merge branch 'next' into PK3-BackportNext 2018-11-24 14:54:42 -05:00
Alam Ed Arias
148d8ec9e0 Merge branch 'PK3-Backport' into PK3-BackportNext 2018-11-24 14:54:07 -05:00
Alam Ed Arias
17528a6aa9 LFS fixup for PK3 support 2018-11-24 14:48:56 -05:00
toaster
2b91e42410 Fix a bug where zoomtubes could cause ridiculous acceleration (ie, because PF_SPINNING was applied, causing ridiculously low friction, and then no mechanism was able to remove it) 2018-11-24 18:22:01 +00:00
Nev3r
6f5e3d42ff Merge branch 'PK3-Backport' into 'PK3-BackportNext' 
Pk3 backport

See merge request Nev3r/SRB2!1
 2018-11-24 06:02:19 -05:00
TehRealSalt
d3a737f8c1 More SPB tweaks 
- SPB can switch off if its target if that person lost the lead for 7 seconds
- Make sure lastlook gets reset when going back to SEEKING
 2018-11-24 03:42:25 -05:00
Nev3r
cb0c31fa9a Final touches 
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-24 09:26:52 +01:00
TehRealSalt
4fdaf448f2 Change how SPB rush works 
Instead of enabling Frantic for the person in 2nd, it doubles the gap between them. Now it's 2nd's job to catch up and ruin 1st's day.
 2018-11-24 02:56:39 -05:00
mazmazz
cf8b4a6cb1 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
mazmazz
3b298b7c42 Adjust mouse scaling calculation for SDL in windowed mode 2018-11-23 21:43:50 -05:00
mazmazz
b60c10dc9b Change default mouse sensitivity 2018-11-23 20:51:57 -05:00
TehRealSalt
e265d910d3 Item roulette fun-times 
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
 2018-11-23 19:15:14 -05:00
Monster Iestyn
794d27b49e Kill CheckMissileImpact, it has been useless for probably a decade and a half 2018-11-23 23:14:49 +00:00
Monster Iestyn
0a0336a674 Merge branch 'master' into fof-slope-skew-backport 
# Conflicts:
#	src/r_segs.c
 2018-11-23 22:40:28 +00:00
Monster Iestyn
4e616f54ad Merge branch 'master' into next 2018-11-23 21:01:03 +00:00
TehRealSalt
9e09dd7563 Don't show "Attack or Protect" for spectators 2018-11-23 16:00:21 -05:00
Monster Iestyn
d228e35fcb Merge branch 'responsefile-fix' into 'master' 
Fix M_FindResponseFile returning garbage data

See merge request STJr/SRB2!254
 2018-11-23 15:59:40 -05:00
TehRealSalt
9c444b64a9 Fix divide by 0 bug 2018-11-23 15:45:46 -05:00
Nevur
0e5bfdf0a7
Merge pull request #1 from STJr/master 
update stupid fork to date
 2018-11-23 21:34:14 +01:00
Steel Titanium
97dd291f3f Merge branch 'master' into responsefile-fix 2018-11-23 15:29:52 -05:00
Alam Arias
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix 
Render the skies correctly on splitscreen in OpenGL mode
 2018-11-23 14:48:05 -05:00
Alam Arias
b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen 
Render the startup screen on OpenGL mode
 2018-11-23 14:47:56 -05:00
Alam Arias
3d0fd7ff2e
Merge pull request #258 from light2yellow/master 
m_fixed: asm: cc is not a register
 2018-11-23 14:47:36 -05:00
Monster Iestyn
08af33c51f Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't 2018-11-23 19:12:48 +00:00
Nev3r
0487558a98 Add missing tweaks 
Also remove a test printf.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 17:58:45 +01:00
Nev3r
c548aaa347 Backported PK3 support to 2.1 
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 16:58:16 +01:00
Digiku
9a3d2d0ee5 Merge branch '21-credits-update' into 'master' 
2.1.21 credits update

See merge request STJr/SRB2!339
 2018-11-23 07:38:28 -05:00
Digiku
9154ece829 Merge branch '21-readme' into 'master' 
Add README and LICENSE for installs

See merge request STJr/SRB2!335
 2018-11-23 07:36:12 -05:00
Digiku
3c95a63fc2 Merge branch 'public-darker-credits' into 'master' 
Make the credits pics darker

See merge request STJr/SRB2!336
 2018-11-23 07:35:44 -05:00
Digiku
9519534031 Merge branch 'less-confusing-errors' into 'master' 
Make the error less confusing

See merge request STJr/SRB2!337
 2018-11-23 07:35:26 -05:00
mazmazz
2f7f472ca2 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
wolfy852
3a68af5f53 Merge remote-tracking branch 'remotes/public/master' into unfuck-gamepads 2018-11-23 00:17:07 -06:00
wolfy852
e51ed406ac Swap out SDL_INIT_JOYSTICK for SDL_INIT_GAMECONTROLLER 
First step in improving controller support.
 2018-11-23 00:01:20 -06:00
TehRealSalt
3f35ffd7c6 Franticized items for 2nd place VS SPB'd 1st 2018-11-22 23:38:54 -05:00
mazmazz
19a8b7b2b1 Finish 3rd party library license file 2018-11-22 23:24:06 -05:00