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

3089 commits

Author SHA1 Message Date
Atlante45
1f31828e08 Moved last methog out of Menu 
Also did a bit of Header cleanup
 2015-01-18 07:14:52 -08:00
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
3bce8204da Moved toggleSixense out of Menu 
Moved into SixenseManager
 2015-01-18 06:25:27 -08:00
Atlante45
8a827dbb3e Remove unneeded sendFakeEnterEvent() 2015-01-18 06:18:41 -08:00
Atlante45
488d8a03d5 Moved getShadowEnabled out of Menu 
Moved to Application
 2015-01-18 05:52:19 -08:00
Atlante45
d313c23871 Fixed unused variable warning 2015-01-18 05:41:05 -08:00
Atlante45
fdce0baee9 Removed vsync slot from menu 2015-01-18 05:39:53 -08:00
Atlante45
8d483c9e6e Moved some more dialogs out of Menu 
All moved into DialogsManager
 2015-01-18 04:34:33 -08:00
Atlante45
05edbd68bf Moved OctreeStatsDialog out of Menu 
Moved it into DialogsManager
 2015-01-18 03:48:37 -08:00
Atlante45
8f9507cd4c Added DialogsManager 
Moved login dialog out of menu into the dialog manager
	More to follow!
 2015-01-18 03:31:44 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu 
Moved it to OctreeQuery
 2015-01-17 23:31:38 -08:00
Atlante45
21a3705b48 Added StandAloneJSConsole class 
Moved _jsConsole out of Menu to a global class of it's own
 2015-01-17 23:08:30 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu 
Moved them to ViewFrustum
 2015-01-17 22:37:02 -08:00
Atlante45
ef5cfdc3ab Move Faceshift related member out of Menu 
Moved it to Faceshift class
 2015-01-17 21:35:25 -08:00
Atlante45
3fbc8c5d44 Moved Menu::shouldRenderMesh() to LODManager 2015-01-17 17:56:33 -08:00
Atlante45
a9047b7b15 LODManager class 
Moved most LOD related members in menu to new Dependency
LODManager
	Replaced all Menu::getInstance() call that accessed those
members by DM gets
 2015-01-16 17:55:47 -08:00
Thijs Wenker
6bad7a6002 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-17 01:35:35 +01:00
Andrew Meadows
d5119b3532 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/EntityMotionState.h
	libraries/physics/src/ObjectMotionState.cpp
	libraries/physics/src/PhysicsEngine.cpp
	libraries/physics/src/PhysicsEngine.h
 2015-01-16 14:36:27 -08:00
Stephen Birarda
9c1196a2a6 put user location without curly braces 2015-01-16 12:08:56 -08:00
Sam Gateau
d1fb071208 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:38:53 -08:00
Thijs Wenker
5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	examples/libraries/virtualKeyboard.js
 2015-01-15 22:59:05 +01:00
Stephen Birarda
93c3b2fb74 repairs for new DependencyManager format 2015-01-15 13:14:26 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -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
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
Philip Rosedale
67c3f9a3db Merge pull request #4107 from huffman/fix-update-my-avatar 
Fix issue with avatar data being sent too often
 2015-01-15 10:22:18 -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
426cd71fc6 Persist bookmarks to file 2015-01-14 22:58:13 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-01-14 17:55:03 -08:00
Thijs Wenker
80a81043ed Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 
Conflicts:
	interface/src/Menu.cpp
 2015-01-15 02:28:31 +01:00
Stephen Birarda
69869a696b remove name this location call from application 2015-01-14 17:00:21 -08:00
Stephen Birarda
f745dfdb91 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-14 16:54:51 -08:00
ZappoMan
2f549c776c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-14 14:41:51 -08:00
Thijs Wenker
2611e2f364 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-14 15:40:46 +01: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
48f1cbe644 Fixed QSharedPointer in connect() 2015-01-13 20:54:15 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
36db547c0f Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -08:00
Clément Brisset
3034b8f733 Merge pull request #4091 from ctrlaltdavid/20229 
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
 2015-01-13 17:07:17 -08:00
