Commit graph

4408 commits

Author SHA1 Message Date
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
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
mazmazz
f51d2950a5 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
mazmazz
8c845510a4 Update version to 2.1.21 2018-11-23 06:58:45 -05: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
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
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
TehRealSalt
a3d8b2af2d Make SPB slightly fairer on conveyors
It is possible to outrun SPB on gramet now
2018-11-21 22:26:33 -05:00
TehRealSalt
a9d15f0669 Allow turning while respawning
This makes rubber-burn turning even more useless, but I don't think there's a way to fix the rubber-burn turn without breaking demo playback, so let's just do the part that is needed for now. I kinda want to redo how that mechanic works anyway.
2018-11-21 20:29:21 -05:00
Steel Titanium
e6fa257b42 Merge branch 'master' into cmake-use-internal-libs 2018-11-21 20:05:08 -05:00
TehRealSalt
4acfc1e595 Fix squishing on mobj scale maps 2018-11-21 19:40:56 -05:00
TehRealSalt
bf9658fe04 Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately 2018-11-21 19:30:00 -05:00
TehRealSalt
96c7f4511d SPB retargets the same person after death 2018-11-21 19:22:28 -05:00
TehRealSalt
22d44ccfde Remove drift & pogo spring on hit and a few other places 2018-11-21 19:00:14 -05:00
Monster Iestyn
07f45a954c Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop. 2018-11-21 20:45:03 +00:00
Monster Iestyn
3cbe8b26b5 Merge branch 'master' into next 2018-11-20 13:55:36 +00:00
Monster Iestyn
22835af9e1 Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
FOF wall rendering fixes and cleanup

See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
TehRealSalt
7ef0a1a489 Be more consistent with how we lock kartspeed/kartweight
- The skin values are now locked between 1 and 9.
- kartspeed & kartweight are no longer locked on skin-switch. Combined with the above, this results in no gameplay change, other than the character select showing the proper value.
- Values used for the engine sounds are locked. No longer can overflow into character voices or freeslotted sounds.
- Removed the overzealous weight locking when in offroad.

If we want to ACTUALLY lock speed/weight for Lua too then we should do that in the Lua stuff.
2018-11-20 02:59:10 -05:00
TehRealSalt
b8696fc0ff Random map buffer only gets added to when
Needs another temporary buffer for the vote screen so that it doesn't roll dupes
2018-11-20 00:13:08 -05:00
TehRealSalt
3e4d2a5acd Allow yeah in splitscreen 2018-11-20 00:10:54 -05:00
TehRealSalt
b818d37eb1 Make Map Hell a 1% chance 2018-11-19 23:41:15 -05:00
TehRealSalt
1d0e82b00d Change "player" to "user" to make it easier to read 2018-11-19 23:13:09 -05:00
TehRealSalt
17f22516c0 Don't shrink spectators
Another typo here
2018-11-19 23:07:53 -05:00
TehRealSalt
5f91d86edd Don't do wipeout dust for spectators 2018-11-19 23:06:31 -05:00
TehRealSalt
4639e94944 Offroad effect fixes
- Make dust retain some of your speed so it's more visible
- Only play effect when moving and on the ground
2018-11-19 22:45:12 -05:00
TehRealSalt
79b1f3a66b Fix SKINCOLOR_ prefix not registering in Lua 2018-11-19 22:38:54 -05:00
TehRealSalt
9e51255963 Move countdown setting to P_CheckRacers
This fixes two bugs:
- Makes it so that the countdown happens when all the winners are ACTUALLY in instead of the first loser, because exiting timer wasn't set for the last winner in the place this was down before
- Means that the countdown timer can be set on disconnect
2018-11-19 22:37:24 -05:00
Monster Iestyn
8da74cb193 Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...that was a mouthful
2018-11-19 22:12:26 +00:00
Monster Iestyn
cfa4bbd75b change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
Monster Iestyn
1fa80d57dd Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages 2018-11-19 17:46:38 +00:00
TehRealSalt
b440e36d15 Mistake 2018-11-18 23:31:36 -05:00