Ryan Huffman
1776b2dee2
Update line3d in editModels to use start instead of position
2014-12-18 16:41:41 -08:00
Ryan Huffman
2e95618bed
Remove 'start' property alias from Base3DOverlay
2014-12-18 16:38:27 -08:00
Ryan Huffman
74f8579922
Update line3d to have a separate 'start' property and use transform/rotation
2014-12-18 16:37:19 -08:00
Ryan Huffman
5537fb970b
Update scripts to use instead of for line3d
2014-12-18 16:23:24 -08:00
Ryan Huffman
27e13385ed
Fix drawing of Cube3D on the ApplicationOverlay
...
This seems to break because the ApplicationOverlay is drawn to a texture
buffer first, which is incompatible with the DeferredLightingEffect
implementation.
2014-12-17 16:40:04 -08:00
Ryan Huffman
a0623c930b
Add setting of drawOnApplicaitonOverlay
2014-12-17 16:39:52 -08:00
Ryan Huffman
9bd7912f9f
Add support for drawing 3d overlays on the Application Overlay
2014-12-17 16:25:25 -08:00
Brad Hefta-Gaub
f987f77094
Merge pull request #3971 from ey6es/master
...
Fix for crash on exit due to cache references' not being cleared.
2014-12-15 16:47:09 -08:00
Andrzej Kapolka
892141fe14
Fix for crash on exit due to cache references' not being cleared.
2014-12-15 16:36:26 -08:00
Brad Hefta-Gaub
40f4a78a85
Merge pull request #3970 from ey6es/master
...
Fixes for missing audio device.
2014-12-15 15:21:10 -08:00
Andrzej Kapolka
50c1e9fb40
Fixes for missing audio device.
2014-12-15 22:41:35 -08:00
Clément Brisset
78a61cd48b
Merge pull request #3966 from ZappoMan/untangling
...
Untangling - step toward librarization
2014-12-15 12:02:15 -08:00
ZappoMan
94cf8b3384
reduce calls to DependencyManager::get<> where possible
2014-12-15 11:43:30 -08:00
ZappoMan
3bc1321549
reduce calls to DependencyManager::get<> where possible
2014-12-15 11:40:17 -08:00
ZappoMan
90c1132dd5
reduce calls to DependencyManager::get<> where possible
2014-12-15 11:28:57 -08:00
ZappoMan
049cb25f07
make ModelBlender work with DependancyManager
2014-12-15 10:56:29 -08:00
ZappoMan
e0a017e963
make GeometryCache work with DependancyManager
2014-12-15 10:49:34 -08:00
ZappoMan
7d75d2d1bf
make TextureCache work with DependancyManager
2014-12-15 10:34:16 -08:00
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
Brad Hefta-Gaub
0b85a4cc49
Merge pull request #3965 from Atlante45/dependancy_manager
...
Dependancy manager
2014-12-15 08:12:04 -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
e40961df12
Checking that T is in fact derived from Dependency
2014-12-14 21:34:27 -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
Atlante45
1c17e396f2
Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager
2014-12-14 16:18:29 -08:00
Brad Hefta-Gaub
fc760d5aa6
Merge pull request #3960 from huffman/entity-tool-properties-updates
...
Entity tool properties updates
2014-12-14 09:02:43 -08:00
Philip Rosedale
99fd7b3d6c
Merge pull request #3963 from ZappoMan/test
...
fix warning
2014-12-13 23:16:16 -08:00
Philip Rosedale
fddd67d5f7
Merge pull request #3958 from ey6es/master
...
Fix for distorted replaced textures.
2014-12-13 23:15:28 -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
Atlante45
28786721a6
Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager
2014-12-13 01:18:33 -08:00
Atlante45
9aea2843ac
Remove pointer check
2014-12-12 21:20:26 -08:00
Atlante45
50fd52377f
Couple improvements to the dependency manager
2014-12-12 21:10:45 -08:00
Atlante45
14cda00ebc
First implementation of the DependencyManager
2014-12-12 20:52:41 -08:00
Ryan Huffman
a9223f5887
Remove text from label
2014-12-12 15:45:31 -08:00
Ryan Huffman
2fab404f7f
Reorganize selectionManager selection checking
2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd
Update SelectionManager -> selectionManager
2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea
Add buttons for moving selection to grid and resetting to natural dimensions
2014-12-12 15:28:57 -08:00
Ryan Huffman
a5cbc9b3e2
Fix properties window to work with undo/redo
2014-12-12 15:28:22 -08:00