Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-25 17:10:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20773 commits 25 branches 0 tags 1.1 GiB
Commit graph

932 commits

Author SHA1 Message Date
Atlante45
e7a2b0296b Removed Menu::bumpSettings() 2015-01-18 06:57:59 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu 
Added it in the DM
 2015-01-18 06:50:34 -08:00
Atlante45
fdce0baee9 Removed vsync slot from menu 2015-01-18 05:39:53 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu 
Moved it to OctreeQuery
 2015-01-17 23:31:38 -08:00
Atlante45
8996bf8e0d Use qApp 
Reuse qApp global variable following Qt's pattern
 2015-01-16 15:26:42 -08:00
Philip Rosedale
048d190350 Merge pull request #4108 from ctrlaltdavid/20263 
CR for Job #20263 - Create a "Bookmarks" capability
 2015-01-15 10:30:41 -08:00
David Rowe
95efe9857b Merge branch 'master' into 20263 2015-01-15 09:52:19 -08:00
Ryan Huffman
00487fb175 Fix issue with avatar data being sent too often 2015-01-15 09:45:51 -08:00
David Rowe
fa6faa771a Add bookmarks with Bookmark Location menu item 
The menu of bookmarks is kept sorted.
 2015-01-13 22:39:16 -08:00
Atlante45
36db547c0f Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -08:00
ZappoMan
873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/Menu.h
 2015-01-06 12:27:16 -08:00
ZappoMan
0e943ae240 remove render view frustum mode 2015-01-05 17:23:10 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
95bb125e48 more voxelEctomy 2014-12-30 20:13:57 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
e1d8022409 working on removing voxels 2014-12-30 14:11:31 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Andrew Meadows
9b7e50858a merge upstream/master into andrew/inertia 
Conflicts:
	libraries/avatars/CMakeLists.txt
	libraries/entities/CMakeLists.txt
 2014-12-29 09:15:49 -08:00
Atlante45
da636ca918 ModelUploader only has static methods accessible 2014-12-23 14:00:23 -08:00
Atlante45
879c3e2fd0 Add entity model upload 2014-12-23 12:30:00 -08:00
Stephen Birarda
1ab66c2bfe split port and hostname for cleaner domain changes 2014-12-18 16:17:03 -08:00
Andrew Meadows
85fd1fc14f merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
 2014-12-18 13:46:06 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Andrew Meadows
6ea766b48d merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTypes.cpp
 2014-12-17 13:21:00 -08:00
ZappoMan
1a9cf126e4 Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 
Conflicts:
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-17 13:16:11 -08:00
ZappoMan
9f9b8bcb68 move interface/entities to libraries/entities-renderer 2014-12-17 12:54:41 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
ZappoMan
3dfded89b8 remove menu dependency from EntityTreeRenderer, some Application cleanup 2014-12-16 16:28:09 -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
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
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
Stephen Birarda
6fd55e6f42 make Audio class use DependencyManager 2014-12-16 12:31:01 -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
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -08:00
ZappoMan
e53833b306 make GlowEffect support DependencyManager 2014-12-15 17:29:48 -08:00
Atlante45
e5e2eb4e8a Moved GLCanvas in DM and DM to QSharedPointers 2014-12-15 16:20:52 -08:00
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
Andrew Meadows
67c3a25475 Merge branch 'master' of ssh://github.com/highfidelity/hifi into inertia 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityItem.h
 2014-12-15 14:46:46 -08:00
ZappoMan
49cacd85bd move GeometryCache to library 2014-12-15 14:00:41 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
Atlante45
68430e1346 Moved GLCanvas to DependencyManager 2014-12-15 11:54:33 -08:00
Atlante45
25df784f43 Headers cleanup 2014-12-15 10:56:42 -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
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