Stephen Birarda
6d2c87c7a3 put current domain hostname if no place name present 2015-01-13 15:15:39 -08:00
Stephen Birarda
6e1ba17c6e handle application title change for place name change 2015-01-13 15:07:45 -08:00
Stephen Birarda
92b8cd2d1e handle storage of user location in new format 2015-01-13 15:02:04 -08:00
Stephen Birarda
16261a5fc1 more updates for new place/location APIs 2015-01-13 14:49:24 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Thijs Wenker
7acb4e4716 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 00:43:47 +01:00
Thijs Wenker
3da5677aaf added HMD interface to toggle magnifier 2015-01-13 00:43:16 +01:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
891d8d5abf Removed unecessary foreach 2015-01-08 18:22:25 -08:00
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -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
Atlante45
9d5ff5d274 Fix mouse disappearing in the menus on Windows 2015-01-06 10:36:42 -08:00
Andrew Meadows
f3255eeb0e Merge pull request #4008 from birarda/lasagna-not-spaghetti 
some Audio cleanup in prep for audio untangle
 2015-01-06 09:13:12 -08:00
ZappoMan
0e943ae240 remove render view frustum mode 2015-01-05 17:23:10 -08:00
Sam Gateau
2fdcbb1a97 changing the atmoshpere position 2015-01-05 16:46:42 -08:00
Stephen Birarda
f116d0bf5d block until audio IO stops on app quit 2015-01-05 15:20:36 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
Sam Gateau
56758759e5 making the sun position a direction 2015-01-05 15:02:12 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Sam Gateau
f03b253260 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5 Merge pull request #4025 from ZappoMan/voxelEctomy 
Voxel ectomy
 2015-01-05 13:20:30 -08:00
Sam Gateau
3e4cbfd2dc clean code 2015-01-05 13:12:28 -08:00
Sam Gateau
7529b3d1b0 clean code 2015-01-05 13:10:32 -08:00
Sam Gateau
0b8b4c6d08 for simple shadow map, cover 2 regions of the view frustum and not just one for similar quality 2015-01-05 13:01:21 -08:00
Sam Gateau
458ea6759e Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes 2015-01-05 11:27:29 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -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
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub
d47b0a33ea Merge pull request #3995 from huffman/camera-display 
Camera tool - orientation + mode display
 2014-12-31 10:32:31 -08:00
ZappoMan
95bb125e48 more voxelEctomy 2014-12-30 20:13:57 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Philip Rosedale
f4f43d6b38 added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar 2014-12-30 15:11:32 -08:00
Ryan Huffman
0105906dc7 Merge branch 'master' of github.com:highfidelity/hifi into camera-display 
Conflicts:
	examples/editEntities.js
 2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c Rename 2D -> HUD, 3D -> World in Overlays 2014-12-30 14:50:17 -08:00
ZappoMan
e1d8022409 working on removing voxels 2014-12-30 14:11:31 -08:00
Stephen Birarda
ba09bbae3b use arrow notation for address manager in application 2014-12-29 11:02:45 -07: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
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
Brad Hefta-Gaub
07102c6a29 Merge pull request #3991 from huffman/fix-defaults-url 
Fix default scripts url to use s3.amazonaws.com
 2014-12-19 16:06:59 -08:00
Clément Brisset
dbfbe35a49 Merge pull request #3986 from birarda/domain-connect 
fix domain connection with port, show current address in address bar
 2014-12-19 12:49:51 -08:00
Ryan Huffman
e4ce7d11dc Fix default scripts url to use s3.amazonaws.com 2014-12-19 11:32:52 -08:00
Andrew Meadows
a141ce37e4 merge upstream/master into andrew/inertia 2014-12-19 10:25:03 -08:00
Thijs Wenker
e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216 
Conflicts:
	interface/CMakeLists.txt
 2014-12-19 13:53:33 +01:00
