thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4691 commits 1 branch 12 tags 205 MiB
Commit graph

4691 commits

This branch
This branch
All branches
Author SHA1 Message Date
TehRealSalt
5767a25b14 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
1acbb77efb Wrong var here 2018-11-24 17:27:48 -05:00
Alam Ed Arias
ee4e86fc67 Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext 2018-11-24 17:22:11 -05:00
Nevur
7dd7608006 Merge branch 'next' into PK3-BackportNext 2018-11-24 23:08:52 +01:00
Nev3r
f360e3431c 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
b8850b5819 Revert "Adjust mouse scaling calculation for SDL in windowed mode" 
This reverts commit 65b5d74844.
 2018-11-24 15:36:50 -05:00
Alam Ed Arias
bd576c8e80 Merge branch 'next' into PK3-BackportNext 2018-11-24 14:54:42 -05:00
Alam Ed Arias
40f7bb5afe Merge branch 'PK3-Backport' into PK3-BackportNext 2018-11-24 14:54:07 -05:00
Alam Ed Arias
faaf5262da LFS fixup for PK3 support 2018-11-24 14:48:56 -05:00
toaster
18c0d5d7bd 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
34c472dfb7 Merge branch 'PK3-Backport' into 'PK3-BackportNext' 
Pk3 backport

See merge request Nev3r/SRB2!1
 2018-11-24 06:02:19 -05:00
TehRealSalt
4c003cabe1 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
48cf6572b3 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
b1ee5de058 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
354037b251 Additional 2.1 credits update 2018-11-23 21:57:07 -05:00
mazmazz
65b5d74844 Adjust mouse scaling calculation for SDL in windowed mode 2018-11-23 21:43:50 -05:00
mazmazz
ef18d22f63 Change default mouse sensitivity 2018-11-23 20:51:57 -05:00
TehRealSalt
c2941d6ea5 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
e34f2bf467 Kill CheckMissileImpact, it has been useless for probably a decade and a half 2018-11-23 23:14:49 +00:00
Monster Iestyn
24f14fc526 Merge branch 'master' into fof-slope-skew-backport 
# Conflicts:
#	src/r_segs.c
 2018-11-23 22:40:28 +00:00
Monster Iestyn
4db1220ad9 Merge branch 'master' into next 2018-11-23 21:01:03 +00:00
TehRealSalt
60c2550d75 Don't show "Attack or Protect" for spectators 2018-11-23 16:00:21 -05:00
Monster Iestyn
d6238ffbe9 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
1f1a6094b5 Fix divide by 0 bug 2018-11-23 15:45:46 -05:00
Nevur
71910e9c92 Merge pull request #1 from STJr/master 
update stupid fork to date
 2018-11-23 21:34:14 +01:00
Steel Titanium
e5611eec7b Merge branch 'master' into responsefile-fix 2018-11-23 15:29:52 -05:00
Alam Arias
5fd6df3625 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
004de4fb6d 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
7c02cfe486 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
0bff44e22b 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
206d411f46 Add missing tweaks 
Also remove a test printf.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 17:58:45 +01:00
Nev3r
623c7097f1 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
032d6a02fe 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
f793db7e6e 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
6049796027 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
dcb0b0cd99 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
f51d2950a5 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
wolfy852
59f7e094a9 Merge remote-tracking branch 'remotes/public/master' into unfuck-gamepads 2018-11-23 00:17:07 -06:00
wolfy852
4e2d155678 Swap out SDL_INIT_JOYSTICK for SDL_INIT_GAMECONTROLLER 
First step in improving controller support.
 2018-11-23 00:01:20 -06:00
TehRealSalt
9bec65ca03 Franticized items for 2nd place VS SPB'd 1st 2018-11-22 23:38:54 -05:00
mazmazz
e7c0581bfc Finish 3rd party library license file 2018-11-22 23:24:06 -05:00
Steel Titanium
0c30cd0fa1 Merge branch 'master' into responsefile-fix 2018-11-22 23:02:20 -05:00
Steel Titanium
97ea1966fd Make the error less confusing 2018-11-22 22:59:46 -05:00
TehRealSalt
1e29c9ce98 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-22 22:56:33 -05:00
TehRealSalt
ea655ba27a Reset to defaults option in controls 2018-11-22 22:50:40 -05:00
Steel Titanium
6d946c1c84 Fix the not found errors on DLLs 2018-11-22 22:44:47 -05:00
Steel Titanium
42368550c0 Move DLLs into seperate folders 2018-11-22 22:44:21 -05:00
TehRealSalt
6c2de98dde Change defaults of these 
nettimeout being 10 seconds is INSANITY, and maxping of 500 is when it starts being unplayable (I could also be bargained to raise it to 750 or 1000 though). Not sure if jointimeout causes any freezing, if it does then I'd also like to lower that
 2018-11-22 20:54:28 -05:00
Sal
4929d78137 Merge branch 'medal_unlocks' into 'master' 
Immediate Time Medal Unlock Fix

See merge request KartKrew/Kart!104
 2018-11-22 20:52:30 -05:00
mazmazz
d1209e3f3d Make the credits pics darker 2018-11-22 20:08:02 -05:00