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
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
ba00752c71
Merge pull request #367 from monster-psychic-cat/the_second_remote_view_camera_fix
...
Fix remote viewpoint cameras for real this time
2018-12-18 15:00:59 -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
e0eb64375a
Merge pull request #368 from monster-psychic-cat/automap_fix
...
Automap fix
2018-12-18 14:02:05 -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
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
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
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
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
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
dc92bb49fd
Merge branch 'revert-62faa135' into 'next'
...
Revert "Merge branch 'kart-luatextures-backport' into 'next'"
See merge request STJr/SRB2!390
2018-12-16 17:57:53 -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
62faa135db
Merge branch 'kart-luatextures-backport' into 'next'
...
Lua: Expose R_TextureNumForName
See merge request STJr/SRB2!387
2018-12-16 17:15:31 -05:00
33e99a279e
Merge branch 'deprecate-admin' into 'master'
...
Lua: Add deprecation warning to admin
See merge request STJr/SRB2!386
2018-12-16 17:14:32 -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
d85c9b5abc
Merge remote-tracking branch 'actualsrb2/next' into next
2018-12-16 15:55:28 -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
073ca10320
Merge branch 'opengl-bsp-cleanup' into 'master'
...
Opengl BSP cleanup and fixes
See merge request STJr/SRB2!382
2018-12-16 12:51:38 -05:00
f855263f78
Merge branch 'linux-symlink' into 'master'
...
Add symlink to debian package for /usr/games/srb2
See merge request STJr/SRB2!385
2018-12-15 22:17:04 -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
mazmazz