mazmazz
cb619e0353
Don't create movement events from joy or mouse when menu is active
2018-12-22 01:20:24 -05:00
TehRealSalt
1291d35e08
Don't allow non-keyboard keys to screenshot/gif in menus
2018-12-22 00:39:32 -05:00
Steel Titanium
10521d161c
Fix various bugs with the chat.
2018-12-21 22:28:28 -05:00
Steel Titanium
e42bcd5b68
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat
2018-12-21 20:29:33 -05:00
Alam Arias
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
Monster Iestyn
a72d79da54
Merge branch 'master' into next
2018-12-21 17:41:19 +00:00
mazmazz
90832938c9
Re-order Special Thanks -- groups first, then names in ABC order
2018-12-21 11:40:35 -05:00
mazmazz
06ff171e19
Adjust vid.width floating point comparson for CHAT
2018-12-21 11:37:22 -05:00
mazmazz
e20c70d5fb
Skip setting control if keynum is -1 (for KEY_PAUSE) handling
2018-12-20 18:27:44 -05:00
Digiku
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
mazmazz
f1fea30045
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
mazmazz
f66ee8c4cd
Add sirjuddington and CodeImp to Special Thanks credits
2018-12-20 17:27:25 -05:00
mazmazz
9be1ee4ac7
Hardcode define MAJOREXECVERSION to MODVERSION
2018-12-20 17:16:04 -05:00
mazmazz
6affe807e8
Merge branch '2122-version' into 2122-execversion
2018-12-20 17:14:53 -05:00
Digiku
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
Jimita
2b59cfa63f
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:58:16 -02:00
Jimita
b68e01cb2b
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:57:38 -02:00
Digiku
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
Digiku
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
Digiku
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
Digiku
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
Jimita
2bdf56804c
Merge branch 'next' into sw_largeroomfix
2018-12-20 19:53:24 -02:00
Digiku
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
MPC
9d93f54b67
bland
2018-12-20 18:52:51 -03:00
mazmazz
0519d8c52d
Update CMake paths for Windows DLLs
2018-12-20 16:46:40 -05:00
mazmazz
fe5001a38a
Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu
2018-12-20 16:40:59 -05:00
mazmazz
b57204fc12
Fix 2p control menu graying out
2018-12-20 16:38:58 -05:00
mazmazz
6f8b126586
Add G_FilterKeyByVersion() to setcontrol
2018-12-20 16:30:37 -05:00
MPC
fcb65951b8
change implementation of square root
2018-12-20 17:37:06 -03:00
Jimita
5b285a60a2
Update r_segs.c
2018-12-20 16:15:19 -03:00
Jimita
ffd5061531
Merge branch 'next' into sw_largeroomfix
2018-12-20 16:56:05 -02:00
Monster Iestyn
76fe78571e
fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic
2018-12-20 16:47:17 +00:00
Monster Iestyn
dfbbab35f4
Merge branch 'master' into next
2018-12-20 16:41:21 +00:00
mazmazz
e2b8ff26db
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua
2018-12-20 10:56:36 -05:00
Digiku
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
mazmazz
71da6836c0
Reset default controls for LOADCONFIG command
2018-12-20 10:13:43 -05:00
mazmazz
04916edc07
Update EXECVERSION to MODVERSION 27
2018-12-20 04:03:35 -05:00
mazmazz
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
Digiku
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
mazmazz
7f8d16d3cd
Add DEVELOP build flag to version string
2018-12-20 02:27:30 -05:00
mazmazz
60bcf92525
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
mazmazz
969960a1eb
Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro
2018-12-20 02:18:11 -05:00
mazmazz
ed7178bca4
Assign joy button defaults for 1 and 2 player
2018-12-20 01:47:35 -05:00
Digiku
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
mazmazz
78501dcd0c
Comment out stray PK3 blockmap message
2018-12-20 01:11:07 -05:00
Digiku
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
Alam Ed Arias
e5e978f8bd
Merge branch 'master' into next
2018-12-19 13:20:54 -05:00
Digiku
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
Digiku
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
Digiku
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
Latapostrophe
387173ea89
Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
2018-12-19 16:50:49 +01:00
Latapostrophe
a31b85e124
Some messages relevant to discussions now go in the chat.
2018-12-19 16:44:57 +01:00
mazmazz
96cad09db6
Change 0.05 to 0.05f
2018-12-18 16:59:59 -05:00
Azeonus
67cd6dcdd2
dispoffset OGL fix [by Azeonus]
2018-12-18 16:50:03 -05:00
TehRealSalt
42a9e66883
Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication.
2018-12-18 15:03:54 -05:00
TehRealSalt
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
Alam Arias
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 14:11:43 -05:00
Alam Ed Arias
d5c7ca1d23
Merge branch 'master' into next
2018-12-18 14:05:07 -05:00
Alam Arias
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes
...
Software plane fixes
2018-12-18 14:02:21 -05:00
Alam Arias
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-18 13:57:48 -05:00
TehRealSalt
03a4bd8f53
Revert default changes
...
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
Latapostrophe
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
mazmazz
1fcf607b41
Fix strncpy nodenum length overflow
2018-12-17 21:31:00 -05:00
mazmazz
876ddd48f1
Change int to INT32
2018-12-17 19:09:05 -05:00
mazmazz
bf21b7c483
Mixed D&C fixes for HU_DrawTeamTabRankings
2018-12-17 19:03:09 -05:00
mazmazz
7a92c9d3d0
Mixed D&C fixes; replace a couple int's with INT32
2018-12-17 19:02:22 -05:00
mazmazz
245a125551
Fix compile errors
2018-12-17 18:55:21 -05:00
Monster Iestyn
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
MPC
ca4329bcb6
fix the fucking warning
2018-12-17 18:09:29 -03:00
MPC
82601e881b
fix my fucking code
2018-12-17 17:57:53 -03:00
Latapostrophe
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
Latapostrophe
ff957baae3
Don't overlap ringslinger HUD
2018-12-17 21:31:31 +01:00
Jimita
1d40676f3a
Merge branch 'master' into automap_fix
2018-12-17 17:46:29 -02:00
Jimita
3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 17:46:17 -02:00
Jimita
f3956ffb4c
Merge branch 'master' into sw_planefixes
2018-12-17 17:45:36 -02:00
Latapostrophe
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
mazmazz
b64dd82034
Attempt to fix cv_execversion being accessible by console
2018-12-17 13:39:24 -05:00
mazmazz
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
Jimita
362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
Monster Iestyn
e9be5e895e
Merge branch 'master' into next
2018-12-17 17:34:41 +00:00
mazmazz
b958f00f17
Better rewrite for addons draw adjustment
2018-12-17 10:59:27 -05:00
TehRealSalt
bef3bb23f8
Undo dc92bb49
2018-12-16 21:36:54 -05:00
TehRealSalt
97639848e1
Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport
2018-12-16 21:22:06 -05:00
TehRealSalt
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
mazmazz
6dbe930997
Use labs for long value
2018-12-16 19:47:02 -05:00
mazmazz
2d2bd59099
Remove FIXUPO0 GCC pragma
2018-12-16 19:39:16 -05:00
mazmazz
296b678d7e
Wstrict-overflow adjustment
2018-12-16 19:38:46 -05:00
TehRealSalt
ec53e12294
Foolish
2018-12-16 18:19:53 -05:00
TehRealSalt
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
Alam Ed Arias
14e98df69b
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
...
This reverts merge request !387
2018-12-16 22:57:39 +00:00
TehRealSalt
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
Monster Iestyn
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
mazmazz
1b7a9aaa01
2.1 Score/Time/Rings lump name
2018-12-16 16:53:13 -05:00
mazmazz
899120e475
Revert NMUSlist to original 2.1
2018-12-16 16:42:57 -05:00
mazmazz
d7321fd8c4
Pull expanded NMUSlist from 2.2
2018-12-16 16:40:40 -05:00
mazmazz
046d36a657
Remove Kart entries from NMUSlist
2018-12-16 16:08:31 -05:00
mazmazz
6d94568f4b
Hide kart-specific addons behavior behind USE_KART
2018-12-16 16:07:47 -05:00
TehRealSalt
cc22ef3f05
Add deprecation warning to admin
2018-12-16 16:05:18 -05:00
TehRealSalt
4ba23e1028
Expose R_TextureNumForName
...
Backport from SRB2Kart
2018-12-16 15:58:47 -05:00
mazmazz
c3ff0b6d16
Uncomment Secrets menu toggle when exiting Addons
2018-12-16 15:52:01 -05:00
Alam Ed Arias
6e79722437
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
Alam Ed Arias
11aef0b3f1
Merge branch 'master' into float_equal
2018-12-16 13:52:45 -05:00
Latapostrophe
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
mazmazz
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
mazmazz
37950341ec
Merge remote-tracking branch 'public-gitlab/next' into addons-backport
2018-12-15 20:52:46 -05:00
mazmazz
0a3b3736bf
Handle Kart-specific changes; add PK3 to exttable
2018-12-15 20:50:33 -05:00
mazmazz
b32f50648d
Merge branch 'addons_menu' into 'master'
...
Addons menu
See merge request KartKrew/Kart!8
2018-12-15 20:46:42 -05:00
Alam Ed Arias
15d0673685
fix compiling for clang
2018-12-14 21:31:37 -05:00
Alam Ed Arias
78634679f1
fix compiling for MSVC
2018-12-14 20:42:37 -05:00
Alam Ed Arias
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
Monster Iestyn
f4ce770c1c
try out using offsetof for these three macros in d_clisrv.h
2018-12-14 23:56:11 +00:00
Monster Iestyn
e0079ea1a2
remove NearVertice (which was unused anyway), clean up maz's changes
2018-12-14 23:28:07 +00:00
mazmazz
de96fe8e7b
Revert "compiler SSE tweak for 32-bit"
...
This reverts commit 09d9a555c6
2018-12-14 16:47:38 -05:00
mazmazz
abae63a64b
SameVertice floating point match; fixes 64-bit OGL holes
2018-12-14 16:47:24 -05:00
mazmazz
66efc7ea7f
Merge remote-tracking branch 'public-gitlab/opengl-bsp-cleanup' into opengl-bsp-cleanup
2018-12-14 16:23:42 -05:00
Monster Iestyn
c1e0041a0b
copy doom legacy's replacement for the den == 0.0 calc in fracdivline
2018-12-14 21:22:13 +00:00
mazmazz
09d9a555c6
compiler SSE tweak for 32-bit
2018-12-14 16:21:07 -05:00
Monster Iestyn
623d1574ce
minor cleanup
2018-12-14 21:00:53 +00:00
MPC
9c04a066d9
Update r_plane.h
2018-12-14 15:49:32 -03:00
Monster Iestyn
b42c306ef3
remove code from SearchDivline that was disabled ...and doesn't seem to exist anymore anyway
2018-12-14 18:14:08 +00:00
Monster Iestyn
52fd3dcbed
split loading status code into a separate function
2018-12-14 18:11:30 +00:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
3a125dbbd5
compare with actual doubles, not ints
2018-12-14 17:14:03 +00:00
Jimita
cf792ef4f3
Merge branch 'master' into the_second_remote_view_camera_fix
2018-12-14 15:09:24 -02:00
MPC
9c2197db17
Software plane fixes
2018-12-14 14:08:25 -03:00
Jimita
d70dbada1c
Merge branch 'master' into automap_fix
2018-12-14 15:07:53 -02:00
Monster Iestyn
ef6533fb83
Merge branch 'master' into next
2018-12-13 22:21:31 +00:00
Monster Iestyn
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
mazmazz
dc7992a815
R_Char2Frame special case for backslash: accept plus as substitute
2018-12-13 14:59:12 -05:00
mazmazz
d18b2cda59
Apply srb2home to saveconfig ONLY if srb2home isn't already there
2018-12-13 13:32:38 -05:00
mazmazz
93f7f0a8df
Apply srb2home to debugfile
2018-12-13 13:23:09 -05:00
mazmazz
b1641aa8e9
Apply srb2home to SAVECONFIG
2018-12-13 13:17:56 -05:00
mazmazz
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
mazmazz
b84470ec51
Fix savegamename being improperly built due to missing null char after copying timeattackfolder
2018-12-13 12:01:07 -05:00
Jimita
e628d98f20
Update am_map.c
2018-12-12 19:59:21 -02:00
Jimita
a5874019cb
Update am_map.c
2018-12-12 19:57:52 -02:00
MPC
649b6c9ca1
Remove MINIAUTOMAP code
2018-12-12 18:53:13 -03:00
MPC
6b22dc183b
Fix the automap
2018-12-12 18:01:52 -03:00
Jimita
966afb6017
Update p_user.c
2018-12-12 13:09:47 -02:00
MPC
c68875ad93
Fix remote viewpoint cameras for real
...
I'm so sorry
2018-12-11 20:48:45 -03:00
Monster Iestyn
582c5332f4
Add some checks to prevent invalid awayviewmobjs from crashing the game. Not fullproof but at the least the P_CameraThinker crash no longer happens
2018-12-11 18:39:58 +00:00
MPC
348ed1e43f
Large room fix
2018-12-09 19:34:17 -03:00
mazmazz
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
mazmazz
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
mazmazz
df89781623
Windows string adjustment
2018-12-06 15:42:58 -05:00
mazmazz
ba60989c00
Adjust version strings
2018-12-06 15:39:19 -05:00
Digiku
17e9188c89
Merge branch 'execversion' into '21-version'
...
Block previous versions' config defaults with EXECVERSION consvar
See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
mazmazz
0be61e8830
a stray if block
2018-12-06 12:03:53 -05:00
mazmazz
a5eb62b73e
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
mazmazz
70aa4ce18e
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
mazmazz
f0c7848e50
Use proper DD define for use_joystick
2018-12-06 06:50:18 -05:00
mazmazz
5b3a1e0c55
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
mazmazz
a802069313
Move joyaxis_fire default to right trigger
2018-12-06 05:55:56 -05:00
mazmazz
aaf5d2e1dc
Change 2p controller defaults
2018-12-06 05:26:28 -05:00
mazmazz
9055c9aeab
Hex instead of octal colors
2018-12-05 13:08:25 -05:00
mazmazz
c5b349ddc4
More concise bitness check
2018-12-05 13:06:56 -05:00
mazmazz
1ea2fa447a
Make the ifdefs cleaner
2018-12-05 13:00:42 -05:00
mazmazz
389c2d4ea1
_WINDOWS instead of _WIN32 for DD
2018-12-05 12:55:05 -05:00
mazmazz
6d9fb0d3fd
Merge remote-tracking branch 'public-gitlab/21-version' into versionflags
2018-12-05 12:49:21 -05:00
Monster Iestyn
aee8dcdff8
Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server
...
it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck
2018-12-05 17:39:02 +00:00
mazmazz
a6dcd5555e
Add various flags to version string
2018-12-05 11:43:33 -05:00
Monster Iestyn
ae14fd2f85
Fix motd being broken for admins
...
It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands
2018-12-04 21:09:28 +00:00
Monster Iestyn
b4b82e681c
Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart
2018-12-04 18:54:36 +00:00
Monster Iestyn
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
Digiku
e6e5856fd8
Merge branch 'auto-joystick' into 'master'
...
Use Joystick 1 and Joystick 2 by default if plugged in
See merge request STJr/SRB2!364
2018-12-04 11:53:58 -05:00
Digiku
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Monster Iestyn
d1a8e3acdb
Merge branch 'tiny-makefile-fix' into 'master'
...
Tiny Makefile Fix
See merge request STJr/SRB2!289
2018-12-04 08:09:27 -05:00
mazmazz
c799584f3d
Change joystick default to auto-use joystick 1 and joystick 2 if plugged in (like Kart)
2018-12-03 23:36:36 -05:00
mazmazz
60feae1014
Update OSX icon
2018-12-03 23:09:54 -05:00
Digiku
ba81e26f71
Merge branch 'controller-menu-touchup' into 'master'
...
Controller select menu improvements.
See merge request STJr/SRB2!354
2018-12-03 23:00:36 -05:00
Digiku
42cb597731
Merge branch 'joystick-juggling-two' into 'next'
...
Joystick additions for menu, axis defaults, and vertical look toggle
See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
Steel Titanium
fbb2cde800
Make this be consistent with non-CMake builds
2018-12-03 15:42:37 -05:00
Steel Titanium
168647275c
One small change
2018-12-03 13:32:24 -05:00
mazmazz
6ca1130551
Hardcode Screenshot, GIF, and Viewpoint to their F keys
2018-12-03 13:21:16 -05:00
mazmazz
205e52f6d4
thisjoyaiming fix for chasefreelook
2018-12-03 13:13:01 -05:00
mazmazz
7ce092128b
Revert "Make pause key bring up the menu if it's a joy button"
...
This reverts commit 9de31cf2e7
2018-12-03 13:11:48 -05:00
mazmazz
6730c6c765
Menu for joy first/third person vertical look
2018-12-03 13:10:49 -05:00
mazmazz
ed57d0d9f9
Add Joy2 for network abort
2018-12-03 13:10:47 -05:00
mazmazz
9de31cf2e7
Make pause key bring up the menu if it's a joy button
...
* Add "Pause" entry to multiplayer control panel to give joy users a way to pause in netgames
2018-12-03 13:10:27 -05:00
mazmazz
7e523a1e35
Reset vertical look when toggling joyaiming
2018-12-03 13:10:24 -05:00
mazmazz
0bb113130b
Add alwaysfreelook to joystick menu
2018-12-03 13:10:20 -05:00
mazmazz
59cabea8bd
Add joyaiming qualifier for joystick look up/down
2018-12-03 13:10:19 -05:00
mazmazz
3134d72c12
Preserve event ch for other responders
2018-12-03 13:10:18 -05:00
mazmazz
6bf31492b7
Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)
2018-12-03 13:10:16 -05:00
mazmazz
6dd44ca1de
Change PC axis defaults to 360-friendly values
2018-12-03 13:10:15 -05:00
mazmazz
78dde93f3e
Remap menu actions to better joy keys
2018-12-03 13:10:12 -05:00
mazmazz
06faf6ffe4
Unneeded input header in st_stuff
2018-12-03 12:36:42 -05:00
mazmazz
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
mazmazz
6c78af3542
Missed (unused?) viewpoint strings
2018-12-03 12:20:19 -05:00
mazmazz
3d8bc85494
Forgot config strings for menu keys
2018-12-03 12:19:41 -05:00
mazmazz
5314c0e36b
Make F12 spectator string constant because of wrapping issues
2018-12-03 12:13:36 -05:00
mazmazz
60b16289e5
Change spectator string for "Press F12 to watch"
2018-12-03 12:11:03 -05:00
mazmazz
31f23fda8d
Add gc_viewpoint from Kart
2018-12-03 11:50:57 -05:00
mazmazz
2a87093ece
Add gc_screenshot and gc_recordgif from Kart
2018-12-03 11:31:48 -05:00
mazmazz
8e190932e7
Add gc_systemmenu from Kart
2018-12-03 11:21:25 -05:00
mazmazz
d8e70c32e0
Remove console messages for joynames
2018-12-03 05:39:10 -05:00
mazmazz
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
Monster Iestyn
978a28004d
add deadzone + storing of previous joyx/y values etc to attempt to make joysticks less sensitive in menus
2018-12-02 21:52:30 +00:00
Monster Iestyn
13b0e9c3c5
make menu respond to joystick axis events without joyscale having to be 0
2018-12-02 21:18:28 +00:00
MonsterIestyn
10832db244
Merge branch 'next' into lua_mapchange
2018-12-02 20:54:32 +00:00
Monster Iestyn
a63ba7084a
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
...
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
Monster Iestyn
ce4e63a366
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
2018-12-02 17:12:05 +00:00
Monster Iestyn
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
wolfy852
e12890c84e
s
2018-12-02 09:08:05 -06:00
wolfy852
2af04203ea
Fix a dumb mistake
2018-12-02 08:57:35 -06:00
Steel Titanium
0f11116e7b
Fix up controller menu support
2018-12-01 20:13:14 -05:00
Monster Iestyn
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
Jimita
6d7689c1a7
Merge branch 'next' into lua_mapchange
2018-11-30 15:10:59 -02:00
MPC
54cae84849
Change MapChange so Lua returns the map number you change
2018-11-30 14:01:40 -03:00
Monster Iestyn
e0a1c43813
Free lump names *before* either lumpinfo or the WAD itself!
2018-11-30 14:19:47 +00:00
Sryder
bc1f08f89d
Fix 2 of the Unsuffixed Float Constant warnings
...
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
Sryder
c5e8e0badb
Merge branch 'master' into tiny-makefile-fix
2018-11-29 21:57:47 +00:00
Monster Iestyn
305ad4f73e
backport some cleanup that I clearly missed wasn't there already to do with ZWAD lump loading
2018-11-29 14:16:02 +00:00
wolfy852
c517862f7e
I must be some kind of idiot.
2018-11-29 07:34:05 -06:00
wolfy852
d294be2054
Fix a quick merge mistake.
2018-11-29 07:15:54 -06:00
TehRealSalt
c70cf5908d
IsPlayerAdmin support, since admin was removed
...
# Conflicts:
# src/lua_baselib.c
2018-11-29 07:12:15 -06:00
Wolfy
b59718d3ad
Remove hardcoded limit on admins
...
# Conflicts:
# src/d_netcmd.c
2018-11-29 07:05:49 -06:00
Wolfy
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Monster Iestyn
e158206e55
backport string len tweaks I made to LUA_LoadLump in internal
2018-11-27 23:06:31 +00:00
Monster Iestyn
cb53bc8afe
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
Monster Iestyn
cd57be640c
Merge branch '21-controls' into 'next'
...
Default control changes for 2.1.21
See merge request STJr/SRB2!343
2018-11-27 11:50:42 -05:00
Monster Iestyn
3e6388c183
use UINT8 * instead of void or Bytef *
2018-11-27 15:49:41 +00:00
Monster Iestyn
6e839d30a2
Merge branch 'master' into next
2018-11-27 15:31:28 +00:00
Monster Iestyn
95e13d9ad3
Merge branch 'save-soundmenu-toggles' into 'master'
...
Save sound toggles to config
See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
Monster Iestyn
1889c36dea
add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?)
2018-11-27 13:57:32 +00:00
Alam Ed Arias
b7f7c2ecf7
PK3: fixup support for newer version of zlib
2018-11-26 20:08:26 -05:00
Alam Ed Arias
9a042cd5e2
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
Alam Ed Arias
78a1931bdf
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
Alam Ed Arias
5a3f469593
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
Alam Ed Arias
ac2ec6c982
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
Alam Ed Arias
4e332b3848
Fix MSVC build
2018-11-26 18:27:07 -05:00
Digiku
a2678dcb2e
Merge branch 'public-nights-invertloopfix' into 'next'
...
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2!300
2018-11-26 16:08:24 -05:00
Digiku
fd891aa21d
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
2018-11-26 15:48:08 -05:00
Monster Iestyn
4b0d45afd8
Merge branch 'opengl-noloading' into 'master'
...
Hide OpenGL loading screen
See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
MonsterIestyn
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
a71ca1d259
Merge branch 'fof-slope-skew-backport' into 'master'
...
FOF wall slope skewing backport
See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
Steel Titanium
ba111d42ca
Last minute changes.
2018-11-26 00:24:11 -05:00
Steel Titanium
cf01e820c4
Take the command line params into account
...
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
930835f1a2
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
Monster Iestyn
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
Steel Titanium
7d4c9dda91
Add newline to end of file
2018-11-25 14:24:50 -05:00
Steel Titanium
981a1192fb
Save sound toggles to config
2018-11-25 14:22:52 -05:00
Monster Iestyn
aaabf062b8
Merge branch 'ms-cvars-fix' into 'master'
...
Update server name insantly
See merge request STJr/SRB2!344
2018-11-25 14:04:12 -05:00
Monster Iestyn
5069acb110
Merge branch 'mpc-software-yslope-fix' into 'master'
...
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
2018-11-25 11:51:54 -05:00
Monster Iestyn
028236006b
Merge branch '21-copyright-followup' into 'master'
...
Print copyright notice in stdout console on program start
See merge request STJr/SRB2!347
2018-11-25 11:07:34 -05:00
Monster Iestyn
8b4a64ac05
Merge branch 'last-min-cleanup' into 'master'
...
Last min cleanup
See merge request STJr/SRB2!342
2018-11-25 10:14:34 -05:00
Monster Iestyn
11cb2e05ba
Merge branch 'cmake-use-internal-libs' into 'master'
...
CMake: Use internal libs.
See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
Monster Iestyn
85305791d8
Merge branch 'objectplace-skybox-fix' into 'next'
...
Objectplace skybox fix.
See merge request STJr/SRB2!319
2018-11-25 09:30:16 -05:00
mazmazz
e4d7ba39a9
Whitespace
2018-11-25 08:17:57 -05:00
mazmazz
83531469d7
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
Digiku
40dfe89273
Merge branch '21-source-copyright' into 'master'
...
Update source copyrights to 2018
See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
bd4743007e
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Digiku
62443c9090
Merge branch '21-credits-update' into 'master'
...
Extra credits update .21
See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
Nev3r
d7b3cf9314
Forgot the alignment for compact structs.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
Nev3r
b48c1d1ce6
Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
...
# Conflicts:
# src/w_wad.c
2018-11-25 11:18:28 +01:00
Nev3r
32a9e40baa
Progress?
...
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:11:50 +01:00
Nev3r
7c44054aa3
Take out the ifdef?
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
Steel Titanium
f3ea628fea
Update server name instantly on change
2018-11-24 21:24:05 -05:00
Alam Ed Arias
1113849f5c
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 18:00:14 -05:00
Nev3r
ec67c4cbd6
Fix uninitialized pointer.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
Alam Ed Arias
1bcfe16933
Do not remove newlines from the end of files
2018-11-24 17:30:49 -05:00
Alam Ed Arias
4ac481bcc6
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 17:22:11 -05:00
Nevur
3f69e7c9b4
Merge branch 'next' into PK3-BackportNext
2018-11-24 23:08:52 +01:00
Nev3r
a1fb333e9b
Revamped the lumpinfo_t array generation code.
...
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
mazmazz
f80691eb6e
Revert "Adjust mouse scaling calculation for SDL in windowed mode"
...
This reverts commit 3b298b7c42
2018-11-24 15:36:50 -05:00
Alam Ed Arias
c1d4ef3296
Merge branch 'next' into PK3-BackportNext
2018-11-24 14:54:42 -05:00
Alam Ed Arias
148d8ec9e0
Merge branch 'PK3-Backport' into PK3-BackportNext
2018-11-24 14:54:07 -05:00
Alam Ed Arias
17528a6aa9
LFS fixup for PK3 support
2018-11-24 14:48:56 -05:00
Nev3r
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
cb0c31fa9a
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
mazmazz
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
mazmazz
3b298b7c42
Adjust mouse scaling calculation for SDL in windowed mode
2018-11-23 21:43:50 -05:00
mazmazz
b60c10dc9b
Change default mouse sensitivity
2018-11-23 20:51:57 -05:00
Monster Iestyn
794d27b49e
Kill CheckMissileImpact, it has been useless for probably a decade and a half
2018-11-23 23:14:49 +00:00
Monster Iestyn
0a0336a674
Merge branch 'master' into fof-slope-skew-backport
...
# Conflicts:
# src/r_segs.c
2018-11-23 22:40:28 +00:00
Monster Iestyn
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
Monster Iestyn
d228e35fcb
Merge branch 'responsefile-fix' into 'master'
...
Fix M_FindResponseFile returning garbage data
See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
Steel Titanium
97dd291f3f
Merge branch 'master' into responsefile-fix
2018-11-23 15:29:52 -05:00
Alam Arias
30b9cef043
Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
...
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
Alam Arias
b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen
...
Render the startup screen on OpenGL mode
2018-11-23 14:47:56 -05:00
Alam Arias
3d0fd7ff2e
Merge pull request #258 from light2yellow/master
...
m_fixed: asm: cc is not a register
2018-11-23 14:47:36 -05:00
Monster Iestyn
08af33c51f
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
Nev3r
0487558a98
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
Nev3r
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
Digiku
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
Digiku
3c95a63fc2
Merge branch 'public-darker-credits' into 'master'
...
Make the credits pics darker
See merge request STJr/SRB2!336
2018-11-23 07:35:44 -05:00
mazmazz
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
mazmazz
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
Steel Titanium
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Steel Titanium
933c1311cd
Make the error less confusing
2018-11-22 22:59:46 -05:00
Steel Titanium
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
mazmazz
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
mazmazz
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
Monster Iestyn
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
mazmazz
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
mazmazz
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
mazmazz
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -05:00
Monster Iestyn
37c0e646e4
Merge branch 'ms-update-alert-fix' into 'master'
...
Master Server Update alert fix
See merge request STJr/SRB2!333
2018-11-22 13:34:43 -05:00
mazmazz
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
Steel Titanium
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
Monster Iestyn
3acc312923
Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop.
2018-11-21 20:45:03 +00:00
Monster Iestyn
66900c70ee
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
Monster Iestyn
948466658f
Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master'
...
FOF wall rendering fixes and cleanup
See merge request STJr/SRB2!317
2018-11-20 08:54:09 -05:00
Monster Iestyn
2d1f927a17
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...
...that was a mouthful
2018-11-19 22:12:26 +00:00
Monster Iestyn
418943acdc
change return type of M_CheckMODVersion to boolean
2018-11-19 17:47:23 +00:00
Monster Iestyn
797f9d180e
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
2018-11-19 17:46:38 +00:00
Alam Ed Arias
a290c4727b
Merge branch 'master' into Travis_CI-gcc8
2018-11-18 21:23:27 -05:00
Alam Ed Arias
42afd3532d
Merge branch 'master' into next
2018-11-18 20:22:40 -05:00
Alam Ed Arias
0b5069f36c
We need to include the NUL char
2018-11-18 20:21:32 -05:00
Alam Ed Arias
5a09d44fd2
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
2018-11-18 19:59:21 -05:00
Monster Iestyn
ab39534ef6
Merge branch 'mingw-64bit' into 'master'
...
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
2018-11-18 19:49:18 -05:00
Monster Iestyn
8c71cd0b90
Merge branch 'master' into next
2018-11-18 17:11:57 +00:00
Monster Iestyn
a400bb9ef6
Merge branch 'camera-subsector-crash-fix' into 'master'
...
Camera subsector crash fix
See merge request STJr/SRB2!318
2018-11-18 08:28:38 -05:00
Steel Titanium
02c08a3e10
Some small changes
2018-11-14 21:01:54 -05:00
Steel Titanium
f02105732e
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
Steel Titanium
c5a97dcfe6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
Alam Ed Arias
4695841b8d
fix format-truncation: need bigger string buffers
2018-11-14 16:50:52 -05:00
Monster Iestyn
09f9572a8f
Merge branch 'master' into next
2018-11-14 21:49:11 +00:00
Monster Iestyn
3e6fcf1b8b
Merge branch 'opengl-hud-scale-fix' into 'master'
...
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
Alam Ed Arias
fb08950c19
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
2018-11-14 16:32:57 -05:00
Alam Ed Arias
4e9fc881a2
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
2018-11-14 16:26:46 -05:00
Steel Titanium
1b79b9527c
Properly check if cmake is running on wwindows
...
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
Alam Ed Arias
d4cb81cb28
Merge branch 'master' into next
2018-11-14 15:45:29 -05:00
MonsterIestyn
772c072064
Merge branch 'master' into analog-flipcam-synch-fix
2018-11-14 19:36:39 +00:00
Alam Ed Arias
97fd69951a
Merge branch 'master' into next
2018-11-14 11:07:12 -05:00
Alam Ed Arias
de5b626520
Fix misleading indentation
2018-11-14 11:06:45 -05:00
Alam Ed Arias
f81d01edca
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
Alam Ed Arias
938bf1605c
Merge branch 'master' into next
2018-11-14 10:52:49 -05:00
Alam Ed Arias
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
Marco Z
8777d5c6c9
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
Marco Z
51768e7dd1
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
Monster Iestyn
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Marco Z
0b97b2a76c
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
Steel Titanium
2ca5e29110
Make sure the new option only works on Windows.
...
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
Steel Titanium
4836e711d3
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
Steel Titanium
d0b64222f7
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
Monster Iestyn
302358c403
Merge branch 'mixer-sound-x64-fix' into 'master'
...
mixer_sound fix x64 build issue
See merge request STJr/SRB2!323
2018-11-13 17:42:23 -05:00
Steel Titanium
9029cf5d9c
Fix skybox disappearing after using objectplace command
2018-11-13 17:25:42 -05:00
mazmazz
2db2b6e6af
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
Steel Titanium
95ed3fcf7e
Save current renderer to screenshots
2018-11-13 17:19:22 -05:00
mazmazz
894ee02f3f
Fix x64 build issue
2018-11-13 17:12:18 -05:00
Monster Iestyn
e9fe0ebae1
Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy
2018-11-13 18:14:59 +00:00
Monster Iestyn
0d38061db8
Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode
2018-11-13 18:13:51 +00:00