Stephen Birarda
1ab66c2bfe split port and hostname for cleaner domain changes 2014-12-18 16:17:03 -08:00
ZappoMan
8091564a73 remove all glut 2014-12-18 16:12:30 -08:00
Atlante45
296c0025de Switched to auto and changed macro 2014-12-18 15:42:38 -08:00
Andrew Meadows
11f01e1859 merge upstream/master into andrew/inertia 2014-12-18 15:01:08 -08:00
ZappoMan
6f6cf3b08d Merge branch 'master' of https://github.com/highfidelity/hifi into librarization 2014-12-18 14:52:00 -08:00
Atlante45
990362b8ff Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-18 14:18:21 -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
ZappoMan
11b4400099 move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
Stephen Birarda
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Stephen Birarda
9425ea2c17 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -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
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
ZappoMan
5d636e21c6 more Application dependency cleanup 2014-12-17 11:10:45 -08:00
Thijs Wenker
227e041a12 Merge branch 'master' of https://github.com/worklist/hifi into 20216 2014-12-17 19:42:44 +01:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
ZappoMan
3dfded89b8 remove menu dependency from EntityTreeRenderer, some Application cleanup 2014-12-16 16:28:09 -08:00
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
Stephen Birarda
eb790af193 hookup previous mouse press for mute to AudioToolBox 2014-12-16 15:30:28 -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
Atlante45
4d1529f77b typedefs 2014-12-16 14:02:22 -08:00
Atlante45
e8a22f6f0f Switched to chared pointers and macros 2014-12-16 13:54:52 -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
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
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
Stephen Birarda
1b48cf7f5a use DependencyManager for AddressManager 2014-12-15 14:54:20 -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
df7e115556 move ProgramObject to libraries 2014-12-15 14:21:22 -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
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
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
7d1081473e remove _textureCache 2014-12-15 09:42:35 -08:00
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -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
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -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
1db3592d4c Switched meFaceshifto DependencyManager for Faceshift 2014-12-14 19:56:42 -08:00
Thijs Wenker
821e9ddfed Merge branch 'master' of https://github.com/worklist/hifi into 20216 2014-12-13 23:05:04 +01:00
Thijs Wenker
3f26e1b63a RealSense Initial 2014-12-13 23:04:19 +01:00
Brad Hefta-Gaub
aae000d50e Merge pull request #3956 from Atlante45/dont_hide_mouse_on_every_window 
Don't hide mouse when over a widget
 2014-12-11 16:06:05 -08:00
Atlante45
df66a0049b Don't hide mouse when over a widget 2014-12-11 15:33:46 -08:00
Clément Brisset
14918ff86a Merge pull request #3952 from ZappoMan/HMDMode 
More HMD work - keep more dialogs from being moved to HMD
 2014-12-11 15:26:36 -08:00
ZappoMan
0813d53bee CR feedback 2014-12-11 15:17:22 -08:00
ZappoMan
29672aec09 removing VoxelShader and PointShader which were both disabled 2014-12-11 13:55:10 -08:00
Andrew Meadows
c3f8f8ab98 init PhysicsEngine with an EntityEditPacketSender 2014-12-11 13:29:29 -08:00
ZappoMan
c9bc95580d add support for generic windowWatcher that keeps dialogs from being moved to HMD display 2014-12-11 12:30:17 -08:00
AndrewMeadows
84e82cd03b Merge pull request #3947 from ZappoMan/HMDMode 
Make the Chat, Running Scripts, and Address bar "avoid" HMD Screen
 2014-12-11 10:48:32 -08:00
