Commit graph

6676 commits

Author SHA1 Message Date
Jimita
b8b2fbb816 Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
Monster Iestyn
f7698de3ea fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn
c22df14771 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00
mazmazz
e6954eae30 Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua 2018-12-20 10:56:36 -05:00
Digiku
12fc077e01 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
e7cc04a46e Reset default controls for LOADCONFIG command 2018-12-20 10:13:43 -05:00
mazmazz
92eb63d8b5 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz
8a6031ba01 Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
Digiku
f70a023bce 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
861805ca0f Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz
436c49e38b Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz
1e731416d0 Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz
119b7cb469 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku
bf5a27477e 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
8fb1453633 Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku
6e196b3ed7 Merge branch 'using-offsetof' into 'next'
Use the `offsetof` function

See merge request STJr/SRB2!394
2018-12-19 21:53:37 -05:00
mazmazz
235a511b3f Small Mixed D&C fix 2018-12-19 20:56:58 -05:00
AJ Freda
2e99f299fd Fixed a few unnoticable mistakes [vanilla] 2018-12-19 20:52:47 -05:00
Alam Ed Arias
718f16426e Merge branch 'master' into next 2018-12-19 13:20:54 -05:00
Digiku
91bed58e6a 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
2ede537861 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
4c69dac654 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
d51b5fa676 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe
d83c3ccfff Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
mazmazz
27eb51ae93 Ifdef nextFrame handling under USE_MODEL_NEXTFRAME 2018-12-19 10:33:13 -05:00
mazmazz
e2cf95ce5c Interpolation fix attempt?
* Fix pglNormal3bv pointer because typo
2018-12-19 01:57:54 -05:00
mazmazz
b8587c7bc1 Adapt re-enabled DrawMD2 code block for meshes 2018-12-19 00:38:00 -05:00
mazmazz
c39e8bfa0f Hide/add Kart FTransform mirror and anglez behind ifdef 2018-12-19 00:17:51 -05:00
mazmazz
3af4faf19d More hw_md2 merge errors; re-enable interpolation code block 2018-12-18 23:44:38 -05:00
mazmazz
0a8e633e43 hw_md2 merge errors 2018-12-18 22:50:00 -05:00
mazmazz
d005860eef Add model sources to sdl1.2 VC project 2018-12-18 21:53:30 -05:00
mazmazz
69f1e1992b Ignore fread return value (buildbot error) 2018-12-18 20:48:55 -05:00
mazmazz
2f97c874c8 Add new model files to CMake 2018-12-18 20:36:39 -05:00
mazmazz
35b18c6086 Buildbot fixes (changed byte types to char; mixed d&c) 2018-12-18 20:23:08 -05:00
mazmazz
0fdf9dd11c GCC compile fixes 2018-12-18 19:17:33 -05:00
mazmazz
25a8b1ed22 Add MD2/MD3 files to makefile 2018-12-18 17:57:39 -05:00
Arthur
44aef0bcda Remove CONS_Printf message that isn't even doing what it says it is! 2018-12-18 17:52:53 -05:00
Arthur
3c66ba8ea1 push test 2018-12-18 17:52:50 -05:00
Arthur
9f71cbecda Support for 'tinyframes', and lots more optimization 2018-12-18 17:52:47 -05:00
Arthur
b762dc7bca Common model format, with MD2/MD3 loading 2018-12-18 17:52:45 -05:00
Arthur
f79ce3528c New fixed math functions - ClosestPointOnVector, and Strength.
Normal also returns length now, since it is free.
2018-12-18 17:28:39 -05:00
mazmazz
7c5e508f40 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
ae590779f9 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
TehRealSalt
b5d86d7263 Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication. 2018-12-18 15:03:54 -05:00
TehRealSalt
3cecf00c83 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
8c8e72cb72 Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 14:11:43 -05:00
Alam Ed Arias
c56645d193 Merge branch 'master' into next 2018-12-18 14:05:07 -05:00
Alam Arias
69398d8910 Merge pull request #373 from monster-psychic-cat/sw_planefixes
Software plane fixes
2018-12-18 14:02:21 -05:00
Alam Arias
632982ef68 Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 13:57:48 -05:00
TehRealSalt
4ad9801b21 Revert default changes
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00