ZappoMan
|
c6b033fa0e
|
revert out the InterfaceConfig.h changes
|
2014-12-15 10:12:55 -08:00 |
|
ZappoMan
|
6b39783de7
|
revert out the InterfaceConfig.h changes
|
2014-12-15 10:12:04 -08:00 |
|
ZappoMan
|
7d1081473e
|
remove _textureCache
|
2014-12-15 09:42:35 -08:00 |
|
ZappoMan
|
ca39c79df4
|
unix compile
|
2014-12-15 08:50:36 -08:00 |
|
ZappoMan
|
3de3540ebe
|
move back into interface for now
|
2014-12-15 08:37:33 -08:00 |
|
ZappoMan
|
4ac673fe63
|
more render util cleanup
|
2014-12-15 08:16:42 -08:00 |
|
ZappoMan
|
e9ea6b20ce
|
use TextureCache::getInstance() instead of Application::getInstance()->getTextureCache()
|
2014-12-15 08:16:18 -08:00 |
|
ZappoMan
|
2df4c017f1
|
move GeometryCache out of application and remove dependency on Model
|
2014-12-15 08:15:55 -08:00 |
|
ZappoMan
|
e253b8afa4
|
move TextureCache out of interface and Application
|
2014-12-15 08:14:53 -08:00 |
|
Atlante45
|
738f23f326
|
Moved visage and dde over to DependencyManager
|
2014-12-14 22:30:13 -08:00 |
|
Atlante45
|
65094f2165
|
Update headers
|
2014-12-14 21:47:08 -08:00 |
|
Atlante45
|
1db3592d4c
|
Switched meFaceshifto DependencyManager for Faceshift
|
2014-12-14 19:56:42 -08:00 |
|
Atlante45
|
39a19a297f
|
Switched menu to DependencyManager for Faceshift
|
2014-12-14 16:31:03 -08:00 |
|
Atlante45
|
1d9e53e227
|
Switched avatar to DependencyManager for Faceshift
|
2014-12-14 16:28:28 -08:00 |
|
Atlante45
|
ad2dee5eaa
|
Switched devices to DependencyManager for Faceshift
|
2014-12-14 16:26:08 -08:00 |
|
Philip Rosedale
|
99fd7b3d6c
|
Merge pull request #3963 from ZappoMan/test
fix warning
|
2014-12-13 23:16:16 -08:00 |
|
ZappoMan
|
31db2188cb
|
remove test comment
|
2014-12-13 07:58:13 -08:00 |
|
ZappoMan
|
d28e274876
|
fix warning
|
2014-12-13 07:43:40 -08:00 |
|
Andrzej Kapolka
|
c1c5991ac5
|
Fix for distorted replaced textures.
|
2014-12-12 12:07:48 -08:00 |
|
Brad Hefta-Gaub
|
aae000d50e
|
Merge pull request #3956 from Atlante45/dont_hide_mouse_on_every_window
Don't hide mouse when over a widget
|
2014-12-11 16:06:05 -08:00 |
|
Atlante45
|
df66a0049b
|
Don't hide mouse when over a widget
|
2014-12-11 15:33:46 -08:00 |
|
Clément Brisset
|
14918ff86a
|
Merge pull request #3952 from ZappoMan/HMDMode
More HMD work - keep more dialogs from being moved to HMD
|
2014-12-11 15:26:36 -08:00 |
|
Philip Rosedale
|
b160d5b571
|
Merge pull request #3955 from ey6es/master
Fix for normal and specular maps on skinned models.
|
2014-12-11 15:23:59 -08:00 |
|
Philip Rosedale
|
8505aaceba
|
Merge pull request #3953 from ZappoMan/someCleanup
Remove some dead code from Voxel rendering
|
2014-12-11 15:23:27 -08:00 |
|
ZappoMan
|
0813d53bee
|
CR feedback
|
2014-12-11 15:17:22 -08:00 |
|
Andrzej Kapolka
|
77b19241d7
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-11 14:44:30 -08:00 |
|
Andrzej Kapolka
|
7611354df6
|
Fix for normal maps on skinned models.
|
2014-12-11 14:43:58 -08:00 |
|
Brad Hefta-Gaub
|
31cbd6e88c
|
Merge pull request #3954 from ctrlaltdavid/20226
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
|
2014-12-11 14:33:24 -08:00 |
|
ZappoMan
|
3eb7314c98
|
remove PrimitiveRenderer
|
2014-12-11 14:13:44 -08:00 |
|
ZappoMan
|
208d3c8413
|
remove old unused shaders
|
2014-12-11 13:59:21 -08:00 |
|
ZappoMan
|
29672aec09
|
removing VoxelShader and PointShader which were both disabled
|
2014-12-11 13:55:10 -08:00 |
|
ZappoMan
|
c9bc95580d
|
add support for generic windowWatcher that keeps dialogs from being moved to HMD display
|
2014-12-11 12:30:17 -08:00 |
|
AndrewMeadows
|
84e82cd03b
|
Merge pull request #3947 from ZappoMan/HMDMode
Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen
|
2014-12-11 10:48:32 -08:00 |
|
AndrewMeadows
|
bb6f976699
|
Merge pull request #3945 from ZappoMan/someCleanup
AudioRefector-ectomy
|
2014-12-11 10:39:41 -08:00 |
|
ZappoMan
|
ec54b609df
|
dry up code and make chat window avoid the hmd screen
|
2014-12-10 17:23:39 -08:00 |
|
ZappoMan
|
06d348c399
|
get have addressbar avoid the hmd screen
|
2014-12-10 17:13:34 -08:00 |
|
ZappoMan
|
d058b5554e
|
make sure the running scripts widget doesn't start on the HMD screen
|
2014-12-10 16:58:36 -08:00 |
|
ZappoMan
|
7f887ba75f
|
more spatial audio removal
|
2014-12-10 15:46:10 -08:00 |
|
ZappoMan
|
eda7432868
|
remove audio reflector
|
2014-12-10 15:37:48 -08:00 |
|
Andrzej Kapolka
|
d402f767c1
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-10 15:23:27 -08:00 |
|
Andrzej Kapolka
|
c57fd15bc9
|
Rather than loading the entire FBX file into a byte array, read it straight
from the QNetworkReply.
|
2014-12-10 15:22:48 -08:00 |
|
ZappoMan
|
74a6fd5ca7
|
fix joystick pick
|
2014-12-09 20:03:00 -08:00 |
|
Atlante45
|
88a576f846
|
fix action events for gamepad;
|
2014-12-09 19:35:38 -08:00 |
|
David Rowe
|
ff6db7a9fa
|
Merge branch 'master' into 20226
|
2014-12-09 19:20:30 -08:00 |
|
David Rowe
|
8cf50b71ea
|
Update some comments to reflect changes
|
2014-12-09 19:18:37 -08:00 |
|
Brad Hefta-Gaub
|
69f7a89003
|
Merge pull request #3937 from Atlante45/mouse_pick_in_oculus
Mouse pick improvments
|
2014-12-09 18:33:25 -08:00 |
|
David Rowe
|
136c3a2cce
|
Replace 2D and 3D text overlay textWidth() method with textSize()
|
2014-12-09 18:32:53 -08:00 |
|
Atlante45
|
dc4c9cd545
|
Correctly Hide/Show cursor
|
2014-12-09 18:00:14 -08:00 |
|
Sam Gateau
|
01c13cd6f1
|
Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars
|
2014-12-09 17:58:17 -08:00 |
|
Atlante45
|
43dc35d549
|
Use correct mouse coordinate
|
2014-12-09 17:53:23 -08:00 |
|