ZappoMan
ec54b609df dry up code and make chat window avoid the hmd screen 2014-12-10 17:23:39 -08:00
ZappoMan
d058b5554e make sure the running scripts widget doesn't start on the HMD screen 2014-12-10 16:58:36 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Brad Hefta-Gaub
69f7a89003 Merge pull request #3937 from Atlante45/mouse_pick_in_oculus 
Mouse pick improvments
 2014-12-09 18:33:25 -08:00
Atlante45
dc4c9cd545 Correctly Hide/Show cursor 2014-12-09 18:00:14 -08:00
Sam Gateau
01c13cd6f1 Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars 2014-12-09 17:58:17 -08:00
Atlante45
43dc35d549 Use correct mouse coordinate 2014-12-09 17:53:23 -08:00
Atlante45
8765d9a9b3 Mouse cursor modifications 2014-12-09 16:30:37 -08:00
Andrew Meadows
3fd2f12a73 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntitySimulation.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/SimpleEntitySimulation.cpp
	libraries/entities/src/SimpleEntitySimulation.h
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-09 12:41:53 -08:00
Atlante45
ba81030aa1 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:53:56 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
Atlante45
299389ccef Fixed typo 2014-12-08 09:59:33 -08:00
Atlante45
d89d10d263 Hide cusor in VR mode 2014-12-05 17:36:46 -08:00
Atlante45
ee124f580d removed _mouse{X,Y} 2014-12-05 17:02:49 -08:00
Atlante45
4bc7e1a3e8 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-05 14:46:52 -08:00
ZappoMan
e68e3fe774 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:06:17 -08:00
ZappoMan
9753c82a3b get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-05 10:04:23 -08:00
ZappoMan
feab942375 Revert "get rid of redundant _displayViewFrustum and use _viewFrustum" 
This reverts commit 6d385d9a75.
 2014-12-05 10:01:16 -08:00
Atlante45
9f444581e9 Fixed JS picking in oculus 2014-12-04 18:53:30 -08:00
Atlante45
84da070901 Correct mouse position in occulus 2014-12-04 18:27:03 -08:00
Atlante45
abe9704dbc Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-04 17:26:22 -08:00
Atlante45
7026af7b9a Centrilized Oculus interference in pickRay 2014-12-04 17:26:14 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Brad Hefta-Gaub
f10b656877 Merge pull request #3870 from AndrewMeadows/thermonuclear 
pull entity simulation out of EntityTree
 2014-12-03 14:30:44 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Andrew Meadows
a21ebe4f6a merge andrew/thermonuclear into andrew/inertia 2014-12-02 15:31:30 -08:00
Andrew Meadows
c9ea6885c1 PhysicsEngine is now an EntitySimulation 2014-12-02 15:29:41 -08:00
ZappoMan
a47a0377ef Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-02 14:57:30 -08:00
Andrzej Kapolka
4d233c09a3 At least on Linux, fixes an annoying issue where closing the application 
window causes it to disappear and reappear briefly before exiting.
 2014-12-02 13:19:39 -08:00
ZappoMan
cc012aad00 reset view frustum 2014-12-02 12:54:10 -08:00
ZappoMan
6d385d9a75 get rid of redundant _displayViewFrustum and use _viewFrustum 2014-12-02 11:45:33 -08:00
Andrew Meadows
ff7559c2c2 merge upstream/master into andrew/thermonuclear 2014-12-02 11:41:29 -08:00
Brad Hefta-Gaub
22bee75f7f Merge pull request #3885 from birarda/double-scripts 
fix for ScriptEngine blocked load
 2014-12-02 11:19:28 -08:00
Stephen Birarda
0a92374ca6 fix an incorrect connection to script load error 2014-12-02 10:39:20 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Andrew Meadows
1df6c32a4e moving Shape* back into shared lib 
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
 2014-12-01 16:03:14 -08:00
