stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
5072 commits 60 branches 11 tags 94 MiB
Commit graph

5072 commits

This branch
This branch
All branches
Author SHA1 Message Date
wolfy852
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
Sal
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
TehRealSalt
b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
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
Sal
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
Sal
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
wolfy852
bcf687c3af Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00
wolfy852
e115dbf34f Cast animtimer to int before negating 
Stops a Visual Studio compile error.
 2019-01-06 03:02:12 -06:00
Sal
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
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
wolfy852
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
Sal
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
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
a10ac14462 turn these signed before abs-ing em 2019-01-05 00:42:36 -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
wolfy852
15b0e3ab51 Fix a randomly changed comment (?) 2019-01-02 15:45:04 -06:00
wolfy852
80390fdfa7 Whitespace fixes 2019-01-02 15:43:07 -06:00
wolfy852
ad7dc11b79 Revert CMake/Appveyor changes 2019-01-02 15:39:57 -06:00
wolfy852
69a760c923 Fix a duped line 2019-01-02 15:03:13 -06:00
wolfy852
4da56398ca Rebind the talk key by default, but move it to D-Pad Down 2019-01-02 14:50:36 -06:00
wolfy852
e4830b1a3a Turns out we don't need this 2019-01-02 14:47:24 -06: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
SeventhSentinel
1987dec652 This would probably be fine, but lets make it consistent like every other instance of this. 2018-12-31 17:59:42 -05:00
SeventhSentinel
5cd6b58c44 Remove accidental DEVELOP commit 2018-12-31 17:55:27 -05:00
mazmazz
f00cfb7b3f Use optional asset archive instead of file 2018-12-31 17:31:25 -05:00
SeventhSentinel
23d54095d9 Merge remote-tracking branch 'kartinternal/mobj-scale-global' into mobjscale-global 2018-12-31 16:18:33 -05:00
SeventhSentinel
5b4faa4ddb Merge remote-tracking branch 'kartinternal/master' into next 2018-12-31 15:16:39 -05:00
SeventhSentinel
7be6dab8a6 Merge branch 'master' into revert-master 2018-12-31 15:08:43 -05:00