James R
62b957d348
Revert "Unfuck MS connecting and error reporting"
...
This reverts commit 50ae248b84
2019-06-09 14:21:04 -07:00
James R
a8d1ddd1c2
Revert "Check error on select"
...
This reverts commit 1d77716d7e
2019-06-09 14:20:33 -07:00
James R
154ce80a9b
Revert "Force of habit"
...
This reverts commit 9f0887fafc
2019-06-09 14:20:32 -07:00
Steel Titanium
605e32004a
Merge branch '2.1.24-prep' into 'next'
...
Update version to 2.1.24
See merge request STJr/SRB2!495
2019-06-08 17:08:34 -04:00
Monster Iestyn
c21b9e632a
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
cd1c87ea71
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
d5c1fe6467
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
593fcae69a
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
Alam Ed Arias
0c352b856d
Merge branch 'travis-deployer' into 'master'
...
Deploy OS X and Debian packages from Travis-CI
See merge request STJr/SRB2!449
2019-06-07 17:57:29 -04:00
Steel Titanium
8d5207975d
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium
6c4253a680
Merge branch 'jimita-flashpals-on-screenshots' into 'next'
...
Flashpals on screenshots
See merge request STJr/SRB2!492
2019-06-07 16:37:59 -04:00
Steel Titanium
9a6330ca4d
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
Monster Iestyn
474b70aa69
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Steel Titanium
8f19878781
Upped freeslots limit
2019-06-03 15:23:48 -04:00
wolfs
ab88884351
Merge branch 'v1-errors' into 'master'
...
V1 errors
See merge request KartKrew/Kart-Public!140
2019-05-28 22:13:19 -04:00
James R
2b79547512
Fix XCode compiler errors
...
I'm faily certain this also fixes broken logic (g_game.c).
2019-05-28 19:04:27 -07:00
James R
88ba895d18
Fix GCC 8 Travis error
2019-05-28 19:00:24 -07:00
James R
d8967112c6
Fix compiler errors
...
The truncation handling in this one spot is okay, but the compiler isn't smart
enough for it. I'm leaving it as a warning because I'd like to make a dedicated
function for handling snprintf truncation in the future.
2019-05-28 15:11:37 -07:00
James R
9ec9c639dd
Revert "Revert "Fix Post Processing in 64-bit Software 3P/4P""
...
This reverts commit 392f357b1a
2019-05-28 15:09:29 -07:00
James R
c0e7c17cce
Merge remote-tracking branch 'origin/v1' into v1
2019-05-28 14:24:52 -07:00
wolfs
6b568e4f43
Merge branch 'v1-lua-stuff' into 'v1'
...
V1 lua stuff
See merge request KartKrew/Kart!155
2019-05-28 07:59:45 -04:00
wolfy852
1a038ad463
Don't guard the return
2019-05-28 06:56:35 -05:00
wolfy852
96b5a1df43
Update patch.kart hash
...
THIS SHOULD BE THE LAST TIME I SWEAR
2019-05-28 06:33:38 -05:00
wolfs
4acec35221
Merge branch 'fix-postprocessing' into 'v1'
...
Fix Post Processing in 64-bit Software 3P/4P
See merge request KartKrew/Kart!156
2019-05-28 06:35:33 -04:00
Sryder
01a0fb1c8f
Fix Heatwave Post-processing Effect in 3P/4P
2019-05-27 22:59:58 +01:00
James R
392f357b1a
Revert "Fix Post Processing in 64-bit Software 3P/4P"
...
This reverts commit 1a9b21c195
2019-05-27 14:20:12 -07:00
James R
88d5e9b7d2
wip
2019-05-27 14:20:07 -07:00
Sryder
1a9b21c195
Fix Post Processing in 64-bit Software 3P/4P
...
Vid_BlitLinearScreen didn't make sure that it was actually meant to be copying the entire screen rows before doing it properly.
2019-05-27 22:03:17 +01:00
wolfs
93a91e222d
Merge branch 'spinout-angle' into 'v1'
...
Spinout angle change when boosting
See merge request KartKrew/Kart!153
2019-05-26 20:10:56 -04:00
wolfs
7420795f1f
Merge branch 'fix-brakes' into 'v1'
...
Make brakes stronger
See merge request KartKrew/Kart!154
2019-05-26 20:10:46 -04:00
Latapostrophe
1bcebaadfd
Lua fixes + new drawOnMinimap function
2019-05-26 15:05:10 +02:00
Latapostrophe
ba3e682e0e
fix banana's SpinPlayer using the wrong inflictor
2019-05-26 11:19:26 +02:00
Latapostrophe
142c6aacac
Merge branch 'lua-battlefullscreen-expose' into v1-lua-stuff
2019-05-26 11:18:00 +02:00
Steel Titanium
2e8aae5d6a
Merge branch 'next' into jimita-flashpals-on-screenshots
2019-05-25 19:37:17 -04:00
Latapostrophe
d97a0ce2b4
Move the friction change out of the offroad check
2019-05-25 14:13:35 +02:00
Latapostrophe
cb8af8eb95
add k_booostangle to dehacked
2019-05-25 14:11:26 +02:00
Latapostrophe
8628a543a5
give friction to brakes
2019-05-25 13:51:19 +02:00
Latapostrophe
ccd0ec96a4
let angle be changed while spun out and boosting
2019-05-25 13:08:38 +02:00
James R
38360f29ec
Move FOV option out of OGL options
2019-05-22 23:16:20 -07:00
James R
e1451b7a98
Acknowledge fallback models as an OGL option indeed
...
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07:00
Jaime Passos
47ae715962
Hardware mode y-shearing matches software mode mouselook
2019-05-17 17:49:04 -03:00
Jaime Passos
33285f7007
dude how do I co-author in Git?
2019-05-17 13:18:33 -03:00
wolfy852
519a289373
Fix the permanent instashield bug
2019-05-17 08:06:18 -05:00
wolfy852
1c52319d08
More credits updates
2019-05-17 03:55:51 -05:00
Latapostrophe
cd4b9abb78
SPB intangibility
2019-05-17 03:55:23 -05:00
wolfy852
f3b6b732f8
Update bonuschars credits
2019-05-13 12:49:44 -05:00
Monster Iestyn
c8e3748a1c
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Monster Iestyn
11cc332378
Merge branch 'archiveworld-sigsegv-fix' into 'next'
...
Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490
2019-05-13 07:02:48 -04:00
Alam Ed Arias
be13ab4830
Fix NONET build
2019-05-13 01:51:36 -04:00
Steel Titanium
2c4555493d
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