Stephen Birarda
40db44e4bd fix for custom hifi URL lookup 2014-12-01 09:59:51 -08:00
Philip Rosedale
c284303031 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-26 20:35:51 -08:00
Philip Rosedale
e822b191d0 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-26 19:57:31 -08:00
Philip Rosedale
39042f61cd 1P mirror can lean fwd/back 2014-11-26 19:57:18 -08:00
ZappoMan
fe9fab68bf don't exit app in full screen or hdm mode 2014-11-26 17:30:59 -08:00
Andrew Meadows
5acaaa9c3b merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-26 15:36:08 -08:00
ZappoMan
2fc3fdc7e6 improve how cameras are reset when leaving vr mode 2014-11-26 12:26:02 -08:00
Andrew Meadows
d84f57fafa merge upstream/master into andrew/thermonuclear 2014-11-26 12:18:19 -08:00
Andrew Meadows
cda8ac85c1 EntityCollisionSystem moves to interface 
and interface connects EntityCollision system to EntityTree
 2014-11-26 12:15:24 -08:00
ZappoMan
53ecf97df2 fix broken camera after leaving oculus/hmd mode 2014-11-25 21:58:26 -08:00
ZappoMan
333f323856 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode 2014-11-25 12:46:18 -08:00
ZappoMan
6108f7d9cd fix bug in resetSensors moving cursor to center of window on multiple screen systems 2014-11-25 12:45:20 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
649ae4a448 Update 3D overlays to only use one list 2014-11-25 09:49:10 -08:00
ZappoMan
a28d74570d bug fixes in setFullscreen() and setEnableVRMode() 2014-11-25 09:25:22 -08:00
Ryan Huffman
8b982872c2 Add calls to Overlays::render3DFront() 2014-11-24 23:19:53 -08:00
Andrew Meadows
37093cbd00 merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-11-24 11:24:39 -08:00
ZappoMan
b2c342c5c7 add support for unload method 2014-11-20 15:36:28 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Andrew Meadows
47f2cbd73b merge upstream/master into andrew/inertia 2014-11-19 17:07:55 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Andrew Meadows
961dc5a231 merge andrew/thermonuclear into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
 2014-11-19 15:41:53 -08:00
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -08:00
dev
ce50152863 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-19 01:06:33 -08:00
dev
4028e66c08 trying to fix the lighting issue in stereo and fix the display name size and orientation 2014-11-18 18:59:54 -08:00
Stephen Birarda
2274b35d08 connect to sandbox domain by default 2014-11-18 15:35:11 -08:00
Andrew Meadows
388830c2a2 Merge branch 'bispinor' into inertia 
Conflicts:
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/BoxEntityItem.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
 2014-11-18 10:23:38 -08:00
Andrew Meadows
2d400e6ae0 rename PhysicsWorld to PhysicsEngine 2014-11-18 09:55:25 -08:00
David Rowe
bb15fc138c Fix Bandwidth Details dialog opening if click meter's pos when UI hidden 2014-11-15 09:28:40 -08:00
Sam Gateau
0973d197cf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 12:25:00 -08:00
Brad Hefta-Gaub
1d14f94cb0 Merge pull request #3797 from huffman/entity-tool-properties 
Entity Tools - Properties window, Tool window, Various fixes
 2014-11-14 11:48:57 -08:00
Sam Gateau
cc78000641 introduce the concept of side thorugh out the rendering traversal 2014-11-14 11:22:11 -08:00
Ryan Huffman
28eebd3fa5 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tool-properties 2014-11-14 10:53:18 -08:00
Ryan Huffman
604b1b620b Move dock window to ToolWindow 2014-11-14 10:52:08 -08:00
Stephen Birarda
903cd05ff8 put newlines back in interface log 2014-11-14 10:39:45 -08:00
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
Andrew Meadows
5eb606c44a merge upstream/master into andrew/inertia 2014-11-14 09:04:27 -08:00
Andrew Meadows
1a094f2b51 reorder PhysicsWorld and EntityTree in Application 2014-11-14 09:03:41 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
Ryan Huffman
6b2a497810 Merge branch 'master' of github.com:highfidelity/hifi into entity-tool-grid-fixes 2014-11-13 17:48:17 -08:00
Ryan Huffman
03f155bcd8 Add tool window 2014-11-13 17:47:02 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
Andrew Meadows
1bed4eeb5b merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityTree.cpp
 2014-11-13 10:53:23 -08:00
