Sal
|
569338a3a1
|
Merge branch 'drift-spark-adjustment' into 'next'
Minimum speed to get drift sparks
See merge request KartKrew/Kart-Public!20
|
2019-01-09 01:18:30 -05:00 |
|
Sal
|
2d81bcf0ba
|
Merge branch 'kart-public-appveyor-improvements' into 'next'
Add Windows installer building and 64-bit builds to AppVeyor
See merge request KartKrew/Kart-Public!7
|
2019-01-08 21:20:51 -05:00 |
|
TehRealSalt
|
301477f212
|
Misc level init fixes
|
2019-01-08 20:14:58 -05:00 |
|
Marco Z
|
6ed52d9c42
|
Kart Public Next merge
|
2019-01-08 18:39:11 -05:00 |
|
Sal
|
88c6150f7b
|
Merge branch 'gamepad-tweaks' into 'next'
Gamepad Improvements
See merge request KartKrew/Kart-Public!5
|
2019-01-08 18:08:00 -05:00 |
|
wolfy852
|
2794833f8d
|
Fix improperly resolved conflicts
|
2019-01-08 16:44:56 -06:00 |
|
wolfy852
|
5c5e6a26dd
|
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 |
|
Sal
|
900c6df765
|
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 |
|
TehRealSalt
|
ab76725038
|
Merge remote-tracking branch 'master' into next
|
2019-01-08 16:29:14 -05:00 |
|
Sal
|
875f5eb28a
|
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 |
|
Sal
|
85bdeb344e
|
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 |
|
Sal
|
530d50dcfc
|
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 |
|
wolfy852
|
934b199705
|
Compile flag for DEVELOP
|
2019-01-06 20:47:13 -06:00 |
|
SeventhSentinel
|
9490d225de
|
Minimum speed to get drift sparks
|
2019-01-06 17:17:52 -05:00 |
|
wolfy852
|
8baa538d43
|
Cast animtimer to int before negating
Stops a Visual Studio compile error.
|
2019-01-06 03:02:12 -06:00 |
|
Sal
|
02f49b2b8b
|
Merge branch 'kill-facefreed' into 'next'
Remove facefreed/iconfreed
See merge request KartKrew/Kart-Public!15
|
2019-01-06 02:02:54 -05:00 |
|
SeventhSentinel
|
716ce5c343
|
Merge remote-tracking branch 'next' into merge-srb2
|
2019-01-06 02:02:33 -05:00 |
|
Sal
|
138c082de5
|
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 |
|
SeventhSentinel
|
3fe7856ba3
|
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 |
|
SeventhSentinel
|
046d66d803
|
Fix errors from merge
|
2019-01-06 01:00:30 -05:00 |
|
wolfy852
|
600cf37c88
|
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 |
|
Sal
|
bb2a2ebf99
|
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 |
|
SeventhSentinel
|
e70d98d7a6
|
Merge remote-tracking branch 'srb2public/master' into merge-srb2
|
2019-01-05 18:42:58 -05:00 |
|
SeventhSentinel
|
1d58c6b8c2
|
merge srb2 next
|
2019-01-05 15:59:23 -05:00 |
|
SeventhSentinel
|
b9ea18c030
|
turn these signed before abs-ing em
|
2019-01-05 00:42:36 -05:00 |
|
SeventhSentinel
|
a595d0ba00
|
Load sounds.kart after patch.kart
|
2019-01-05 00:33:24 -05:00 |
|
Sal
|
09016c877d
|
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 |
|
Steel Titanium
|
a57626f828
|
Clean up the comments a bit
|
2019-01-04 19:55:05 -05:00 |
|
Digiku
|
031e234d86
|
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 |
|
Digiku
|
e42e1178ed
|
Increase M_ChangecontrolResponse message buffer by 25 chars
|
2019-01-04 19:38:36 -05:00 |
|
Steel Titanium
|
d2da1db6c8
|
Don't increment mainwads for sounds or music.kart
|
2019-01-04 00:32:01 -05:00 |
|
Sal
|
b69013a4f1
|
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 |
|
Sal
|
1b02805445
|
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 |
|
Sal
|
5c1267d2e6
|
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 |
|
wolfy852
|
b517b738c8
|
Fix a randomly changed comment (?)
|
2019-01-02 15:45:04 -06:00 |
|
wolfy852
|
916d87ead6
|
Whitespace fixes
|
2019-01-02 15:43:07 -06:00 |
|
wolfy852
|
1f1431ff5a
|
Revert CMake/Appveyor changes
|
2019-01-02 15:39:57 -06:00 |
|
wolfy852
|
b3cd4283e4
|
Fix a duped line
|
2019-01-02 15:03:13 -06:00 |
|
wolfy852
|
bf5d14c37f
|
Rebind the talk key by default, but move it to D-Pad Down
|
2019-01-02 14:50:36 -06:00 |
|
wolfy852
|
1c33146e95
|
Turns out we don't need this
|
2019-01-02 14:47:24 -06:00 |
|
mazmazz
|
eb910268a2
|
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-appveyor-improvements
|
2019-01-02 14:59:00 -05:00 |
|
mazmazz
|
3ccdea433d
|
Flip back ERRORMODE=1 for AppVeyor and CircleCI
|
2019-01-02 14:58:50 -05:00 |
|
Steel Titanium
|
4e0f4ed709
|
Remove double brackets
|
2019-01-02 13:04:56 -05:00 |
|
Alam Ed Arias
|
13e3a975d8
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
764e6e7659
|
Merge branch 'expanded-nmuslist' into 'next'
Expand NMUSList to include HUD changes
See merge request STJr/SRB2!388
|
2019-01-01 15:06:04 -05:00 |
|
Digiku
|
4560b4cb41
|
Merge branch 'caps-lock-consistency-fix' into 'master'
Update capslock state on window re-focus
See merge request STJr/SRB2!436
|
2019-01-01 15:05:20 -05:00 |
|
Digiku
|
5149fb7d66
|
Merge branch 'appveyor-installer-revise' into 'master'
Make AppVeyor installer paths consistent with Travis installer paths
See merge request STJr/SRB2!446
|
2019-01-01 11:52:42 -05:00 |
|
mazmazz
|
7d66f912d0
|
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
|
2019-01-01 11:51:17 -05:00 |
|
Digiku
|
80dc98624b
|
Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
MinGW64:Target nocona for 64-bit builds [revision]
See merge request STJr/SRB2!440
|
2019-01-01 11:15:34 -05:00 |
|
Digiku
|
2374750d3c
|
Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise'
Add 64-bit job to Appveyor
See merge request STJr/SRB2!442
|
2019-01-01 10:14:37 -05:00 |
|