Commit graph

19769 commits

Author SHA1 Message Date
ZappoMan
bc78beb05f windows build hackery 2014-12-15 14:41:15 -08:00
ZappoMan
f802e99a24 windows build hackery 2014-12-15 14:32:33 -08:00
ZappoMan
df7e115556 move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00
ZappoMan
dee8f69722 windows build hackery 2014-12-15 13:33:47 -08:00
ZappoMan
ea6d6e9f72 windows build hackery 2014-12-15 13:26:27 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
a92b65b0e9 now lets see if this works 2014-12-15 12:42:04 -08:00
ZappoMan
0b95403949 cleanup the windows hackery a little 2014-12-15 12:25:20 -08:00
ZappoMan
95d820ee8b more windows hackery 2014-12-15 12:16:01 -08:00
ZappoMan
4e7368b643 more windows hackery 2014-12-15 12:09:30 -08:00
ZappoMan
d6e7211650 Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy 2014-12-15 12:02:58 -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
28f2dc62ea add windowshacks.h to GPUConfig.h and move it to shared 2014-12-15 11:49:01 -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