d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
fd7711c35b
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request KartKrew/Kart-Public!88
2019-02-27 01:18:49 -05:00
1499a47541
Change OGL splitscreen hack to match software behavior
2019-02-24 12:26:46 -06:00
9d30a0f2bc
Adjust FOV change for 2p
2019-02-24 11:59:21 -06:00
4143c31176
Add field-of-view support in software mode
2019-02-23 10:31:37 -06:00
d6b9a75230
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
8db5bda230
Merge remote-tracking branch 'upstream/master'
2019-02-21 22:50:58 -05:00
7667122912
Merge branch 'gcc8-statement-warning' into 'master'
...
GCC8: Disable multi statement macros errors.
See merge request STJr/SRB2!459
2019-02-21 22:32:38 -05:00
c1deea0714
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
84755ec171
Handle things in a more sensible way
2019-02-20 19:04:18 -06:00
f34ed24132
Correct an oversight
2019-02-19 22:20:18 -06:00
4970df47e1
Merge branch 'next' into file-exploit-fix
2019-02-19 22:13:03 -06:00
66c4354115
Merge branch 'make-bumpcode-perfecter' into 'next'
...
Make bumpcode perfecter
See merge request KartKrew/Kart-Public!77
2019-02-19 18:09:30 -05:00
a59a1c53b0
Add check to all of the friction stuff
2019-02-19 17:05:04 -06:00
8988927d16
Only apply friction changes on the ground
2019-02-19 16:46:48 -06:00
ed3f9e2464
Merge branch 'master' into next
2019-02-19 17:21:13 -05:00
ee57ab9afe
Merge branch 'shrink-removed-checks' into 'next'
...
Add some P_MobjWasRemoved checks around code that shrink touches
See merge request KartKrew/Kart-Public!72
2019-02-19 17:14:08 -05:00
eabe8fbadd
Merge branch 'lua-archive' into 'next'
...
Fix dedicated server extra lua variables not being synched for joiners
See merge request KartKrew/Kart-Public!75
2019-02-19 17:10:52 -05:00
d85dcd073a
Merge branch 'latency-tweaks' into 'next'
...
Fix cmd latency occasionally jumping to max
See merge request KartKrew/Kart-Public!78
2019-02-19 17:05:45 -05:00
580e12a32a
Add null check too
2019-02-19 16:04:23 -06:00
a6315f895d
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-19 12:51:52 -05:00
9c5ae02755
Fix cmd latency occasionally jumping to max
2019-02-19 08:05:35 -06:00
838ed005d2
Remove debugging print
2019-02-18 23:39:08 -06:00
caf7888eed
Fix players sometimes snapping backwards on landing after spikeball hits
2019-02-18 23:35:24 -06:00
9c1749d269
Make extra sure we launch in the correct direction
2019-02-18 23:35:01 -06:00
a4c8388f3b
Fix bumps sometimes shooting off stupidly fast
2019-02-18 22:36:26 -06:00
86a9168e86
Fix dedicated server extra lua variables not being synched for joiners
2019-02-18 22:19:28 +01:00
c74b05eadc
Remove extra whitespace
2019-02-17 23:09:52 -08:00
6f3b10313f
Add some P_MobjWasRemoved checks around code that shrink touches
...
It's the only place in the vanilla game where K_DropItems
is called that isn't from a direct collision with the player
it's being called on. It's also a syncfail that doesn't happen
anywhere else, and I saw my sync state appear to get slightly
corrupted when it happened. Let's see if this fixes anything...
2019-02-17 22:09:37 -06:00
46edc1e330
Create the correct dummy function
2019-02-17 15:50:42 -08:00
9d85c2e064
Actually support no apng patch
2019-02-16 14:39:33 -08:00
7e77e0c429
Support libpng without the apng patch and fix mingw (?) compiler errors
2019-02-16 14:20:55 -08:00
04fe5de985
Incomplete: Split files added with -file into their own array
...
Compiles with no errors but the game errors on launch. With no files added, it gives "W_InitMultipleFiles: no files found". With files loaded via -file it gives "W_GetNumForName: PLAYPAL not found!"
2019-02-16 08:16:56 -06:00
32d1f75199
Merge branch 'fix-battle-boost' into 'next'
...
Set flashing tics to 0 after boosting
See merge request KartKrew/Kart-Public!67
2019-02-16 08:31:08 -05:00
76893f4644
Don't kill flashing tics for floor boosts
2019-02-16 07:03:56 -06:00
c370a86f48
Set flashing tics to 0 after boosting
2019-02-16 06:37:09 -06:00
97aeb13db3
Merge branch 'fix-offroad' into 'next'
...
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts
See merge request KartKrew/Kart-Public!62
2019-02-16 07:02:13 -05:00
fc6086cfd8
Merge branch 'master' into next
2019-02-16 06:00:31 -06:00
c170d01edf
Merge branch 'disable-soundsystem' into 'master'
...
Do not start sound system when disabled
See merge request KartKrew/Kart-Public!58
2019-02-16 06:24:12 -05:00
da3772134a
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-16 06:18:22 -05:00
5ff03d38f5
Merge branch 'fix_nonet' into 'master'
...
Fix NONET
See merge request KartKrew/Kart-Public!60
2019-02-16 06:11:43 -05:00
abb3e8e4e3
Merge branch 'fix-no_lua' into 'master'
...
Fix NO_LUA
See merge request KartKrew/Kart-Public!66
2019-02-16 06:10:03 -05:00
faa2433455
Merge branch 'less-misleading-sorting-keys' into 'master'
...
Use less confusing player sorting key names
See merge request KartKrew/Kart-Public!61
2019-02-16 06:07:22 -05:00
5179313c68
Merge branch 'items_off_by_one' into 'next'
...
Items off by one
See merge request KartKrew/Kart-Public!57
2019-02-15 02:18:05 -05:00
bc6f3cf4b4
Merge branch 'james/Kart-Public-apng' into 'apng'
...
Support MSVC and XCode for aPNG
See merge request james/Kart-Public!1
2019-02-15 01:31:58 -05:00
bcd5176ad1
Update project files
2019-02-14 21:32:57 -05:00
de9e25d5b3
Add missing ifdefs
2019-02-14 20:59:07 -05:00
3a3dd42b89
Add pogospring to itemenabled
2019-02-13 05:37:13 -06:00
9eec83da95
Support CMake for apng
2019-02-12 17:01:27 -08:00
329c2ebdc8
Update copyright year
2019-02-11 16:01:02 -08:00
Monster Iestyn