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
e5e978f8bd
Merge branch 'master' into next
2018-12-19 13:20:54 -05:00
7982b1695a
Merge branch 'ogl-zfighting-fix' into 'master'
...
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00
bea76aa4bf
Merge branch 'save-override' into 'next'
...
Feature: Save override for level header
See merge request STJr/SRB2!392
2018-12-19 13:04:41 -05:00
4c69fe23f6
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Kart textures backport (non-foolish vers)
See merge request STJr/SRB2!391
2018-12-19 13:04:24 -05:00
387173ea89
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-19 16:50:49 +01:00
a31b85e124
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
96cad09db6
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
67cd6dcdd2
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
0e34e7f32f
G_SetCustomExitVars for setting nextmapoverride & skipstats
...
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
2018-12-18 14:48:04 -05:00
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 14:11:43 -05:00
d5c7ca1d23
Merge branch 'master' into next
2018-12-18 14:05:07 -05:00
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes
...
Software plane fixes
2018-12-18 14:02:21 -05:00
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 13:57:48 -05:00
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
9f17039e2e
Merge branch 'srb2chat' into 'SRB2-CHAT'
...
fix my fucking code
See merge request SinnamonLat/SRB2!1
2018-12-18 11:51:18 -05:00
1fcf607b41
Fix strncpy nodenum length overflow
2018-12-17 21:31:00 -05:00
876ddd48f1
Change int to INT32
2018-12-17 19:09:05 -05:00
bf21b7c483
Mixed D&C fixes for HU_DrawTeamTabRankings
2018-12-17 19:03:09 -05:00
7a92c9d3d0
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
245a125551
Fix compile errors
2018-12-17 18:55:21 -05:00
bd58ff8c49
Merge branch 'frame-backslash-fix' into 'next'
...
Accept '+' as substitute for '\' for sprite frames (PK3)
See merge request STJr/SRB2!380
2018-12-17 17:34:41 -05:00
ca4329bcb6
fix the fucking warning
2018-12-17 18:09:29 -03:00
82601e881b
fix my fucking code
2018-12-17 17:57:53 -03:00
2fdf27c507
make sure to change p_dispy and not y for /pm list. Also make MPC happy.
2018-12-17 21:39:49 +01:00
ff957baae3
Don't overlap ringslinger HUD
2018-12-17 21:31:31 +01:00
1d40676f3a
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 17:46:17 -02:00
f3956ffb4c
Merge branch 'master' into sw_planefixes
2018-12-17 17:45:36 -02:00
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
b64dd82034
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
e9be5e895e
Merge branch 'master' into next
2018-12-17 17:34:41 +00:00
b958f00f17
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
9e596d15af
Save override for level header
...
Kind of like 2.2's, but with backwards-compatability with 2.1
2018-12-16 20:09:59 -05:00
6dbe930997
Use labs for long value
2018-12-16 19:47:02 -05:00
2d2bd59099
Remove FIXUPO0 GCC pragma
2018-12-16 19:39:16 -05:00
296b678d7e
Wstrict-overflow adjustment
2018-12-16 19:38:46 -05:00
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
e763eab6cd
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
c69cfefb6d
2.2 backport of jump/spin axes
...
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
6b1b11441d
Merge branch 'sdl-sound-fix' into 'master'
...
SDL: Force use DirectSound driver to fix wrong-pitch sound effects
See merge request STJr/SRB2!375
2018-12-16 17:16:49 -05:00
1b7a9aaa01
2.1 Score/Time/Rings lump name
2018-12-16 16:53:13 -05:00
899120e475
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
d7321fd8c4
Pull expanded NMUSlist from 2.2
2018-12-16 16:40:40 -05:00
046d36a657
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
6d94568f4b
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
cc22ef3f05
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
c3ff0b6d16
Uncomment Secrets menu toggle when exiting Addons
2018-12-16 15:52:01 -05:00
6e79722437
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
11aef0b3f1
Merge branch 'master' into float_equal
2018-12-16 13:52:45 -05:00
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
f0967520ed
Compile fixes; enable PK3 support in addons menu
...
* Add missing vars highlightflags, recommendedflags, warningflags from Kart
* V_GetStringColormap() use vanilla behavior because Kart behavior glitches for us
* V_GetStringColormap() made non-static
2018-12-15 21:44:39 -05:00
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
0a3b3736bf
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
78634679f1
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
f4ce770c1c
try out using offsetof for these three macros in d_clisrv.h
2018-12-14 23:56:11 +00:00
e0079ea1a2
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
de96fe8e7b
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 09d9a555c6
2018-12-14 16:47:38 -05:00
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
66efc7ea7f
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
09d9a555c6
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
9c04a066d9
Update r_plane.h
2018-12-14 15:49:32 -03:00
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
02fc845a72
Make sure nptfront is explicitly > 0, so we don't alloc a poly for negative number points at all
2018-12-14 18:01:18 +00:00
4089b6b8e9
use continue if NULL instead of a big if block if ...not NULL
...
also, SplitPoly returns if ps < 0, so there's no need to check for ps >= 0 afterwards
2018-12-14 18:00:08 +00:00
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
880c017f8f
Merge branch 'cfg-srb2home-fix' into 'master'
...
Apply srb2home path to EXEC, SAVECONFIG, and debugfile
See merge request STJr/SRB2!379
2018-12-13 16:16:52 -05:00
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz