5cd8691a71
Don't draw multiple WANTED posters in splitscreen
2019-01-15 03:41:33 -05:00
c61fcc8db6
Fix really dumb flags on MT_SPBEXPLOSION
2019-01-14 21:55:10 -05:00
4ce528bea7
Attempt to fix the stupid bug where SPB decides to not hurt
2019-01-14 21:38:38 -05:00
0b299012f7
Reduce easing time, revert changing air speed
2019-01-14 21:37:53 -05:00
6ba69e9002
Missed this
2019-01-14 18:24:25 -05:00
e63d7537e0
bump maxskins to 64, fix overflow error
2019-01-14 18:16:07 -05:00
7d1e630007
Tiny SPB fixes
...
- Fix typo that could potentially invalidate the wait phase
- Prevent dying during target phase causing it to redirect to someone else
- Ease speed back up to default whenever slowed down
- SPB intensity now biases against high drift sparks + acceleration, instead of only acceleration.
- Slow speed is scaled w/ SPB intensity too
2019-01-14 02:01:00 -05:00
b560a90890
Gag spacing was not updated
2019-01-13 20:47:57 -05:00
9fb290577a
Merge branch 'gamepad-tweaks' into 'next'
...
Gamepad Improvements: Round 2
See merge request KartKrew/Kart-Public!24
2019-01-13 20:32:17 -05:00
dead0475ce
Allow any key to abort network connection, ignore non-keyboard keys in chat
2019-01-13 19:22:54 -06:00
75fa18b084
Merge branch 'polyobj_fix_public' into 'next'
...
Fix rendering gaps on polys with upper/lower textures
See merge request KartKrew/Kart-Public!26
2019-01-13 18:00:58 -05:00
148bd140c2
hook_cmd_running around the loop rather than inside
2019-01-13 20:16:53 +01:00
c2aa6d4de6
Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook
2019-01-13 14:40:48 +01:00
7e026824a4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
31ccae60c9
Revert "Enable d-pad on the vote screen"
...
Partial revert of commit 92a60b32de
2019-01-12 05:37:07 -06:00
8bbb63f52a
Forgot to trim whitespace
2019-01-12 12:28:15 +01:00
23f99bd28d
Fixed WANTED poster drawing over minimap, WANTED cursor being colormapped, and splitscreen position shifting stuff
2019-01-12 12:27:30 +01:00
2416d78224
Update comment to be more accurate
2019-01-12 05:12:20 -05:00
5ed4d0256e
spacing & ()
2019-01-12 05:03:05 -05:00
0ef5c2e388
Some house-cleaning
2019-01-12 05:01:36 -05:00
650522fc59
Don't increment ingame count without bumpers
2019-01-12 04:43:43 -05:00
24a32c2f51
Allow player-count modifiers in Battle
2019-01-12 04:31:35 -05:00
922f80b22f
Uncap player-count item distribution modifiers
...
Was an idea I had in development to make 16P less chaotic, but decided against it due to lack of testing and that it could backfire badly...
2019-01-12 04:30:41 -05:00
761aada745
Turn the "Music" section of the credits into only the people on Krew who contributes music
...
Meant to do this in song-credits, since individual songs are now properly credited there.
2019-01-12 04:13:49 -05:00
89f12599c6
Minor misc fixes
2019-01-12 02:53:14 -05:00
87ede1e934
Fix rendering gaps on polys with upper/lower textures
2019-01-11 21:21:56 -06:00
e443285801
Merge branch 'dehacked-versioning' into 'next'
...
Update SOC version, make base SRB2 SOC throw a warning
See merge request KartKrew/Kart-Public!11
2019-01-11 20:25:00 -05:00
2bd88fd6f8
Merge branch 'disable-xinput' into 'next'
...
-noxinput command line parameter
See merge request KartKrew/Kart-Public!21
2019-01-11 20:23:39 -05:00
4213a9cbb6
i,m gowonna update my name in the cwedits uwu
2019-01-11 18:11:52 -06:00
88b5a056c8
Fix the chat being incorrectly placed in splitscreen
2019-01-11 16:04:12 -06:00
622509682a
Fix chat toggle not working
2019-01-11 02:38:49 -06:00
d5e16dca63
Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
2019-01-11 00:18:45 -06:00
a8e0805261
-nohidapi parameter
...
Should fix problems where Switch Pro controllers suddenly had their mappings changed. Does not recognize controllers connected before game launch. Make sure to replug your controller after the game launches if using this param.
2019-01-10 23:12:06 -06:00
d72fcaecc6
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:38:57 -06:00
7a50ea2554
Merge remote-tracking branch 'remotes/public/next' into disable-xinput
2019-01-10 20:35:32 -06:00
45a1508f0a
Merge branch 'fix-chat' into 'next'
...
Fix splitscreen being forced into oldchat
See merge request KartKrew/Kart-Public!25
2019-01-10 18:43:14 -05:00
6c4decfef3
Don't check splitscreen in OLDCHAT
2019-01-10 13:52:58 -06:00
92a60b32de
Enable d-pad on the vote screen, allow aborting connection with more joy buttons
2019-01-10 06:10:16 -06:00
73369679f5
Fix player 2 not being able to play while the chat is open
...
Also attempts to fix the d-pad typing characters into the chat box.
2019-01-10 06:08:12 -06:00
5b05eff41f
Merge branch 'next' into music-credits
2019-01-10 01:14:02 -05:00
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
9975497a68
Remove this, doesn't work
2019-01-10 00:35:11 -05:00
cff7d2795d
Expose S_ShowMusicCredit to Lua
2019-01-09 21:17:24 -05:00
d3a38a4375
Add disable for music credit showing on the change music linedef
2019-01-09 21:17:10 -05:00
2ccdd3e4b7
Fix Music toggle trying to play a non-existent song in Kart
2019-01-09 21:13:06 -05:00
ed36f5ac16
Accidental unselected change
2019-01-09 21:12:33 -05:00
565b8f87fb
Show song credits if joining mid-game
...
Dunno if this works or not yet!
2019-01-09 21:01:56 -05:00
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
dbb7267f22
Missed a few spots
2019-01-09 15:53:59 -06:00
90148f79eb
If kmd2.dat isn't found in srb2home, search the game's directory for it
2019-01-09 15:38:37 -06:00
a444a214d0
Here too
2019-01-09 09:07:41 -06:00
d20122327f
Make sure cmd.latency is always 0 in mode attack?
2019-01-09 09:05:57 -06:00
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
5e682d612f
-noxinput command line parameter
2019-01-09 01:38:28 -06:00
81a7cdf6e8
oops
2019-01-09 00:49:32 -06:00
0a34d4bafa
Merge branch 'kart-public-travis-deployer' into 'next'
...
Implement OSX and Debian installer building for Travis
See merge request KartKrew/Kart-Public!8
2019-01-09 01:42:44 -05:00
2f30625c82
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
acfe6c4616
Don't use netticbuffer for servers
2019-01-08 23:27:51 -06:00
26af4e8561
Save stored turn ranges in NetArchivePlayers
2019-01-08 23:27:39 -06:00
100ce5958b
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 21:11:02 -06:00
01d7dc35ff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 20:56:14 -06:00
6792fd92aa
Experimental nettic buffer to stop net-induced frame drops?
2019-01-08 20:55:33 -06:00
cd71e94785
Remove filthy filthy cheats
2019-01-08 20:36:06 -06:00
1bacc4e395
Make starting boost timing compensate for latency
2019-01-08 20:27:54 -06:00
5e8e08ad95
Misc level init fixes
2019-01-08 20:14:58 -05:00
7806c43ecf
Kart Public Next merge
2019-01-08 18:43:49 -05:00
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
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
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
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
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
3a0217c8c8
Dummy out unused functions (OSX xcode errors)
2019-01-02 20:10:53 -05:00
b08e522aca
Better rewrite for addons draw adjustment [Kart]
2019-01-02 20:03:53 -05:00
4ea7c53d8e
Remove FIXUPO0 GCC pragma
2019-01-02 20:03:52 -05:00
6166b78c87
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2019-01-02 19:23:59 -05:00
963819c81d
Initialize skinnum for MD2 star colors (fix CLANG error)
2019-01-02 19:23:57 -05:00
c338115ebc
Fix strncpy nodenum length overflow
2019-01-02 19:23:56 -05:00
15b0e3ab51
Fix a randomly changed comment (?)
2019-01-02 15:45:04 -06:00
80390fdfa7
Whitespace fixes
2019-01-02 15:43:07 -06:00
69a760c923
Fix a duped line
2019-01-02 15:03:13 -06:00
4da56398ca
Rebind the talk key by default, but move it to D-Pad Down
2019-01-02 14:50:36 -06:00
e4830b1a3a
Turns out we don't need this
2019-01-02 14:47:24 -06:00
9a030bfd40
More cleanups and WANTED stuff
2019-01-02 20:36:13 +01:00
3273924743
Remove double brackets
2019-01-02 13:04:56 -05:00
819e4ef2ae
Merge branch 'master' into next
2019-01-01 23:00:39 -05:00
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
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
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
d6178a3a40
Comment this out again.
...
How did this even get reverted...
2018-12-31 18:34:04 -05:00
97295bb285
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2018-12-31 18:20:04 -05:00
6ad2c145d7
Better attempt at fixing this
2018-12-31 18:19:18 -05:00
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
5cd6b58c44
Remove accidental DEVELOP commit
2018-12-31 17:55:27 -05:00
749bc65caa
Attempt 1 to properly fix
2018-12-31 14:18:00 -05:00
18fea4f3b1
Revert "Fix per-map palette not being reset properly on title"
...
This reverts commit 1bb6ff27c8
2018-12-31 13:35:38 -05:00
91f9168a01
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:45:03 -05:00
d61eb7edee
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -05:00
07e7dba730
Also change DEFAULTWADLOCATION to SRB2Kart in SDL2
2018-12-31 00:21:19 -05:00
1bb6ff27c8
Fix per-map palette not being reset properly on title
2018-12-30 23:38:38 -05:00
9684dfd6f6
Change DEFAULTWADLOCATION to SRB2Kart
2018-12-30 21:13:02 -05:00
48d3df5c6e
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-30 19:39:44 -05:00
fa551a980b
Apply srb2home to debugfile
2018-12-30 19:39:42 -05:00
7616e30142
Apply srb2home to SAVECONFIG
2018-12-30 19:39:41 -05:00
de0da37691
EXEC: Search for CFG by file path
2018-12-30 19:39:39 -05:00
077469cbab
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-30 19:39:36 -05:00
9b698d24b9
Set srb2home name to srb2kart
2018-12-30 18:57:33 -05:00
346e11d6da
Update SDL mac icon to Kart
2018-12-30 15:59:42 -05:00
e2f5c99217
Implement deployer scripts for Travis -- OSX and Linux package building [Kart merge]
2018-12-30 15:41:58 -05:00
0ebe5b258c
Inclue PNG file
2018-12-29 23:10:45 -05:00
a7b96ab83d
Update XPM icon
2018-12-29 22:52:04 -05:00
3d2e58861d
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
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
629067c5eb
Cleaner code because I was a huge idiot
2018-12-29 21:46:40 +01:00
7091cb1cca
JoyInfo1 -> JoyInfo
...
Don't you love it when typos ruin everything? :P
2018-12-29 13:55:58 -06:00
50808cc48c
Alignment mistakes for nongreen
2018-12-29 11:17:51 +01:00
0114c2bc22
Clean up splitscreen huds to allow minimap
2018-12-29 10:59:34 +01:00
7a9e6161ae
Check joystick IDs against all other players [by Digiku]
...
Untested on my end, but conceptually sound.
2018-12-29 02:33:53 -06:00
266e255bb6
Reorganize some of the code for SDL_JOYDEVICEADDED events
2018-12-28 14:20:28 -06:00
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
cbc4529039
Disable DEVELOP, since this is ready to merge
2018-12-27 21:23:32 -06:00
d048e7cbec
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
eb729c55e4
Make I_GetJoystickDeviceIndex account for controllers 3 and 4
2018-12-27 18:28:09 -06:00
630552f428
Fix an issue where gamepad options for player 4 ended up binding settings for player 3 instead.
2018-12-27 18:13:13 -06:00
5ba0863876
Stupid restrictions
2018-12-27 19:00:18 -05:00
4a05fd5f26
More explict check
2018-12-27 18:54:10 -05:00
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
203050dc04
Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug-stableid' into gamepad-tweaks
...
# Conflicts:
# src/command.c
# src/command.h
# src/g_game.c
# src/m_menu.c
# src/sdl/i_system.c
# src/sdl/i_video.c
# src/sdl/sdlmain.h
This is NOT just a normal merge commit. I have adjusted the hotplugging code from stableid to account for the last two players, and also removed new 2.1 additions that were deemed irrelevant to Kart.
2018-12-27 16:21:51 -06:00
7e936d18d2
Merge branch 'master' into mobj-scale-global
2018-12-27 13:58:42 -05:00
6dddf61265
Target nocona for 64-bit builds
2018-12-27 00:56:33 -05:00
0b857f127f
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
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
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
60bdc056f8
Also hide Chat Options if NONET
2018-12-26 16:41:39 -05:00
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
2b870ef6d4
oops forgot this
2018-12-26 15:31:19 -06:00
814db7e371
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05:00
6954689b96
Clean up stuff I did while debugging
2018-12-26 14:51:06 -06:00
74f13c0889
Push bouncing players backwards if they get stuck in a wall
2018-12-26 14:51:05 -06:00
4f18ec60bc
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
fa6f791ec3
Fix -ANGLE_180 because MSVC complains
...
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
73a67fc9f5
Merge branch 'ctf-enemy-flag-sound' into 2122-version
2018-12-25 00:27:08 -05:00
842bcfc8a0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
a626660564
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-25 00:19:42 -05:00
0b81debf94
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
2018-12-25 00:09:24 -05:00
82a40f0dba
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
6d028fe8d9
Kill default d-pad bindings aside from "Show Rankings"
2018-12-24 21:30:42 -06:00
b7edc7f870
Revert "Merge branch 'side-discolor-fix' into 'master'"
...
This reverts commit e721a3d8824656a0d02c
2018-12-24 20:58:26 -05:00
bfc501a271
Revert default console backcolor to green; changed from CHAT commit
2018-12-24 20:57:11 -05:00
cb42702e6b
Merge branch 'float-compare-colormap-fix' into 'master'
...
Fix float comparison for colormap maskamt
See merge request STJr/SRB2!428
2018-12-24 20:55:06 -05:00
10a3e3fec9
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
c65f44e805
Remove log message
2018-12-24 20:33:59 -05:00
e9e5128754
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
4651eddc36
Merge branch 'master' into next
2018-12-24 20:15:45 -05:00
58728ec358
Fix float comparison for colormap maskamt
2018-12-24 19:58:05 -05:00
32697ddf61
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2018-12-24 18:51:11 -05:00
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
c2dc5788bf
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-24 17:30:59 -05:00
4c6334f459
cleanup
2018-12-24 17:21:33 -05:00
f06fd4149d
Merge branch 'polyobject-crush-fix-waypoint' into 'next'
...
Polyobject crush fix by waypoints [by TehRealSalt]
See merge request STJr/SRB2!426
2018-12-24 17:01:06 -05:00
c8f4d125b4
Merge branch 'master' into next
2018-12-24 16:56:29 -05:00
be9a04e489
Merge branch 'disablespeedadjust-fix' into 'next'
...
Disablespeedadjust fix
See merge request STJr/SRB2!425
2018-12-24 16:31:19 -05:00
878b1b2d16
Fix move by waypoints not checking for sector changes
...
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.
If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
2018-12-24 14:39:07 -05:00
31c6b6ef77
remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway
2018-12-24 19:37:52 +00:00
936b9ecebc
Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean
2018-12-24 19:29:54 +00:00
01588ea967
Fix bot players using the respawning code meant only for real players to use
2018-12-24 17:59:12 +00:00
ac9cb59de9
Do not increment mainwads for music.dta
2018-12-23 23:54:26 -05:00
9d1bc3063f
Play flag-returned SFX for the opposing team
2018-12-23 22:57:14 -05:00
cb13ace77e
Merge branch 'master' into sdl-autograb
2018-12-23 22:35:44 -05:00
ed410575d6
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
46d1a866d8
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00
cb01ebebed
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-23 18:09:54 -05:00
83a6f5d6ae
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-23 18:09:17 -05:00
c0a0c5ac5d
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
d72e3fe71c
Merge branch '2122-patch-dta-update' into '2122-version'
...
Changes related to 2.1.22 patch.dta update
See merge request STJr/SRB2!417
2018-12-23 18:08:38 -05:00
8d56c2f486
Merge branch 'addons-backport' into '2122-version'
...
Addons Menu backport to vanilla
See merge request STJr/SRB2!384
2018-12-23 18:08:06 -05:00
fa36b8f5a2
Merge branch 'menu-mpjoy-fix' into '2122-version'
...
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]
See merge request STJr/SRB2!420
2018-12-23 18:06:27 -05:00
2b8cdc0381
Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
...
This reverts commit c0c05043e6
2018-12-23 18:04:01 -05:00
c0c05043e6
Revert "Merge branch 'menu-mpjoy-fix' into 'next'"
...
This reverts commit b5d4bb35302d675750cf
2018-12-23 17:57:50 -05:00
b5d4bb3530
Merge branch 'menu-mpjoy-fix' into 'next'
...
Menu: Fix joystick events causing the player to move during multiplayer system menu
See merge request STJr/SRB2!414
2018-12-23 17:55:02 -05:00
7a64e3d1a8
Merge branch 'SRB2-CHAT' into '2122-version'
...
Chat and other multiplayer quality of life improvements.
See merge request STJr/SRB2!398
2018-12-23 17:53:54 -05:00
402860dc06
Merge branch 'loadconfig-defaultcontrols' into 'master'
...
Reset default controls for LOADCONFIG command
See merge request STJr/SRB2!403
2018-12-23 17:14:34 -05:00
b7d7472a88
Merge branch 'next' into SRB2-CHAT
2018-12-23 22:53:24 +01:00
2d675750cf
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
f55623ef9c
Clear all control keys before loading defaults in LoadConfig
2018-12-23 14:59:26 -05:00
40a037f603
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
f600c5fee0
Credits update
2018-12-23 14:41:41 -05:00
8f596376a9
Merge branch '2122-version' into execversion-filtercontrols
2018-12-23 14:30:24 -05:00
3277cf6976
Add JOY10 default to gc_centerview
2018-12-23 14:29:54 -05:00
dd4c7b539f
Fix joy button default override when filling keynum2 with default
2018-12-23 14:29:10 -05:00
db8e1c0393
Fix the chat being displayed in singleplayer if there are stillmessages
2018-12-23 10:50:36 +01:00
11f44f7ce9
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-23 10:30:37 +01:00
1b61e15b1b
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
3703a032f0
Buildbot fixes
2018-12-23 03:39:27 -05:00
7fb73cf2da
New patch.dta hash for 2.1.22
2018-12-23 03:22:32 -05:00
aa77038dfc
Add chat_on to non-key move event checks
2018-12-23 03:21:32 -05:00
6ebc41a554
Check target < MAXPLAYERS before PM
2018-12-23 02:25:58 -05:00
ec53032310
Fix mainwads check in d_main
2018-12-23 00:29:59 -05:00
31cfa255f2
Merge branch '2122-version' into 2122-patch-dta-update
2018-12-22 23:50:31 -05:00
e3d106d527
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-22 23:42:25 -05:00
b49cf11fb6
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-22 23:41:55 -05:00
33434395f7
Add SRB2 Community Contributors to Special Thanks
2018-12-22 23:41:43 -05:00
8723eb9aa2
Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update
2018-12-22 23:34:24 -05:00
66e13cf1cc
SDL:Auto grab input
2018-12-22 23:28:59 -05:00
94858aedfe
Extend HU_FONTSTART to STCFN022 (from 2.2)
2018-12-22 23:20:01 -05:00
a9fb17dab1
Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
...
This reverts commit 6400729034
2018-12-22 22:40:58 -05:00
56320a35ce
Use TinyFont for chat arrows
2018-12-22 22:40:04 -05:00
6400729034
Extend HU_FONTSTART to STCFN022 (from 2.2)
2018-12-22 21:48:24 -05:00
e0176670f4
Correct splitscreen check in OLDCHAT
2018-12-22 21:30:39 -05:00
7e9411f320
Minor code cleanup, CHAT
2018-12-22 21:17:01 -05:00
7285f9ff1d
Netcode: handle NULL in addrinfo lookup
2018-12-22 21:06:13 -05:00
a66a2021ba
Draw up and down arrows by string
2018-12-22 20:57:53 -05:00
fb3722a6f3
Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN
2018-12-22 20:52:32 -05:00
0ed9665a79
Added static library of SDL2 and SDL2_mixer for ARM systems
2018-12-22 20:48:15 -05:00
0f0e30924f
One more free(nodenum)
2018-12-22 20:35:12 -05:00
5badc11159
Fix integer overflow on for loop decrements
2018-12-22 20:18:25 -05:00
102fd11cb4
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
c5ec1e30a4
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix
...
Large room fix
2018-12-22 19:48:08 -05:00
4265be776c
Merge branch 'master' into next
2018-12-22 19:36:32 -05:00
194f9ea8c0
Merge branch 'next' into sw_largeroomfix
2018-12-22 19:34:22 -05:00
c7060aa5ad
Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message.
2018-12-22 16:44:58 +01:00
619dd9d08a
Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages.
2018-12-22 12:34:17 +01:00
8707b2f40a
Center window on current monitor during vidmode change
2018-12-22 01:43:58 -05:00
cb619e0353
Don't create movement events from joy or mouse when menu is active
2018-12-22 01:20:24 -05:00
1291d35e08
Don't allow non-keyboard keys to screenshot/gif in menus
2018-12-22 00:39:32 -05:00
10521d161c
Fix various bugs with the chat.
2018-12-21 22:28:28 -05:00
e42bcd5b68
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat
2018-12-21 20:29:33 -05:00
b6a917cda1
Added ARM/ARM64 to whole vc10 sln
...
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
a72d79da54
Merge branch 'master' into next
2018-12-21 17:41:19 +00:00
90832938c9
Re-order Special Thanks -- groups first, then names in ABC order
2018-12-21 11:40:35 -05:00
06ff171e19
Adjust vid.width floating point comparson for CHAT
2018-12-21 11:37:22 -05:00
e20c70d5fb
Skip setting control if keynum is -1 (for KEY_PAUSE) handling
2018-12-20 18:27:44 -05:00
41a25a68c9
Merge branch '2122-credits-update' into 'next'
...
Add sirjuddington and CodeImp to Special Thanks credits
See merge request STJr/SRB2!409
2018-12-20 18:06:08 -05:00
f1fea30045
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
f66ee8c4cd
Add sirjuddington and CodeImp to Special Thanks credits
2018-12-20 17:27:25 -05:00
9be1ee4ac7
Hardcode define MAJOREXECVERSION to MODVERSION
2018-12-20 17:16:04 -05:00
6affe807e8
Merge branch '2122-version' into 2122-execversion
2018-12-20 17:14:53 -05:00
58a2cec70f
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
2b59cfa63f
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:58:16 -02:00
b68e01cb2b
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:57:38 -02:00
9525de2d83
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
28c8ad3dbb
Merge branch 'jump-spin-axes' into 'next'
...
Feature: Jump/Spin axes
See merge request STJr/SRB2!389
2018-12-20 16:57:05 -05:00
75e570f2b4
Merge branch 'joy-jump-defaults' into 'next'
...
Assign joy button defaults for 1 and 2 player
See merge request STJr/SRB2!400
2018-12-20 16:56:09 -05:00
50221c47e9
Merge branch 'menu-2pcontrols-fix' into 'master'
...
Fix 2p control menu graying out
See merge request STJr/SRB2!407
2018-12-20 16:54:52 -05:00
2bdf56804c
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:53:24 -02:00
f405f1ae30
Merge branch 'cmake-dllpath-fix' into 'master'
...
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
2018-12-20 16:53:06 -05:00
9d93f54b67
bland
2018-12-20 18:52:51 -03:00
0519d8c52d
Update CMake paths for Windows DLLs
2018-12-20 16:46:40 -05:00
fe5001a38a
Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu
2018-12-20 16:40:59 -05:00
b57204fc12
Fix 2p control menu graying out
2018-12-20 16:38:58 -05:00
6f8b126586
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 16:30:37 -05:00
fcb65951b8
change implementation of square root
2018-12-20 17:37:06 -03:00
5b285a60a2
Update r_segs.c
2018-12-20 16:15:19 -03:00
ffd5061531
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
76fe78571e
fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic
2018-12-20 16:47:17 +00:00
dfbbab35f4
Merge branch 'master' into next
2018-12-20 16:41:21 +00:00
e2b8ff26db
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
2018-12-20 10:56:36 -05:00
dd107724de
Merge branch 'lua-nextmapoverride' into 'next'
...
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel
See merge request STJr/SRB2!396
2018-12-20 10:55:30 -05:00
71da6836c0
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
04916edc07
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
25f0dc7eae
Merge branch 'version-string-develop' into 'master'
...
Add DEVELOP build flag to version string
See merge request STJr/SRB2!401
2018-12-20 02:28:21 -05:00
7f8d16d3cd
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
60bcf92525
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
969960a1eb
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
ed7178bca4
Assign joy button defaults for 1 and 2 player
2018-12-20 01:47:35 -05:00
722ceb5285
Merge branch 'pk3-stray-blockmap-msg' into 'master'
...
Comment out stray PK3 blockmap message
See merge request STJr/SRB2!399
2018-12-20 01:11:44 -05:00
78501dcd0c
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
223257e237
Merge branch 'using-offsetof' into 'next'
...
Use the `offsetof` function
See merge request STJr/SRB2!394
2018-12-19 21:53:37 -05:00
2a0e6937a0
Extend joystick hotplugging to players 3 and 4
2018-12-19 18:08:38 -06:00
TehRealSalt