e528750444
Fix improperly resolved conflicts
2019-01-08 16:44:56 -06:00
ad01dcc5ac
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
...
# Conflicts:
# CMakeLists.txt
# appveyor.yml
# src/command.c
# src/command.h
# src/d_clisrv.c
# src/d_netcmd.c
# src/dehacked.c
# src/doomdef.h
# src/hu_stuff.c
# src/m_misc.c
2019-01-08 16:32:24 -06:00
78ac038864
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
b713903208
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
7f8609d335
Merge branch 'merge-srb2' into 'next'
...
Merge SRB2 master & next (round 1)
See merge request KartKrew/Kart-Public!16
2019-01-08 15:56:41 -05:00
6916667c41
Merge branch 'animtimer-fix' into 'next'
...
Cast animtimer to int before negating
See merge request KartKrew/Kart-Public!17
2019-01-08 15:47:14 -05:00
82246f6c25
Merge branch 'makefile-develop' into 'master'
...
Compile flag for DEVELOP
See merge request KartKrew/Kart-Public!18
2019-01-08 15:45:04 -05:00
a4641e1010
use PLAY as default player MD2 if avaiable.
2019-01-08 18:57:10 +01:00
bcf687c3af
Compile flag for DEVELOP
2019-01-06 20:47:13 -06:00
eebdda0833
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
e115dbf34f
Cast animtimer to int before negating
...
Stops a Visual Studio compile error.
2019-01-06 03:02:12 -06:00
7176490d5e
Merge branch 'kill-facefreed' into 'next'
...
Remove facefreed/iconfreed
See merge request KartKrew/Kart-Public!15
2019-01-06 02:02:54 -05:00
e545a8ab7d
Merge remote-tracking branch 'next' into merge-srb2
2019-01-06 02:02:33 -05:00
50a6df7563
Merge branch 'load-order-adjustment' into 'next'
...
Load sounds.kart after patch.kart
See merge request KartKrew/Kart-Public!13
2019-01-06 01:51:41 -05:00
8736952aad
Keep execversion stuff on, just dummied out
...
Had issues with skin values not changing from the menu, this seemed to fix it
2019-01-06 01:41:42 -05:00
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
aa3c058321
Remove facefreed/iconfreed
...
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
2019-01-05 20:40:47 -06:00
4a3ea6e51e
Merge branch 'unsigned-errors' into 'master'
...
Fix unsigned abs errors
See merge request KartKrew/Kart-Public!14
2019-01-05 20:49:06 -05:00
2e9b18669a
Remove unnecessary version info call
2019-01-05 19:56:52 -05:00
c7725525a8
Remove zlib from release brew packages
...
(it was never in the original travis script)
2019-01-05 19:50:46 -05:00
1e19ba8570
Use standard OSX brew bottles to speed up test buildbots
2019-01-05 19:50:27 -05:00
e7dc346a10
OS X set CFLAGS+="-march=core2" for compatible binaries with old Macs
2019-01-05 19:33:58 -05:00
b3d29fb713
* Add homebrew tap mazmazz/srb2
...
* Use sdl2_mixer from mazmazz/srb2 due to removed options from homebrew-core
* Use `brew install --build-bottle` to build compatible libraries for old Macs
2019-01-05 19:30:58 -05:00
061b1e406b
Don't terminate in after_success because it halts the log abruptly
2019-01-05 19:30:57 -05:00
963d6c85bc
Revised comments
2019-01-05 19:30:54 -05:00
daec4f9f7e
Merge remote-tracking branch 'srb2public/master' into merge-srb2
2019-01-05 18:42:58 -05:00
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
bc429ad4f8
Determine latency with leveltime BS instead of nettics
2019-01-05 01:13:16 -06:00
a10ac14462
turn these signed before abs-ing em
2019-01-05 00:42:36 -05:00
4de91cfea5
Load sounds.kart after patch.kart
2019-01-05 00:33:24 -05:00
656de08b96
test stuff
2019-01-04 23:09:29 -06:00
bd36a0f0a1
Don't turn players more than they're allowed to
...
This should account for latency properly.
2019-01-04 23:09:27 -06:00
12b0e7d5da
Send latency in players' ticcmds
2019-01-04 23:09:26 -06:00
87a09e051d
Add k_kart files to CB project
2019-01-04 23:09:25 -06:00
9e09d8cb8c
Merge branch 'mainwads-fix' into 'next'
...
Don't increment mainwads for sounds or music.kart
See merge request KartKrew/Kart-Public!12
2019-01-04 20:01:57 -05:00
888b5056d7
Clean up the comments a bit
2019-01-04 19:55:05 -05:00
d5870e6f8a
Merge branch 'changecontrol-text-overflow-fix' into 'master'
...
Resolve buffer overflow crash when configuring System Menu and GIF controls
See merge request STJr/SRB2!445
2019-01-04 19:39:17 -05:00
c97dc5d3c4
Increase M_ChangecontrolResponse message buffer by 25 chars
2019-01-04 19:38:36 -05:00
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
5d51754936
In-game music credits
2019-01-04 04:44:55 -05:00
a69239bfa8
Don't increment mainwads for sounds or music.kart
2019-01-04 00:32:01 -05:00
b513b8a11b
Actually, let's just do "1"
2019-01-03 16:43:01 -05:00
2db9fa1b96
Update SOC version, make base SRB2 SOC throw a warning
2019-01-03 16:30:50 -05:00
788c75ecdf
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2019-01-03 12:31:26 -05:00
e52d5fd2fd
Merge branch 'bump-fixes' into 'next'
...
Push bouncing players backwards if they get stuck in a wall
See merge request KartKrew/Kart-Public!3
2019-01-03 12:27:14 -05:00
5f632d9b3c
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
0b0cbcabb7
Merge branch 'map-palette-titlefix' into 'next'
...
Fix per-map palette not being reset properly when it should.
See merge request KartKrew/Kart-Public!9
2019-01-03 01:08:42 -05:00
220ef1a490
Merge branch 'waypoint-lap-option' into 'next'
...
Add waypoint lap field via Parameter field
See merge request KartKrew/Kart-Public!4
2019-01-03 00:58:09 -05:00
e7ffd86c6e
Fixx GCC 4.4 array-bounds compile errors
2019-01-02 20:58:52 -05:00
b8fe77b6e2
Add __DPL_ACTIVE condition to optional asset download
2019-01-02 20:49:00 -05:00
wolfy852