Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 08:36:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19867 commits 71 branches 56 tags 1.2 GiB
Commit graph

19867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -08:00
Atlante45
b2dac6f53f DM users update 2014-12-16 15:32:11 -08:00
Atlante45
11a2ecab56 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/entities/EntityTreeRenderer.h
	interface/src/ui/ApplicationOverlay.cpp
	libraries/render-utils/src/GlowEffect.cpp
	libraries/render-utils/src/Model.cpp
 2014-12-16 15:02:37 -08:00
Clément Brisset
7632dbead3 Merge pull request #3968 from ZappoMan/InterfaceConfigEctomy 
Librarization
 2014-12-16 14:56:11 -08:00
Atlante45
2039895898 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/renderer/GlowEffect.cpp
	interface/src/renderer/TextureCache.cpp
 2014-12-16 14:27:50 -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
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
ZappoMan
85c8951734 really remove the debug settings from Model rendering 2014-12-16 13:57:22 -08:00
Atlante45
e8a22f6f0f Switched to chared pointers and macros 2014-12-16 13:54:52 -08:00
Atlante45
cf6aa563ac DM returns shared pointer 2014-12-16 13:54:24 -08:00
Brad Hefta-Gaub
d322f587a7 Merge pull request #3972 from DaveDubUK/Window.nonBlockingForm-fix 
Window.non blocking form fix
 2014-12-16 13:52:27 -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
1ed2c62bbf try this 2014-12-16 12:15:57 -08:00
ZappoMan
ee34dfffc1 try this 2014-12-16 12:05:23 -08:00
ZappoMan
ec5c33fecc try this 2014-12-16 11:57:06 -08:00
ZappoMan
a9b3fdd3eb try this 2014-12-16 11:44:15 -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
fac6ff572b see if this works 2014-12-15 19:29:53 -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
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
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
ZappoMan
b1d1cfee44 cmake cleanup 2014-12-15 15:29:05 -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
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
Stephen Birarda
a3cc578fd1 use libc++ for C++11 in APPLE builds 2014-12-15 14:08:23 -08:00
Stephen Birarda
f63aa44d01 add lib to lib dirs for win and linux 2014-12-15 14:02:55 -08:00
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00