Andrew Meadows
7f46ac0935 EntityTree gtts PhysicsWorld*, with less error 2014-11-13 10:12:52 -08:00
Andrew Meadows
ebe24b5c4c give the EntityTree a pointer to its PhysicsWorld 2014-11-13 10:04:55 -08:00
Andrew Meadows
14f49df44d Application gets a ThreadSafePhysicsWorld 2014-11-13 10:02:36 -08:00
ZappoMan
13f08e65d1 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 
Conflicts:
	interface/src/renderer/Model.h
 2014-11-12 19:31:27 -08:00
Sam Gateau
c0496fd466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 16:52:34 -08:00
Sam Gateau
d3a7b011bf defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp 2014-11-12 16:52:11 -08:00
Sam Gateau
8fb04af59d defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design 2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub
70c463695a Merge pull request #3779 from PhilipRosedale/master 
Remove buckyBalls and faceshift lean-to-drive
 2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub
331e9d6558 Merge pull request #3775 from birarda/lobby 
repairs to local audio injection
 2014-11-12 16:26:38 -08:00
David Rowe
8c3bedae9d Add position vector and color object script value examples 
OverlayPropertyResult type is needed to successfully move QScriptValue
objects from QScriptEngine in Overlays to QScriptEngine in script.
 2014-11-12 14:33:52 -08:00
Philip Rosedale
6af2b7aadf remove buckyballs and face shift lean driving (should be a script if desired) 2014-11-12 07:33:59 -08:00
Sam Gateau
5f0fdeccb2 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 00:27:12 -08:00
Sam Gateau
b716a512c6 Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level 2014-11-12 00:26:44 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
9bd870f4b0 fix hifi url handling after update to 5.3.2 2014-11-11 20:45:04 -08:00
Sam Gateau
7a9f45d34f Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-11 16:40:11 -08:00
Sam Gateau
668c5e298d clean up the Transform class and the rendering path in Model.cpp 2014-11-11 16:39:00 -08:00
Stephen Birarda
0e30c65e60 handle cleanup of local injection, volume 2014-11-11 15:12:11 -08:00
Andrew Meadows
0d0f98f669 init and step physics simulation 2014-11-11 12:09:59 -08:00
Stephen Birarda
d0e8c294da handle passing of local audio interface to AudioInjector 2014-11-11 11:22:16 -08:00
Andrew Meadows
fa48da6c98 merge upstream/master into andrew/inertia 
Conflicts:
	libraries/entities/src/EntityItem.cpp
 2014-11-11 11:14:12 -08:00
Andrew Meadows
82d7b70ec9 add offset to physics simulation 2014-11-11 10:56:31 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Ryan Huffman
a1d771a0be Rename WebWindow to WebWindowClass 2014-11-11 10:03:14 -08:00
Sam Gateau
ad51416c28 move the transform class files to the Shared library, still problem with negative scale composition 2014-11-11 09:54:35 -08:00
Andrzej Kapolka
5f89b6e00e The spec actually says that the 'L' (should have been 'LL' anyway) isn't 
necessary; the compiler will know to read the constant as a long long.
 2014-11-10 11:58:52 -08:00
Sam Gateau
7ccb7495c7 Merge and resolve conflict on APplication.cpp 2014-11-10 10:07:24 -08:00
Sam Gateau
631ed9da78 let's start reusing the Batch per model from frame to frame 2014-11-10 10:04:19 -08:00
Brad Hefta-Gaub
fc89f92097 Revert "Revert "Fix build warning"" 2014-11-07 21:53:56 -08:00
Brad Hefta-Gaub
09490b58b4 Revert "Fix build warning" 2014-11-07 21:47:28 -08:00
David Rowe
94d82455a0 Fix build warning 2014-11-07 19:56:54 -08:00
Andrzej Kapolka
cd110d6048 Fix for invalid projection matrix on startup. 2014-11-07 14:35:01 -08:00
Andrzej Kapolka
7008012492 Trigger fixes. 2014-11-07 14:20:31 -08:00
Andrzej Kapolka
a4db244182 Mirror/warning fixes. 2014-11-07 13:57:20 -08:00
Stephen Birarda
beb7c339f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-11-07 11:18:04 -08:00
Stephen Birarda
f1a238a6c2 piping for local UI sounds 2014-11-07 10:08:09 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
ZappoMan
55576e7f9d fix crash in mouse messages while quitting 2014-11-06 17:53:22 -08:00
ZappoMan
bceab4ead9 clear all octree related state when disconnecting from a domain 2014-11-06 17:25:49 -08:00
Stephen Birarda
455cbac8a5 repairs to node hash iterations in Application 2014-11-06 15:16:45 -08:00
Ryan Huffman
3e109ee770 Add WebWindow widget for scripts 2014-11-06 14:57:04 -08:00
Sam Gateau
b0189efcdf Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-06 10:56:54 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
Stephen Birarda
663167d684 wait on AudioInjectors when shutting down interface 2014-11-05 10:37:22 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Sam Gateau
99eb46f218 Removed any checkGLError so they do not show 2014-11-04 17:10:17 -08:00
Sam Gateau
27aadd24b3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-04 16:43:26 -08:00
Sam Gateau
441d09a460 debugiing the mysterious glError coming from glFrustum 2014-11-04 16:42:58 -08:00
Brad Hefta-Gaub
24c324fd1d Merge pull request #3735 from ctrlaltdavid/20126 
CR for Job #20126 - Rift HUD shouldn't move with head
 2014-11-04 15:52:10 -08:00
Brad Hefta-Gaub
583b7b1267 Merge pull request #3732 from thoys/20166 
CR for Job #20166 - Extend AudioDeviceScriptingInterface to have muted property and mute event
 2014-11-04 15:51:05 -08:00
Stephen Birarda
f53455ee55 use a ray from the near clip for action ray 2014-11-04 11:40:47 -08:00
Stephen Birarda
790aa848ae leverage Camera object for scripting, remove sep interface 2014-11-04 10:33:55 -08:00
Stephen Birarda
957705998f fix an uninitialized action ray when hitting spacebar 2014-11-04 10:19:56 -08:00
Stephen Birarda
8d6b041758 send a pick ray with HFActionEvent, not x,y 2014-11-04 10:01:25 -08:00
Stephen Birarda
d3372537c5 Merge pull request #3715 from ZappoMan/entityScriptsAndEvents 
Entity Scripts
 2014-11-03 15:02:52 -08:00
Sam Gateau
4d1fbc1cf9 Fix end of line in Application.cpp 2014-11-03 14:39:34 -08:00
Sam Gateau
a4bd0acc91 Fix the syntax issue with if blocks 2014-11-03 14:36:03 -08:00
Sam Gateau
eae604d77e Merged with upstream master 2014-11-03 13:37:17 -08:00
Sam Gateau
cecf79e580 Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state 2014-11-03 11:22:23 -08:00
Brad Hefta-Gaub
9fb4f91f2a Merge pull request #3716 from ctrlaltdavid/20152 
CR for Job #20152 - Interface cache goes away when you close Interface.
 2014-11-03 11:07:36 -08:00
ZappoMan
49a389618e Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 2014-11-03 10:54:19 -08:00
Thijs Wenker
af74fc09b9 Adds AudioDevice mute functionality to ScriptEngine 2014-11-01 02:42:22 +01:00