Commit graph

7228 commits

Author SHA1 Message Date
wolfy852
e528750444 Fix improperly resolved conflicts 2019-01-08 16:44:56 -06:00
wolfy852
ad01dcc5ac Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
2019-01-08 16:32:24 -06:00
Sal
78ac038864 Merge branch 'mobjscale-global' into 'next'
Add a global for mobjscale

See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
TehRealSalt
b713903208 Merge remote-tracking branch 'master' into next 2019-01-08 16:29:14 -05:00
Sal
7f8609d335 Merge branch 'merge-srb2' into 'next'
Merge SRB2 master & next (round 1)

See merge request KartKrew/Kart-Public!16
2019-01-08 15:56:41 -05:00
Sal
6916667c41 Merge branch 'animtimer-fix' into 'next'
Cast animtimer to int before negating

See merge request KartKrew/Kart-Public!17
2019-01-08 15:47:14 -05:00
Sal
82246f6c25 Merge branch 'makefile-develop' into 'master'
Compile flag for DEVELOP

See merge request KartKrew/Kart-Public!18
2019-01-08 15:45:04 -05:00
Latapostrophe
a4641e1010 use PLAY as default player MD2 if avaiable. 2019-01-08 18:57:10 +01:00
Digiku
3cd4b253b1 Update hw_md2.c -- Redundant AngleFixed operation when modifying anglef 2019-01-08 11:30:04 -05:00
Digiku
090ecdb6e5 Update hw_md2.c -- player->frameangle fix 2019-01-08 11:22:33 -05:00
Digiku
4f0be1b064 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
mazmazz
6ec6622610 Merge remote-tracking branch 'kart-public-gl/animtimer-fix' into md3-vanilla-kart 2019-01-07 05:44:23 -05:00
mazmazz
d34e1fd4e9 Add floating point epsilons 2019-01-07 04:40:19 -05:00
mazmazz
05a1a7e24a Dummy out nextframe lerping (unused in Kart) 2019-01-07 04:38:17 -05:00
mazmazz
8504b000bb Fix blinking MD2 models
MD2 models are forced to load float frames, so mesh->indices is never loaded, so glDrawElements can't be used. Use glDrawArrays instead.
2019-01-07 04:34:19 -05:00
mazmazz
391d001929 Un-dummy md5 checks 2019-01-07 04:34:18 -05:00
mazmazz
cc3b57a96c Compile fix -- remove (void)alpha from DoScreenWipe 2019-01-07 04:34:17 -05:00
Arthur
531d42c1bd Eliminate some old GL functions so we don't slide back into bad habits! 2019-01-07 04:34:16 -05:00
Arthur
25ef570a81 Fix screen transitions 2019-01-07 04:33:28 -05:00
mazmazz
08579d9447 Buildbot fixes 2019-01-07 04:33:27 -05:00
mazmazz
62596bed38 Compile fixes -- specify GLubyte for pglColor4ubv 2019-01-07 04:33:25 -05:00
Arthur
9774ecbdfb Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2019-01-07 04:33:22 -05:00
Arthur
00792f8dab Removed unused PF_Md2 flag
More OpenGL performance increase by making assumptions about client state
2019-01-07 04:33:20 -05:00
Arthur
cf6af71d33 boolean fix for VS
add GL_NORMALIZE
2019-01-07 04:30:54 -05:00
mazmazz
72c2b28328 Ignored fread fix 2019-01-07 04:30:53 -05:00
mazmazz
d5a0b2df4d More mixed d&c fixes 2019-01-07 04:30:52 -05:00
mazmazz
78adb69481 byte -> char 2019-01-07 04:30:51 -05:00
mazmazz
c5c799006a Mixed D&C fixes 2019-01-07 04:30:49 -05:00
mazmazz
1654aa34c5 Fix floating point comparisons 2019-01-07 04:30:48 -05:00
Arthur
1249f37fc5 Removed all glBegin/glEnd references
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2019-01-07 04:30:47 -05:00
mazmazz
2f930f1262 Small Mixed D&C fix 2019-01-07 04:30:45 -05:00
AJ Freda
4806dadd88 Fixed a few unnoticable mistakes [vanilla] 2019-01-07 04:30:42 -05:00
mazmazz
09629f092f Ifdef nextFrame handling under USE_MODEL_NEXTFRAME 2019-01-07 04:30:40 -05:00
mazmazz
6ed896d462 Interpolation fix attempt?
* Fix pglNormal3bv pointer because typo
2019-01-07 04:30:39 -05:00
mazmazz
c13d3ff1dd Adapt re-enabled DrawMD2 code block for meshes 2019-01-07 04:30:37 -05:00
mazmazz
6653b9697f Hide/add Kart FTransform mirror and anglez behind ifdef 2019-01-07 04:30:36 -05:00
mazmazz
bbc3d27cee More hw_md2 merge errors; re-enable interpolation code block 2019-01-07 04:27:59 -05:00
mazmazz
039cf894f2 hw_md2 merge errors 2019-01-07 04:24:00 -05:00
mazmazz
ab99f19dd1 Add model sources to sdl1.2 VC project 2019-01-07 04:23:20 -05:00
mazmazz
34afceaa3b Ignore fread return value (buildbot error) 2019-01-07 04:23:19 -05:00
mazmazz
2a24854903 Add new model files to CMake 2019-01-07 04:23:18 -05:00
mazmazz
f0b20e302a Buildbot fixes (changed byte types to char; mixed d&c) 2019-01-07 04:23:17 -05:00
mazmazz
2e22b069f1 GCC compile fixes 2019-01-07 04:23:15 -05:00
mazmazz
30c7ad3928 Add MD2/MD3 files to makefile 2019-01-07 04:21:46 -05:00
Arthur
11be174603 Remove CONS_Printf message that isn't even doing what it says it is! 2019-01-07 04:21:45 -05:00
Arthur
9f0b121b15 Support for 'tinyframes', and lots more optimization 2019-01-07 04:21:44 -05:00
Arthur
295ca25171 Common model format, with MD2/MD3 loading 2019-01-07 04:21:43 -05:00
Arthur
9d5622c0bc New fixed math functions - ClosestPointOnVector, and Strength.
Normal also returns length now, since it is free.
2019-01-07 04:19:24 -05:00
Digiku
1c1331199d Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
wolfy852
bcf687c3af Compile flag for DEVELOP 2019-01-06 20:47:13 -06:00