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

10293 commits

Author SHA1 Message Date
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
Stephen Birarda
8549e9cb53 resolve conflicts on merge with upstream master 2014-12-15 09:36:17 -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
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
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
Philip Rosedale
99fd7b3d6c Merge pull request #3963 from ZappoMan/test 
fix warning
 2014-12-13 23:16:16 -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
Andrzej Kapolka
c1c5991ac5 Fix for distorted replaced textures. 2014-12-12 12:07:48 -08:00
David Rowe
fe8937e37e Make lasers able to emanate from index finger tips 2014-12-11 21:31:08 -08: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
Philip Rosedale
b160d5b571 Merge pull request #3955 from ey6es/master 
Fix for normal and specular maps on skinned models.
 2014-12-11 15:23:59 -08:00
Philip Rosedale
8505aaceba Merge pull request #3953 from ZappoMan/someCleanup 
Remove some dead code from Voxel rendering
 2014-12-11 15:23:27 -08:00
ZappoMan
0813d53bee CR feedback 2014-12-11 15:17:22 -08:00
Andrzej Kapolka
77b19241d7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-11 14:44:30 -08:00
Andrzej Kapolka
7611354df6 Fix for normal maps on skinned models. 2014-12-11 14:43:58 -08:00
Brad Hefta-Gaub
31cbd6e88c Merge pull request #3954 from ctrlaltdavid/20226 
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
 2014-12-11 14:33:24 -08:00
ZappoMan
3eb7314c98 remove PrimitiveRenderer 2014-12-11 14:13:44 -08:00
ZappoMan
208d3c8413 remove old unused shaders 2014-12-11 13:59:21 -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
AndrewMeadows
bb6f976699 Merge pull request #3945 from ZappoMan/someCleanup 
AudioRefector-ectomy
 2014-12-11 10:39:41 -08:00
ZappoMan
ec54b609df dry up code and make chat window avoid the hmd screen 2014-12-10 17:23:39 -08:00
ZappoMan
06d348c399 get have addressbar avoid the hmd screen 2014-12-10 17:13:34 -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
7f887ba75f more spatial audio removal 2014-12-10 15:46:10 -08:00
ZappoMan
eda7432868 remove audio reflector 2014-12-10 15:37:48 -08:00
Andrzej Kapolka
d402f767c1 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-12-10 15:23:27 -08:00
Andrzej Kapolka
c57fd15bc9 Rather than loading the entire FBX file into a byte array, read it straight 
from the QNetworkReply.
 2014-12-10 15:22:48 -08:00
ZappoMan
74a6fd5ca7 fix joystick pick 2014-12-09 20:03:00 -08:00
Atlante45
88a576f846 fix action events for gamepad; 2014-12-09 19:35:38 -08:00
David Rowe
ff6db7a9fa Merge branch 'master' into 20226 2014-12-09 19:20:30 -08:00
David Rowe
8cf50b71ea Update some comments to reflect changes 2014-12-09 19:18:37 -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
David Rowe
136c3a2cce Replace 2D and 3D text overlay textWidth() method with textSize() 2014-12-09 18:32:53 -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
b197558b87 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 16:46:13 -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
Stephen Birarda
ada325da2b Merge pull request #3931 from Atlante45/mouse_pick_in_oculus 
Misc fixes
 2014-12-09 12:13:24 -08:00
Atlante45
649940de24 wrong pickray function 2014-12-09 11:53:32 -08:00
Atlante45
a6f7a1ce15 guard against NULL _models 2014-12-09 11:52:20 -08:00
ZappoMan
1eaa2caa6c fix to crash on rapidly switching domains 2014-12-09 11:40:47 -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
Atlante45
fa73730359 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:46:34 -08:00
ZappoMan
cdeaaf2ca9 fix deadlock in enter/leave events 2014-12-08 15:06:34 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
Brad Hefta-Gaub
a9079b64e4 Merge pull request #3922 from AndrewMeadows/thermonuclear 
overhaul EntitySimulation API (and relay relevant EntityItem properties to simulation when they change)
 2014-12-08 13:56:06 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202 
CR for Job #20202 - Add "backgroundVisible" property to text overlays
 2014-12-08 11:43:52 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -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
Philip Rosedale
60c2a89292 Merge pull request #3915 from ZappoMan/modelRayPick 
Proper Model Ray Picking
 2014-12-07 14:19:26 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
ZappoMan
1a1fb18ba1 removed dead code 2014-12-06 15:03:26 -08:00
ZappoMan
c8e648c4d7 removed unused menu item 2014-12-06 15:00:29 -08:00
ZappoMan
a03984a561 removed some debug code 2014-12-06 14:59:50 -08:00
ZappoMan
3bb16ce831 properly wire up precision picking in JS api 2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d Merge branch 'master' into 20202 2014-12-06 11:14:45 -08:00
ZappoMan
303274a554 tweaks and debug cleanup 2014-12-06 10:59:48 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00
ZappoMan
f1c6e2d1a2 more debugging 2014-12-05 19:52:48 -08:00
Andrew Meadows
7d96ad5836 cleanup of EntitySimulation API 
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
 2014-12-05 18:08:53 -08:00
