Monster Iestyn
8e19611033
Merge branch 'opengl-fof-lowerunpegged' into 'master'
...
OpenGL: FOF walls + Lower unpegged
See merge request STJr/SRB2!258
2018-07-11 16:36:26 -04:00
Monster Iestyn
09ae0aae53
Merge branch 'master' into next
2018-07-11 21:18:39 +01:00
Monster Iestyn
c127ea3ceb
Merge branch 'opengl-projectsprite-fix' into 'master'
...
OpenGL HWR_ProjectSprite fix
See merge request STJr/SRB2!255
2018-07-11 16:15:42 -04:00
TehRealSalt
81d7b21d43
Rearranged color order
...
Invincibility should look just a tad smoother now
2018-07-10 22:59:19 -04:00
TehRealSalt
f3134830fa
Use Periwinkle & Creamsicle instead
2018-07-10 20:27:18 -04:00
TehRealSalt
d6c1d67662
Allow K_MomentumToFacing to work when you just hit the floor
...
(also prevent a crash when Ballhog balls die)
2018-07-10 19:34:45 -04:00
TehRealSalt
ffa9143eff
SPB distance required changes based on difficulty
...
You can catch up to 1st faster on Hard vs Normal
2018-07-10 18:37:46 -04:00
TehRealSalt
301d1ffec6
Sound & timer fixes
...
- Don't decrease spinout when boosting
- Don't increase banana dragging when in the air or if you're not moving (Not sure about this one, just thought that this would feel better than it always increasing once we add the visual effect)
- Play a sound for banana dragging
- Correct finish line sounds
2018-07-10 18:16:53 -04:00
TehRealSalt
0b01c3868f
Grow/Shrink flashing
2018-07-10 17:40:47 -04:00
TehRealSalt
9da279006f
Merge branch 'master' into sonicitems
2018-07-10 17:02:55 -04:00
Sryder
74d19114aa
Merge branch 'fixmaster' into 'master'
...
Allow servers to start again
See merge request KartKrew/Kart!4
2018-07-10 15:02:43 -04:00
toaster
0accb8fca7
While we're doing it, fix the animation/music happening while paused!
2018-07-10 19:51:34 +01:00
toaster
c65a2e3177
Fix unpausing when you're a waitingplayers admin.
2018-07-10 19:39:11 +01:00
Sryder
bbbc0d3820
User server instead of checking servernode
...
For some reason both node and servernode are identical at that point.
Both were 1 for the client when I tried it myself.
2018-07-10 19:21:59 +01:00
toaster
fffe82b863
Correction to the bug that prevented starting a server.
2018-07-10 13:29:44 +01:00
toaster
a3e294062d
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-07-09 22:38:51 +01:00
Sryder
fa0132bef6
Merge branch 'gamestate-download-fix' into 'master'
...
Don't set joining clients to immediately be connected
See merge request KartKrew/Kart!3
2018-07-09 15:45:20 -04:00
TehRealSalt
6bfe7bd134
Merge branch 'master' into sonicitems
2018-07-09 00:52:38 -04:00
TehRealSalt
0377956276
This is wrong and is causing issues and I'm entirely surprised this hasn't tripped vanilla yet
2018-07-08 19:07:54 -04:00
TehRealSalt
44e2215448
The last error
...
Sryder & toaster, please check for me with your compile setups, but this looks like the last warning, in both Release & Debug builds
2018-07-08 18:05:22 -04:00
TehRealSalt
ec0c358755
Merge branch 'master' into sonicitems
2018-07-08 17:51:44 -04:00
Sryder
71ac4abdf7
Merge branch 'skystuff' into 'master'
...
Internal sky improvement ports
See merge request KartKrew/Kart!2
2018-07-08 17:21:52 -04:00
Sryder
d10883b033
Don't set joining clients to immediately be connected
...
They need to download the gamestate first
2018-07-08 21:46:23 +01:00
TehRealSalt
2c7082a475
Internal sky improvement ports
...
Horizon lines, barrel sky distortion
2018-07-08 15:44:01 -04:00
Sryder
722e1d570e
Merge branch 'debug-fix' into 'master'
...
Fix ALL of the warnings
See merge request KartKrew/Kart!1
2018-07-08 05:43:55 -04:00
colette
0a931a1364
Update f_finale.c
2018-07-07 20:20:46 -04:00
Sryder
cd898707d7
Silly fixes to absurd compiler warnings
...
Thanks toaster
2018-07-07 23:49:34 +01:00
TehRealSalt
b3b264e745
Merge branch 'debug-fix' of https://git.magicalgirl.moe/KartKrew/Kart into debug-fix
2018-07-07 17:43:30 -04:00
TehRealSalt
278fd87452
Fix Sryder's bool error
...
I don't seem to get this error for some reason, even after upgrading to w64 & GCC 7.2.0, but hopefully this fixes it
2018-07-07 17:33:26 -04:00
Sryder
50f6053ecf
22 needs to be added to these char arrays to account for zone title being a settable string
2018-07-07 22:10:26 +01:00
TehRealSalt
8d056d3ca5
better parentheses
2018-07-07 16:46:32 -04:00
Alam Ed Arias
17570c1ad6
Merge branch 'master' into next
2018-07-07 16:42:50 -04:00
Alam Arias
a79b9a9127
Update m_misc.c
2018-07-07 20:41:11 +00:00
TehRealSalt
85ab4015eb
The remaining errors on a GCC 6.3 setup
2018-07-07 16:38:54 -04:00
TehRealSalt
2e3afaa7f5
Fix incorrect PRIdS
...
Thanks, Alam!
2018-07-07 16:38:14 -04:00
Alam Arias
7da6aca450
Update m_misc.c
2018-07-07 20:33:19 +00:00
toaster
97348beb66
Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
...
* Remove FUNCMATH from all void-returning functions, given GCC80 specifically complains about this case.
* Extend the length of all extant buffers to the safety threshold recommended by the compiler.
* Add void casts to WS_getaddrinfo's setting to prevent complaints about incompatible typecasts.
* Extend the charsel, face, and superface buffer sizes and writes to include the null terminator. (I didn't really want to do this because it's not even particularily NEEDED, but there was literally zero way to get around the request that I could find with multiple online searches. I tried.)
2018-07-07 16:52:01 +01:00
TehRealSalt
ba43ed5d48
Squash a few more errors
...
Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-06 21:53:37 -04:00
TehRealSalt
7e7f4dc5bc
F_WaitingPlayersTicker() -> F_WaitingPlayersTicker(void)
2018-07-06 19:44:21 -04:00
Sryder
7b82d0e695
Fix warning relating to max 0 with an unsigned variable
...
I've looked at the code above and can't see anything that would try to lower the value below 0 as it's mostly just addition and dividing
2018-07-07 00:34:03 +01:00
toaster
292b529c51
Free unwittingly malloc'd memory.
2018-07-06 23:59:05 +01:00
Sryder
5d342f32c8
Merge branch 'master' into sonicitems
2018-07-06 23:33:54 +01:00
toaster
6c8a92b44f
Remove the need for sending the savegame if you're the host. You don't need to send it to yourself. What are you doing?
2018-07-06 23:18:22 +01:00
toaster
e37efda57e
Fix a crashy oversight in the archiving!
2018-07-06 23:18:18 +01:00
toaster
39e6169b42
Improve the defaulting thing to not play the sound if the cvar isn't to be touched.
2018-07-06 20:55:22 +01:00
toaster
5c5cbeeea2
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-07-06 20:40:47 +01:00
toaster
1a2dfaed79
* Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu.
...
* Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 20:40:42 +01:00
Sryder
6fc29ce37d
Always send gamestate to joiners.
...
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
Monster Iestyn
f1bba60373
Merge branch 'md2-fopen-error' into 'master'
...
More helpful error messages
See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn
130de10f97
Merge branch 'md2-smoother-interpolation' into 'master'
...
Smoother MD2 interpolation
See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00