SmileTheory
ef9fe17dd5
OpenGL2: Remove srfTriangle_t, and use glIndex_t instead.
2013-11-08 01:46:17 -08:00
SmileTheory
d295db747c
OpenGL2: Small optimizations and comments in world VBO creation and surface merging.
2013-11-07 04:03:52 -08:00
Zack Middleton
fd4cd6612d
Fix running if built on OS X 10.9
...
strncpy with in == out causes signal 6 if built on OS X 10.9.
(If built on older OS X versions, the game works on 10.9 though.)
It was happening in COM_StripExtension during map load.
2013-11-06 22:23:40 -06:00
SmileTheory
7672533e8f
OpenGL2: Prefer VBO/IBO sizes of around 4MB.
2013-11-05 20:07:10 -08:00
SmileTheory
8c3ae8d7d2
OpenGL2: Reimplement soft overbright to avoid a framebuffer blit.
2013-11-05 00:08:59 -08:00
SmileTheory
a7c5fc0ee7
OpenGL2: Some small shader optimizations.
2013-11-04 22:50:53 -08:00
SmileTheory
0e25d0357b
OpenGL2: Revisit fragment tangent space calculation, and remove tangent space lighting.
2013-11-04 21:53:05 -08:00
SmileTheory
3846c115e6
OpenGL2: Reduce glsl shader count by using a uniform to disable textures.
2013-11-03 19:34:22 -08:00
Tim Angus
779ebfacfd
Merge branch 'master' into sdl2
2013-11-02 19:12:52 +00:00
Tim Angus
7ae49cc237
Fix video recording sync drift (patch refactored but original author unknown)
2013-11-02 19:11:14 +00:00
Zack Middleton
ae0e09aba9
Remove vertexLightmap from textureBundle_t, it's never qtrue
2013-11-02 02:59:31 -05:00
Zack Middleton
6bd52de44e
Remove unused shader state code from tr_local.h
2013-11-02 02:35:59 -05:00
Zack Middleton
0f30dad10a
Merge last two commits into renderergl2
2013-10-29 23:22:02 -05:00
Zack Middleton
611d913443
Initialize blendIndexesType and blendWeightsType
2013-10-29 23:18:05 -05:00
Zack Middleton
f55bb272b6
Fix IQM comments refering to IQM_BYTE instead of IQM_UBYTE
2013-10-29 23:11:32 -05:00
Zack Middleton
c28fabf505
IQM int/float vertex arrays were already swapped
2013-10-29 23:07:15 -05:00
Zack Middleton
0bf1f3d0ba
Add support for IQM int blend indices and float blend weights
...
Integer blend indices are converted to bytes at load, ioq3 doesn't allow more than 128 joints.
Heavily based on code by @zippers.
2013-10-29 22:09:06 -05:00
Zack Middleton
1515841b38
Support IQMs with joints and no poses
2013-10-29 20:47:33 -05:00
Zack Middleton
e0a42885d9
Clear more variables in CL_InitServerInfo
...
Have cls.localServers use CL_InitServerInfo.
Don't set cls.localServers netType to from.type, it's the wrong value.
Note: server->visible is not cleared in CL_InitServerInfo, as stated by a comment below a place where CL_InitServerInfo is used.
2013-10-28 15:23:01 -05:00
Zack Middleton
5fdff01d1b
Check #ifdef MACOS_X not #if MACOS_X
2013-10-20 13:58:30 -05:00
Zack Middleton
8c1d3c635c
Use bundle icon on Mac OS X instead of internal 32x32 window icon
2013-10-19 01:54:58 -05:00
Zack Middleton
983ebbb4a6
Ignore -psn* arguments on Mac OS X
...
Mac OS X adds an argument starting with "-psn" when launched using Finder, Dock,
or a terminal using open command and not specifying arguments.
It caused the opening videos to be skipped.
This change mimics SDL 1.2.
2013-10-19 01:10:24 -05:00
Zack Middleton
cb153f2aaa
Fix warning that SDL_GetKeyboardState return value is used non-const
2013-10-19 00:39:07 -05:00
Zack Middleton
c6a61d212a
Fix SDL2 losing event subsystem
...
Quiting SDL Video or Joystick subsystem implies quiting the Event subsystem in SDL2.
SDL keeps track of number of init and shutdown calls for each subsystem.
Shuting down video or joystick more or equal to number of times they're inited will lead to event shutdown.
Toggling in and out of fullscreen or running in_restart twice causes SDL event subsystem to shutdown, making input not work.
If the console is closed, IN_GobbleMotionEvents gets stuck in a loop. SDL_PeepEvents returns -1 when there is an error, but we assume non-0 means read more events.
IN_ShutdownJoystick needs to check if joystick subsystem was inited before quitting it, otherwise we may cause SDL event subsystem to shutdown.
2013-10-18 16:31:19 -05:00
SmileTheory
535d0ea70e
OpenGL2: Merge bsp surface structs into a single struct, and more cleanup.
2013-10-15 01:19:16 -07:00
SmileTheory
01efe4a538
OpenGL2: Use an idea from ETXreal and separate world VBO into separate VBOs by shader.
2013-10-14 03:58:13 -07:00
SmileTheory
08fcecc829
OpenGL2: Clean up texmod calculations, and improve vertex animation handling.
2013-10-14 01:55:54 -07:00
SmileTheory
f8355ba2fb
OpenGL2: Fix TCGEN_ENVIRONMENT stages not rendering correctly.
2013-10-10 03:41:31 -07:00
Zack Middleton
a836c2db89
Drop sounds starting with * before allocating sfx slot
...
Causes handle 0 to be returned by S_RegisterSound.
2013-10-09 09:51:32 -05:00
Zack Middleton
e4227d1cd5
Revert "5097 - Menu corrupted on start (on IRIX)"
...
Calling glClear( any bits ) in GL_SetDefaultState makes connect screen black using the proprietary NVidia driver on Windows and GNU/Linux.
This reverts commit 92573270de
2013-10-08 08:01:00 -05:00
SmileTheory
c6774cf113
OpenGL2: default to RGBM lightmap, and add r_floatLightmap for old behaviour.
2013-10-07 01:46:50 -07:00
Tim Angus
6831db0563
Merge pull request #16 from cmf028/sdl2
...
SDL2 fixes
2013-09-30 01:39:00 -07:00
SmileTheory
acbeca6042
OpenGL2: Remove AGEN_FRESNEL(superceded by cubemap patch), and some small fixes and optimizations.
2013-09-24 03:29:49 -07:00
cmf028
11c3bed74d
Send key up events for the mouse wheel
...
Previous versions of SDL would send SDL_MOUSEBUTTONUP events for the mouse wheel immediately following the corresponding SDL_MOUSEBUTTONDOWN event
2013-09-23 12:21:21 -05:00
cmf028
7d83bba2d0
Set com_minimized to 0 when the window is restored
2013-09-23 12:21:21 -05:00
cmf028
d7444b8ca1
Don't set the window title twice
2013-09-23 12:21:20 -05:00
Zack Middleton
1ec9f8d1a8
Fix building sdl2 branch on travis-ci
...
Install libsdl2-dev from a PPA.
2013-09-21 00:34:29 -05:00
SmileTheory
82be4e667f
OpenGL2: Disable GL_ARB_seamless_cube_map by default, caused huge frame drops on some hardware
2013-09-20 17:20:36 -07:00
Zack Middleton
fcaab903d1
Fix UI parse message for menu files
...
Missing a space after colon.
2013-09-19 21:41:27 -05:00
SmileTheory
3ab895d1cd
OpenGL2: reduce varying usage in lightall shader.
2013-09-17 23:52:40 -07:00
SmileTheory
cbd05da5d1
OpenGL2: Fix for "unsupported framebuffer format" bug
2013-09-17 15:33:46 -07:00
SmileTheory
42501db862
OpenGL2: Some shader cleanup
2013-09-16 23:41:04 -07:00
SmileTheory
5985cca2e6
OpenGL2: Speed up fog shader slightly.
2013-09-16 23:20:44 -07:00
Tim Angus
76e49b668e
Merge branch 'master' into sdl2
2013-09-16 22:34:51 +01:00
SmileTheory
a408a2bdae
OpenGL2: Fix inaccurate RGBM calculation.
2013-09-16 14:26:42 -07:00
SmileTheory
e80faf812e
OpenGL2: Use RGBM instead of RGBE encoding for lightmaps.
2013-09-16 05:57:14 -07:00
SmileTheory
7e875c6941
#5979 : Cubemap support for opengl2.
2013-09-16 00:54:26 -07:00
Tim Angus
58b8cfa0b3
Various fixes from Fuma
2013-09-15 23:54:52 +01:00
Zack Middleton
68a616c7f1
Free bot client if cannot load bot
...
Introduced by commit a57a5cfd9b
2013-09-08 21:59:58 -05:00
Zack Middleton
27ddba9c2e
Fix crash caused by too many surfaces in skin
2013-09-04 20:36:45 -05:00