Atlante45
d89d10d263 Hide cusor in VR mode 2014-12-05 17:36:46 -08:00
Atlante45
1bb08ef30f Centered reticule 2014-12-05 17:10:58 -08:00
Atlante45
ee124f580d removed _mouse{X,Y} 2014-12-05 17:02:49 -08:00
ZappoMan
ae647d39d0 fix models with registrations other than 0,0,0 2014-12-05 16:14:18 -08:00
Atlante45
469c958c98 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-05 15:30:20 -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
Sam Gateau
c49b753c98 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 13:38:30 -08:00
ZappoMan
d5fbe5b6b4 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 12:48:00 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
David Rowe
bd6ea9b4e7 Render with backgroundAlpha property 2014-12-05 11:18:03 -08:00
David Rowe
f5a1c26492 Add backgroundAlpha property to 2D and 3D text overlays 2014-12-05 11:08:00 -08:00
ZappoMan
0647211fb8 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-05 10:13:55 -08:00
Sam Gateau
0fbdda7582 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-05 10:13:38 -08:00
ZappoMan
d3aacc3838 Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorTest 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-05 10:11:49 -08:00
Philip Rosedale
0ad361fd60 Merge pull request #3902 from samcake/tot 
Adding detection of a "hifi" global light in a FBX file used to pass information
 2014-12-05 10:07: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
7322cd3ece Coding Standard 2014-12-04 20:16:50 -08:00
Atlante45
90d4e7bae9 Comments 2014-12-04 19:38:39 -08:00
Atlante45
d2b0cdbac3 Hydra reticule rendering for Oculus 2014-12-04 19:31:59 -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
Sam Gateau
66c10544ae Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-12-04 17:16:39 -08:00
Andrzej Kapolka
466d99bcbb Removed unused members. 2014-12-04 17:12:06 -08:00
ZappoMan
6b5fdceb6e more work on improved model picking 2014-12-04 16:48:04 -08:00
Andrzej Kapolka
ace415b138 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2014-12-04 16:46:32 -08:00
ZappoMan
f13bf65554 more work on improved model picking 2014-12-04 16:43:34 -08:00
ZappoMan
37ffa48fa3 more work on improved model picking 2014-12-04 16:43:12 -08:00
Sam Gateau
1102b4d633 Moving GPU into it's own library 2014-12-04 16:40:55 -08:00
Sam Gateau
f4e1af6abc clean code in GeometryCache around the FBX file loader 2014-12-04 12:02:30 -08:00
ZappoMan
b6fd3628c8 first round of hacking on implementing rendering of models for detailed ray picking 2014-12-04 12:00:38 -08:00
Atlante45
3b6936b47d Changed Mag and reticules data representation 2014-12-04 11:16:01 -08:00
Sam Gateau
592e902f46 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-04 00:25:15 -08:00
Atlante45
e246b979f7 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-03 17:50:17 -08:00
Atlante45
8d814ab07b Updated Oculus pickray 2014-12-03 17:05:42 -08:00
Atlante45
bd39688c62 Magnifiy window tweaks 2014-12-03 17:04:26 -08:00
Andrzej Kapolka
6764f29cd2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 16:49:10 -08:00
Andrzej Kapolka
8fb766a5d0 Only recreate the renderers for nodes that have changed. 2014-12-03 16:44:13 -08:00
Atlante45
0624ab7c72 Fixed aspect ratio and cropped overlay texture 2014-12-03 16:04:23 -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
Atlante45
73004d1bee Decoupled reticules from Overlays view 2014-12-03 14:40: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
Andrzej Kapolka
7a81e6c9e1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 14:30:31 -08:00
Sam Gateau
322dd38322 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-03 14:23:49 -08:00
Andrzej Kapolka
df23a84cc2 Bump up the glyph texture size so that we don't spill over into another 
texture.
 2014-12-03 14:18:47 -08:00
Sam Gateau
913007939b Trying to read the light attribute 2014-12-03 14:12:50 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Andrzej Kapolka
88048e8599 Make sure the position of the heightfield/voxel brush is valid before acting. 2014-12-03 12:47:32 -08:00
Andrzej Kapolka
d975e3f0ce Fixed signed/unsigned warnign. 2014-12-03 12:38:10 -08:00
Andrzej Kapolka
1e93137e6b Fix for overflow when computing metavoxel stats. 2014-12-03 12:24:58 -08:00
Andrzej Kapolka
e32c214e4d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-03 12:08:06 -08:00
Brad Hefta-Gaub
f70f07e694 Merge pull request #3890 from PhilipRosedale/master 
When in HMD, arrow keys make jump turns
 2014-12-03 10:54:22 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Philip Rosedale
