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
mazmazz
21095ad813
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
823b75797e
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
Monster Iestyn
4028929e6e
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
Monster Iestyn
49ba4843fa
Fix compiler errors
2018-11-22 20:08:57 +00:00
mazmazz
6e25b6f523
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
mazmazz
7c689946e0
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
mazmazz
340b5e9d4f
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
472caaf277
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
Monster Iestyn
be21e6074c
Merge branch 'ms-update-alert-fix' into 'master'
...
Master Server Update alert fix
See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
toaster
bf9084cf45
Turns out your unlocks are delayed a little bit! The medals are saved, but the unlocks due to the medals aren't immediate... which is a problem for Hell Attack, since there's no indication you need to play another level for it all to work!!!
2018-11-22 18:28:27 +00:00
toaster
0fc427a663
The oft-promised buffer fixes. Also, making it so the gametype switch for "Sometimes" is every 10 maps, not a full buffer round (now that it doesn't add to the buffer when you first see it).
...
Unfortunately, the code didn't turn out nearly as nice as I'd desired, but things don't always work out.
In addition: For some reason, I rolled Tinkerer's Arena twice within three hits of the Dice voting option, so something's wrong and this branch needs proper, rigorous investigative testing but I don't know what and I'm way too tired (both physically and metaphysically) to investigate any further.
2018-11-22 17:10:36 +00:00
mazmazz
2a61fa990f
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
mazmazz
4cf48536b9
Add README and LICENSE for installs
2018-11-22 07:41:35 -05:00