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
d61eb7edee
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
2018-12-31 01:43:47 -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
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
d048e7cbec
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
5ba0863876
Stupid restrictions
2018-12-27 19:00:18 -05:00
4a05fd5f26
More explict check
2018-12-27 18:54:10 -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
814db7e371
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05: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
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
Digiku