d63ace9f61 fix angular velocity from oculus, tweak hair 2014-12-02 23:53:46 -08:00
Philip Rosedale
57e2f71bb7 remove unused body delta pitch, roll 2014-12-02 23:24:47 -08:00
Philip Rosedale
3ca20a7eee Add jump/warp turning when in HMD 2014-12-02 23:08:34 -08:00
Andrzej Kapolka
94d0612804 Fix for Hermite display. 2014-12-02 20:17:18 -08:00
Andrzej Kapolka
1a1b1ca3f3 Fix for voxelizing heightfields. 2014-12-02 19:49:27 -08:00
Andrzej Kapolka
990a533eea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 17:13:32 -08:00
Philip Rosedale
73d358b150 Merge pull request #3888 from PhilipRosedale/master 
Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js
 2014-12-02 15:31:50 -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
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Philip Rosedale
06b22cf605 ...and don't turn on/off UI from hydra 2014-12-02 14:50:25 -08:00
Andrzej Kapolka
284cd54e28 More detachment fixes. 2014-12-02 14:33:54 -08:00
Sam Gateau
8b75272cde Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-12-02 13:49:28 -08:00
Sam Gateau
40df497374 Hack for the Viking Palace scene before demo for good looking lightmaps 2014-12-02 13:48:59 -08:00
Atlante45
bf21376c90 TexturedHemisphere class 2014-12-02 13:34:11 -08:00
Andrzej Kapolka
d7a64260b1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 13:24:46 -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
Andrzej Kapolka
a022b7fa17 Fix for successive heightfield placements. 2014-12-02 13:12:45 -08:00
ZappoMan
cc012aad00 reset view frustum 2014-12-02 12:54:10 -08:00
Atlante45
3c5f33f0ac Hemisphere vbo refactoring 2014-12-02 12:28:04 -08:00
Andrzej Kapolka
b4b1559e32 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-02 12:07:38 -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
Andrew Meadows
b9944edf66 OctreeServer::createTree() is now protected 2014-12-02 11:13:37 -08:00
Andrew Meadows
0814949e4c moving EntityCollisionSystem back to entities lib 2014-12-02 11:05:17 -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
Brad Hefta-Gaub
9d213f9fb7 Merge pull request #3884 from huffman/entity-tools-polish 
Entity tools polish
 2014-12-02 10:21:20 -08:00
Brad Hefta-Gaub
7f8f57b055 Merge pull request #3879 from birarda/master 
fix for ice-server heartbeat without an access token, hifi:// URL
 2014-12-02 10:19:12 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Andrzej Kapolka
5b4869f43d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-12-01 16:43:39 -08:00
Ryan Huffman
0b7ddb009d Fix tabification of tool windows 2014-12-01 16:33:51 -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
dev
21d3892094 Merge branch 'master' of https://github.com/highfidelity/hifi into fbx 2014-12-01 13:03:18 -08:00
Ryan Huffman
fc5adef501 Update the tool window to use tabbed windows 2014-12-01 12:24:40 -08:00
Sam Gateau
845e687fc5 Adding a Hack for the apaartment model to boost the lightmaps 2014-12-01 11:45:07 -08:00
ZappoMan
6d7f799dbe oculus mirror lean hack 2014-12-01 10:32:35 -08:00
Stephen Birarda
40db44e4bd fix for custom hifi URL lookup 2014-12-01 09:59:51 -08:00
AndrewMeadows
1b5b4c0b44 Merge pull request #3872 from ZappoMan/cleanupMenus 
remove Entities developer menu items from C++ menu, make them available through script
 2014-12-01 09:29:56 -08:00
Philip Rosedale
e44ca5a7f7 Merge pull request #3876 from ZappoMan/bugFixes 
fixes the stutter in animation when observer moves
 2014-11-30 18:44:21 -08:00
Sam Gateau
321d651d77 Hack for avoiding lightmaps loading in starchamber 2014-11-30 12:54:43 -08:00
Brad Hefta-Gaub
91fe014411 Merge pull request #3875 from PhilipRosedale/master 
Auto-turn body when head yaw is beyond 45 degrees in HMD
 2014-11-30 05:40:55 -08:00
ZappoMan
5c2cc20313 fixes the stutter in animation when observer moves 2014-11-28 17:36:55 -08:00
David Rowe
583e079d3a Fix Hydra cursors in VR display 
They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
 2014-11-28 10:01:15 -08:00
Brad Hefta-Gaub
8a86b2d239 Merge pull request #3873 from samcake/tot 
Fix lighmaps for VC demo 12/1/2014
 2014-11-27 13:01:10 -08:00
Sam Gateau
c78af1c982 fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why 2014-11-27 10:48:36 -08:00
Philip Rosedale
c284303031 Merge branch 'master' of https://github.com/worklist/hifi 2014-11-26 20:35:51 -08:00
Philip Rosedale
56b27a2595 Merge pull request #3871 from ZappoMan/HMDMode 
Various HMD Tools improvements
 2014-11-26 20:33:38 -08:00
ZappoMan
fe010b685a more HMD Tools improvements, better support for detecting adding/removing screens 2014-11-26 20:19:23 -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
184acaedef switch to single button for mode switching 2014-11-26 19:43:01 -08:00
ZappoMan
85ca03199e remove Entities developer menu items from C++ menu, make them available through script 2014-11-26 17:53:41 -08:00
ZappoMan
fe9fab68bf don't exit app in full screen or hdm mode 2014-11-26 17:30:59 -08:00
Andrzej Kapolka
5710bfcf6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 16:19:16 -08:00