Commit graph

3033 commits

Author SHA1 Message Date
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
Monster Iestyn c9a730340a Merge branch 'lua-fof-flat-names-fix' into 'next'
Lua FOF flat names fix

See merge request STJr/SRB2!405
2018-12-20 15:48:04 -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
Digiku 1e15f2365d Merge branch 'exitvars-fix' into 'next'
Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua

See merge request STJr/SRB2!404
2018-12-20 10:58:27 -05: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
mazmazz 6c5bb7f541 Small Mixed D&C fix 2018-12-19 20:56:58 -05:00
AJ Freda 4728ad97eb Fixed a few unnoticable mistakes [vanilla] 2018-12-19 20:52:47 -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 59826860ab Ifdef nextFrame handling under USE_MODEL_NEXTFRAME 2018-12-19 10:33:13 -05:00
mazmazz 90bd80d17a Interpolation fix attempt?
* Fix pglNormal3bv pointer because typo
2018-12-19 01:57:54 -05:00
mazmazz c4f5bdc347 Adapt re-enabled DrawMD2 code block for meshes 2018-12-19 00:38:00 -05:00
mazmazz 98d18509e6 Hide/add Kart FTransform mirror and anglez behind ifdef 2018-12-19 00:17:51 -05:00
mazmazz 45f0f725cd More hw_md2 merge errors; re-enable interpolation code block 2018-12-18 23:44:38 -05:00
mazmazz 65543545c6 hw_md2 merge errors 2018-12-18 22:50:00 -05:00
mazmazz 8d10a0b105 Add model sources to sdl1.2 VC project 2018-12-18 21:53:30 -05:00
mazmazz 3a45b169eb Ignore fread return value (buildbot error) 2018-12-18 20:48:55 -05:00
mazmazz c844141322 Add new model files to CMake 2018-12-18 20:36:39 -05:00
mazmazz 6b2f4b5858 Buildbot fixes (changed byte types to char; mixed d&c) 2018-12-18 20:23:08 -05:00
mazmazz 3dbda54d3c GCC compile fixes 2018-12-18 19:17:33 -05:00
mazmazz 980803e0c0 Add MD2/MD3 files to makefile 2018-12-18 17:57:39 -05:00
Arthur 4276758491 Remove CONS_Printf message that isn't even doing what it says it is! 2018-12-18 17:52:53 -05:00
Arthur 4713200fb5 push test 2018-12-18 17:52:50 -05:00
Arthur 76dabd5e9d Support for 'tinyframes', and lots more optimization 2018-12-18 17:52:47 -05:00
Arthur 3ed0edbcfe Common model format, with MD2/MD3 loading 2018-12-18 17:52:45 -05:00
Arthur c4d5afdd80 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 96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00