SeventhSentinel
|
e545a8ab7d
|
Merge remote-tracking branch 'next' into merge-srb2
|
2019-01-06 02:02:33 -05:00 |
|
Sal
|
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 |
|
SeventhSentinel
|
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 |
|
SeventhSentinel
|
49f2d65e95
|
Fix errors from merge
|
2019-01-06 01:00:30 -05:00 |
|
SeventhSentinel
|
daec4f9f7e
|
Merge remote-tracking branch 'srb2public/master' into merge-srb2
|
2019-01-05 18:42:58 -05:00 |
|
SeventhSentinel
|
73542c008c
|
merge srb2 next
|
2019-01-05 15:59:23 -05:00 |
|
SeventhSentinel
|
4de91cfea5
|
Load sounds.kart after patch.kart
|
2019-01-05 00:33:24 -05:00 |
|
Sal
|
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 |
|
Steel Titanium
|
888b5056d7
|
Clean up the comments a bit
|
2019-01-04 19:55:05 -05:00 |
|
Digiku
|
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 |
|
Digiku
|
c97dc5d3c4
|
Increase M_ChangecontrolResponse message buffer by 25 chars
|
2019-01-04 19:38:36 -05:00 |
|
Steel Titanium
|
a69239bfa8
|
Don't increment mainwads for sounds or music.kart
|
2019-01-04 00:32:01 -05:00 |
|
Sal
|
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 |
|
Sal
|
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 |
|
Sal
|
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 |
|
Steel Titanium
|
3273924743
|
Remove double brackets
|
2019-01-02 13:04:56 -05:00 |
|
Alam Ed Arias
|
819e4ef2ae
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
393c64b8bc
|
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
|
5278d1ca20
|
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
|
900a439c11
|
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
|
528c6f771a
|
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
|
2019-01-01 11:51:17 -05:00 |
|
Digiku
|
bbd878e520
|
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
|
ce7875b133
|
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 |
|
Digiku
|
bd81c3190e
|
Merge branch 'appveyor-deployer' into 'appveyor-64'
Add Windows installer building to AppVeyor
See merge request STJr/SRB2!443
|
2019-01-01 10:14:25 -05:00 |
|
Steel Titanium
|
d6178a3a40
|
Comment this out again.
How did this even get reverted...
|
2018-12-31 18:34:04 -05:00 |
|
Steel Titanium
|
6ad2c145d7
|
Better attempt at fixing this
|
2018-12-31 18:19:18 -05:00 |
|
mazmazz
|
f00cfb7b3f
|
Use optional asset archive instead of file
|
2018-12-31 17:31:25 -05:00 |
|
SeventhSentinel
|
5b4faa4ddb
|
Merge remote-tracking branch 'kartinternal/master' into next
|
2018-12-31 15:16:39 -05:00 |
|
Steel Titanium
|
749bc65caa
|
Attempt 1 to properly fix
|
2018-12-31 14:18:00 -05:00 |
|
Steel Titanium
|
18fea4f3b1
|
Revert "Fix per-map palette not being reset properly on title"
This reverts commit 1bb6ff27c8 .
|
2018-12-31 13:35:38 -05:00 |
|
mazmazz
|
d61eb7edee
|
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
|
2018-12-31 01:43:47 -05:00 |
|
Steel Titanium
|
1bb6ff27c8
|
Fix per-map palette not being reset properly on title
|
2018-12-30 23:38:38 -05:00 |
|
mazmazz
|
e1300d5173
|
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
|
2018-12-30 10:43:17 -05:00 |
|
mazmazz
|
941e29780c
|
Implement install building for appveyor (deployer)
|
2018-12-30 03:42:55 -05:00 |
|
mazmazz
|
bef0bc82e4
|
Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64
|
2018-12-29 23:46:16 -05:00 |
|
mazmazz
|
e7165444b4
|
Add 64-bit DD buildbot
|
2018-12-29 23:16:08 -05:00 |
|
mazmazz
|
0fc07ebaae
|
Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64%
|
2018-12-29 23:15:09 -05:00 |
|
mazmazz
|
2aa7ee70fe
|
Disable UPX by default in appveyor
|
2018-12-29 22:51:10 -05:00 |
|
mazmazz
|
34534428fd
|
Add 64-bit SDL builds to appveyor config
|
2018-12-29 22:17:41 -05:00 |
|
mazmazz
|
3d2e58861d
|
Rename M5 to ARCHOPTS; allow override by command line
|
2018-12-29 21:55:35 -05:00 |
|
mazmazz
|
4cfacf5cde
|
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
|
2018-12-29 21:14:50 -05:00 |
|
Digiku
|
80e30c6aaa
|
Merge branch 'MSVC-ARM' into 'master'
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
|
2018-12-28 01:05:40 -05:00 |
|
Steel Titanium
|
d048e7cbec
|
Don't set if LINUX64 is defined
|
2018-12-27 21:17:02 -05:00 |
|
Steel Titanium
|
5ba0863876
|
Stupid restrictions
|
2018-12-27 19:00:18 -05:00 |
|
Steel Titanium
|
4a05fd5f26
|
More explict check
|
2018-12-27 18:54:10 -05:00 |
|
fickleheart
|
90e553d81a
|
Use waypoint extrainfo to determine lap it works on
This can be useful to improve waypoint tracking on sprint maps.
|
2018-12-27 17:11:16 -06:00 |
|
Steel Titanium
|
6dddf61265
|
Target nocona for 64-bit builds
|
2018-12-27 00:56:33 -05:00 |
|
james
|
0b857f127f
|
Update capslock state on window re-focus
|
2018-12-26 15:49:57 -08:00 |
|
Digiku
|
da9447342c
|
Merge branch '2123-version' into 'master'
Update code versions to 2.1.23
See merge request STJr/SRB2!435
|
2018-12-26 17:14:58 -05:00 |
|
Digiku
|
ebb4c65d92
|
Merge branch 'srb2-chat-nonet' into 'master'
Hide SRB2-CHAT behind #ifndef NONET
See merge request STJr/SRB2!434
|
2018-12-26 17:13:23 -05:00 |
|