Thijs Wenker
|
2884de1fe4
|
include fix
|
2014-12-18 01:18:05 +01:00 |
|
Thijs Wenker
|
835e14a7b2
|
This might solve it?
|
2014-12-18 00:52:31 +01:00 |
|
Thijs Wenker
|
95b0f2515b
|
this doesn't make real sense to me, perhaps this helps
|
2014-12-18 00:32:11 +01:00 |
|
Thijs Wenker
|
8a1618c269
|
missed one.
|
2014-12-18 00:22:59 +01:00 |
|
Thijs Wenker
|
151ddab118
|
make stuff build without RealSense
|
2014-12-18 00:16:51 +01:00 |
|
Thijs Wenker
|
227e041a12
|
Merge branch 'master' of https://github.com/worklist/hifi into 20216
|
2014-12-17 19:42:44 +01:00 |
|
Clément Brisset
|
7632dbead3
|
Merge pull request #3968 from ZappoMan/InterfaceConfigEctomy
Librarization
|
2014-12-16 14:56:11 -08:00 |
|
ZappoMan
|
b449f650a0
|
more Model cleanup
|
2014-12-16 14:22:02 -08:00 |
|
ZappoMan
|
89101872bb
|
move Model and AnimationHandle to libraries
|
2014-12-16 14:04:39 -08:00 |
|
ZappoMan
|
85c8951734
|
really remove the debug settings from Model rendering
|
2014-12-16 13:57:22 -08:00 |
|
ZappoMan
|
efa8a752f2
|
remove dependency on Menu from Model
|
2014-12-16 13:14:57 -08:00 |
|
ZappoMan
|
16c1e597f1
|
remove Application dependency from Model
|
2014-12-16 12:53:22 -08:00 |
|
ZappoMan
|
58183515e6
|
more windows shenanigans
|
2014-12-16 12:23:54 -08:00 |
|
ZappoMan
|
fc1e1ecfc0
|
move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled
|
2014-12-16 11:27:44 -08:00 |
|
ZappoMan
|
4d79a08533
|
remove Application dependencies from AmbientOcclusion and DeferredLightingEffect
|
2014-12-16 10:32:03 -08:00 |
|
DaveDubUK
|
7ab9dfbfe1
|
Window.nonBlockingForm-fix
|
2014-12-16 14:48:28 +00:00 |
|
DaveDubUK
|
9493440d32
|
Window.nonBlockingForm-fix
|
2014-12-16 13:33:10 +00:00 |
|
DaveDubUK
|
cd95f7bd23
|
Window.nonBlockingForm active status was not being tested correctly. Was causing unexpected fail on second attempt to show form
|
2014-12-16 13:20:11 +00:00 |
|
ZappoMan
|
5cba44fd5b
|
moved JointState
|
2014-12-15 19:49:16 -08:00 |
|
ZappoMan
|
660bf2720e
|
convert AnimationCache to DependencyManager
|
2014-12-15 19:48:15 -08:00 |
|
ZappoMan
|
02737a4ec4
|
move JointState to libraries
|
2014-12-15 19:38:30 -08:00 |
|
ZappoMan
|
41c135c4e5
|
move GlowEffect to libraries
|
2014-12-15 19:19:21 -08:00 |
|
ZappoMan
|
8f3d23c5b3
|
remove Menu dependency from GlowEffect
|
2014-12-15 19:06:54 -08:00 |
|
ZappoMan
|
4eef4c2438
|
move RenderUtils.cpp/h to libraries
|
2014-12-15 18:52:40 -08:00 |
|
ZappoMan
|
e52338d25c
|
get rid of InterfaceConfig.h in GlowEffect
|
2014-12-15 17:38:57 -08:00 |
|
ZappoMan
|
37abe8e89c
|
move RenderUtils.cpp/h to libraries
|
2014-12-15 17:35:26 -08:00 |
|
ZappoMan
|
e53833b306
|
make GlowEffect support DependencyManager
|
2014-12-15 17:29:48 -08:00 |
|
ZappoMan
|
79bc5e0507
|
Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy
|
2014-12-15 16:48:07 -08:00 |
|
Andrzej Kapolka
|
50c1e9fb40
|
Fixes for missing audio device.
|
2014-12-15 22:41:35 -08:00 |
|
ZappoMan
|
bfcc78c57d
|
replaced Application::resourcesPath() with PathUtils::resourcesPath()
|
2014-12-15 15:20:18 -08:00 |
|
ZappoMan
|
753dc07cdd
|
cleanup windows hackery
|
2014-12-15 14:58:47 -08:00 |
|
ZappoMan
|
0c14b0f8fc
|
windows build hackery
|
2014-12-15 14:47:26 -08:00 |
|
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 |
|
Thijs Wenker
|
2633b0dee7
|
reordered includes
|
2014-12-15 22:26:47 +01:00 |
|
ZappoMan
|
ea6d6e9f72
|
windows build hackery
|
2014-12-15 13:26:27 -08:00 |
|
Thijs Wenker
|
1dfa313d16
|
Merge branch 'master' of https://github.com/worklist/hifi into 20216
Conflicts:
interface/src/Menu.cpp
|
2014-12-15 22:22:51 +01:00 |
|
ZappoMan
|
7b973453b4
|
move TextureCache to library
|
2014-12-15 13:14:16 -08:00 |
|
Thijs Wenker
|
c4a9cae943
|
flipped some values to get a nicer hand-tracking
|
2014-12-15 21:47:00 +01:00 |
|
ZappoMan
|
a92b65b0e9
|
now lets see if this works
|
2014-12-15 12:42:04 -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 |
|