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
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
Steel Titanium
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Steel Titanium
933c1311cd
Make the error less confusing
2018-11-22 22:59:46 -05:00
TehRealSalt
c4335a5524
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
2018-11-22 22:56:33 -05:00
TehRealSalt
00fc67ba36
Reset to defaults option in controls
2018-11-22 22:50:40 -05:00
Steel Titanium
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
Steel Titanium
0412015469
Move DLLs into seperate folders
2018-11-22 22:44:21 -05:00
TehRealSalt
c2c799c885
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
fe6832f559
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
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
mazmazz
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
Monster Iestyn
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
Monster Iestyn
f7eea7ade3
Fix compiler errors
2018-11-22 20:08:57 +00:00
mazmazz
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
mazmazz
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
mazmazz
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
Monster Iestyn
37c0e646e4
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
de02c0bca9
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
c6268253eb
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
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
mazmazz
e75a9e2def
Add README and LICENSE for installs
2018-11-22 07:41:35 -05:00
TehRealSalt
3832ffcc42
Make SPB slightly fairer on conveyors
...
It is possible to outrun SPB on gramet now
2018-11-21 22:26:33 -05:00
TehRealSalt
8f2210fb2f
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
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
TehRealSalt
1cb602aec6
Fix squishing on mobj scale maps
2018-11-21 19:40:56 -05:00
TehRealSalt
a30563da22
Buff indirect item cooldown to 30 sec, make sure the cooldown is set immediately
2018-11-21 19:30:00 -05:00
TehRealSalt
f65a8796df
SPB retargets the same person after death
2018-11-21 19:22:28 -05:00
TehRealSalt
e07e89055d
Remove drift & pogo spring on hit and a few other places
2018-11-21 19:00:14 -05:00
Monster Iestyn
4a88ddf897
Merge branch 'disappearing-servers-fix' into 'master'
...
Disappearing servers fix
See merge request STJr/SRB2!334
2018-11-21 17:12:37 -05:00
Monster Iestyn
3acc312923
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
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
Monster Iestyn
948466658f
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
b03d87c80a
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
5c67e22c22
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
9a4ebb916a
Allow yeah in splitscreen
2018-11-20 00:10:54 -05:00
TehRealSalt
9b1c2b8dc0
Make Map Hell a 1% chance
2018-11-19 23:41:15 -05:00
TehRealSalt
9b7eea408d
Change "player" to "user" to make it easier to read
2018-11-19 23:13:09 -05:00
TehRealSalt
0a3183aa82
Don't shrink spectators
...
Another typo here
2018-11-19 23:07:53 -05:00
