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

6744 commits

Author SHA1 Message Date
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
SamGondelman
403b18977b remove unused HFMetaEvents 2017-10-11 14:37:23 -07:00
Zach Fox
f037eab26c Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-11 11:07:32 -07:00
Sam Gateau
f143c28625 Merge pull request #11542 from SamGondelman/bubbleBoy 
Move HUD and HUD overlay rendering out of display plugin
 2017-10-10 14:26:20 -07:00
Zach Fox
0ae69b6ad9 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-10 12:38:14 -07:00
Zach Fox
b105248dd7 Merge pull request #11555 from zfox23/commerce_daveIntegration2 
2017-10-09 Commerce Frontend Updates
 2017-10-10 12:34:30 -07:00
Clément Brisset
3b48833cc0 Merge pull request #11451 from huffman/feat/upload-user-event 
Add uploading to asset server event
 2017-10-10 11:03:33 -07:00
Seth Alves
f349ba3674 replace parent avatar-id with avatar-self-id when exporting entities 2017-10-09 15:32:45 -07:00
Zach Fox
b81a8a95ea Final fixes 2017-10-09 15:23:22 -07:00
Seth Alves
d1d2b8a4da don't export avatar-parent sessions IDs into json 2017-10-09 14:02:20 -07:00
Andrew Meadows
bbde1bcd63 move stuff out of writelock when possible 2017-10-09 10:42:42 -07:00
Andrew Meadows
0bcecdbe66 be picky when finding nearby entities at login 2017-10-09 10:27:46 -07:00
Andrew Meadows
0f4e7fb532 workaround for bad physics polling on login 2017-10-09 10:27:46 -07:00
SamGondelman
e95ecc3f27 fix missing sensorToWorld matrix 2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98 merge with master 2017-10-06 14:57:08 -07:00
Zach Fox
1fa9bd8fc6 Better implementation of location change and bugfixes 2017-10-06 12:22:29 -07:00
Ryan Huffman
9c06afc4c8 Merge pull request #11326 from cain-kilgore/21537 
WL 21537 - Improve log naming
 2017-10-06 08:51:42 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Andrew Meadows
cd4be1473f put more of Application::update() under time measurement 2017-10-03 10:34:12 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
samcake
bb99f68d40 Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead 2017-10-02 17:04:00 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Andrew Meadows
0fc6bf1e89 Merge pull request #11471 from Atlante45/feat/auto-bake 
Asset Browser tweaks
 2017-10-02 11:29:36 -07:00
Sam Gateau
68046ae4e3 Merge pull request #11491 from jherico/dev/disable_watchdog 
Disable watchdog with environment variable
 2017-10-02 10:19:32 -07:00
Zach Fox
1ec0f5d9a0 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-10-02 09:26:59 -07:00
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
Sam Gateau
6c510bc18f fine tuning the changes to respect clean up 2017-10-01 20:05:48 -07:00
samcake
0cbf19bcf1 Removing comments 2017-10-01 17:47:35 -07:00
samcake
aa10c29609 Cleaning up the changed code 2017-10-01 17:16:10 -07:00
Sam Gateau
44cc6deac2 moving render specific code from Application.cpp to Application_render.cpp 2017-10-01 12:55:44 -07:00
samcake
577378f539 Adding stuff that seems to break? 2017-09-29 17:45:10 -07:00
samcake
225d2bbbb4 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 13:47:37 -07:00
Zach Fox
63396a2fc3 WalletScriptingInterface; wallet status refactor 2017-09-29 13:42:04 -07:00
Andrew Meadows
1c30f7424e remove cruft and add comments 2017-09-29 11:34:35 -07:00
SamGondelman
3ae41b9b75 cleanup client and stats string 2017-09-29 11:34:35 -07:00
Andrew Meadows
fb3e74398f don't invalidate viewFrustum sent to server 2017-09-29 11:34:35 -07:00
SamGondelman
cbf82a6f2c fix timeout for physics check 2017-09-29 11:34:34 -07:00
Brad Davis
a7d507e9fd Disable watchdog with environment variable 2017-09-29 10:44:04 -07:00
SamGondelman
b59ec07171 move hud rendering to render thread, still need to separate out hud overlays 2017-09-29 09:49:08 -07:00
samcake
c112a3baf1 Seting up of camera and avatar correctly in game loop, not in render loop 2017-09-28 15:09:49 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
samcake
40ca98214b Moving all of the camera and avatar eval to game loop 2017-09-27 17:58:43 -07:00
Sam Gateau
287f4f1d71 Merge pull request #11466 from SamGondelman/mirrorCrash 
Fix mirror and fade threading crashes
 2017-09-27 16:17:04 -07:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00
Sam Gateau
88097bb39f Merge pull request #11447 from AndrewMeadows/lod-auto-adjust 
LODManager uses batchTime and engineRunTime for automatic LOD adjustment
 2017-09-27 10:51:46 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Atlante45
acb0bf8d20 Asset Browser tweaks 2017-09-26 17:26:46 -07:00
samcake
f16c552978 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-26 17:18:05 -07:00
Andrew Meadows
dafadf82bb Merge pull request #11458 from jherico/fix/tablet_latency 
Fix long tablet lag on first load
 2017-09-26 16:18:31 -07:00
samcake
328dd9c108 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue 2017-09-26 16:12:27 -07:00
Seth Alves
913d3c4d12 Merge pull request #11422 from hyperlogic/feature/ant-man2 
Secondary IPD fixes
 2017-09-26 11:53:45 -07:00
Dante Ruiz
e397d49564 Merge pull request #11159 from vladest/modal_dialogs_async 
Modal dialogs async
 2017-09-26 11:07:42 -07:00
samcake
669af73a96 Bringing as much as possible out from render to game 2017-09-26 10:47:24 -07:00
Sam Gateau
953614fe65 More stuff out of render to the gameloop 2017-09-25 23:43:32 -07:00
samcake
157b4f2e13 Moving some of the updates on the camera and the avatar out from render to game loop 2017-09-25 18:28:33 -07:00
Brad Davis
40c42d35a5 Fix long tablet lag on first load 2017-09-25 17:50:04 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Andrew Meadows
37c501b131 LODManager uses renderTime instead of main loop fps 2017-09-25 13:17:21 -07:00
vladest
b190fac4f1 Fix stylus 2017-09-25 19:45:51 +02:00
vladest
b5f0c4d940 Added settings controls sounds 2017-09-25 16:46:36 +02:00
vladest
5a452fa981 Merge branch 'master' into tablet_extended_sounds 2017-09-25 15:40:40 +02:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
Sam Gateau
daf18156f9 Merge pull request #11418 from SamGondelman/laserLaser 
Don't let scripts control visibility of laser pointer overlays
 2017-09-20 17:54:00 -07:00
Anthony J. Thibault
5e93c13856 warning fix 2017-09-20 16:36:33 -07:00
SamGondelman
f21c99257e don't let scripts control visibility of laser pointers 2017-09-20 14:35:29 -07:00
Elisa Lupin-Jimenez
1ac0a8224f removed extraneous printouts again 2017-09-20 14:23:53 -07:00
Elisa Lupin-Jimenez
92550b749c removed extraneous printouts 2017-09-20 14:23:09 -07:00
Elisa Lupin-Jimenez
02fa7395ac Merge branch 'master' of https://github.com/highfidelity/hifi 2017-09-20 14:21:19 -07:00
Elisa Lupin-Jimenez
b8fdb66745 added support for fbx formats 2017-09-20 14:20:43 -07:00
Anthony J. Thibault
0873b88347 code review feedback 2017-09-20 09:21:15 -07:00
Anthony J. Thibault
809e986738 Fixes for lasers on 2d HUD 2017-09-20 09:21:14 -07:00
vladest
56e6c8674a Merge branch 'master' into webbrowser_updates 2017-09-20 14:38:09 +02:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
vladest
5202d024a7 Merge branch 'master' into tablet_extended_sounds 2017-09-19 15:55:37 +02:00
Elisa Lupin-Jimenez
a41aced032 Merge pull request #11390 from elisa-lj11/master 
Fixed blocks download issue with `noDownload=false` tag
 2017-09-18 13:23:47 -07:00
Anthony J. Thibault
7e2b2960ed Fix for lighting as IPD scale changes. 
(cherry picked from commit a260aaaae8)
 2017-09-18 12:15:32 -07:00
Elisa Lupin-Jimenez
a45cc88e55 Fixed blocks download issue with noDownload=false tag 2017-09-18 11:41:30 -07:00
Anthony J. Thibault
0757f513af Merge branch 'master' into feature/ant-man 2017-09-18 11:36:39 -07:00
vladest
e26118254f Implemented Audio injector in Tablet scripting interface. Added missed sound events 2017-09-18 19:40:06 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Sam Gateau
a70f7dfc87 put updateCamera in its function 2017-09-13 22:05:20 -07:00
Cain Kilgore
1c05311056 Some code cleanup 2017-09-13 16:48:18 +01:00
samcake
01e4bfc53e Trying to avoid calling getTransform on nestables from render thread 2017-09-11 17:36:10 -07:00
Cain Kilgore
b69bd0ef49 Removed old Disconnect 2017-09-09 17:23:18 +01:00
Cain Kilgore
f6e22b0733 Changes 
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
 2017-09-09 17:21:42 +01:00
Cain Kilgore
0820eadc5b Fixed a thing 2017-09-08 23:52:04 +01:00
Cain Kilgore
387e474889 WIP 2017-09-08 23:48:09 +01:00
Cain Kilgore
f109a86b23 Fixed small crash bug on exit 2017-09-08 23:05:22 +01:00
Anthony J. Thibault
72e0c844e4 Merge branch 'master' into feature/ant-man 2017-09-08 14:08:26 -07:00
Cain Kilgore
b953c49461 Commit for Better Logger - WL 21537 2017-09-08 03:20:55 +01:00
Anthony J. Thibault
7ca498dc7f Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar. 2017-09-07 16:28:08 -07:00
Brad Davis
cc3beb3d91 Fix potential crash on asynchronous QML loads 2017-09-07 09:53:21 -07:00
Anthony J. Thibault
2f850826f2 Allow override of near/far clip planes in Oculus and OpenVR plugins 2017-09-06 11:02:44 -07:00
Chris Collins
8563a05431 Merge pull request #11255 from misslivirose/feat/tablet-tutorial 
Removing tutorial paths for first run experience
 2017-09-06 09:23:45 -07:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
Liv
930243539c add back first run to false and fix formatting 2017-09-05 17:50:25 -07:00
anshuman64
3a44c6977e Merge pull request #11300 from ElderOrb/case7196 
7196 Mouse pointer no longer visible in HMD mode
 2017-09-05 17:42:36 -07:00
Dante Ruiz
fec8482b69 Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man 2017-09-05 16:26:51 -07:00
Anthony J. Thibault
f0912987a3 Fix ray picks against HUD sphere at different sensor scale factors 2017-09-05 10:03:19 -07:00
vladest
87a5a6a5b9 Merge branch 'master' into webbrowser_updates 2017-09-05 13:12:27 +02:00
vladest
6de00c7969 Implemented suggestions popup. Cleanup 2017-09-05 13:11:52 +02:00
beholder
c62f9007e9 7196 Mouse pointer no longer visible in HMD mode 
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.

The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
 2017-09-03 15:20:59 +03:00
Liv
7eab80e494 change message when permissions to replace domain content are not present 2017-09-01 13:17:37 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
Liv
8d21b286b4 string fix 2017-08-31 19:34:01 -07:00
Anthony J. Thibault
6618ba12e9 Merge branch 'master' into feature/ant-man 2017-08-31 18:10:39 -07:00
vladest
1b5e6fd5f8 Merge branch 'master' into modal_dialogs_async 2017-08-31 20:39:48 +02:00
Anthony J. Thibault
c9cdaadeb5 Better scale support in SpatiallyNestable class. 
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.

Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field.  a new _dimensions member variable is used instead.  The SpatiallyNestable scale
field for entities should always be one.

Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.

Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.

Added qDebug stream support for Transform class.
 2017-08-30 15:46:36 -07:00
Zach Fox
fdcc149c34 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-30 13:27:18 -07:00
Zach Fox
271fcbf8b4 Merge pull request #11271 from davidkelly/dk/securityImageIssue 
security image shows up in every qml engine now
 2017-08-30 10:52:48 -07:00
Liv
2f2b406047 Remove unneeded handcontrollertype code from handle first run checks 2017-08-30 09:23:33 -07:00
Anthony J. Thibault
9cd8b6991e Merge branch 'master' into feature/ant-man 2017-08-30 08:58:55 -07:00
Chris Collins
47a2e57e26 Merge pull request #10625 from humbletim/21180-C++ 
CR 21180-C++ Camera app -- core changes
 2017-08-30 07:20:00 -07:00
David Kelly
a2b1cfc7ac security image shows up in every qml engine now 2017-08-29 17:06:57 -07:00
Liv
59deccaeb5 Remove unused skipTutorial code 2017-08-29 14:55:59 -07:00
Zach Fox
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -07:00
Anthony J. Thibault
573985c7c9 Merge branch 'master' into feature/ant-man 2017-08-28 09:27:04 -07:00
vladest
38295ab73f Merge conflicts 2017-08-28 16:58:30 +02:00
vladest
78aa5820d0 Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings 2017-08-27 11:56:28 +02:00
Liv
59fe5ffdc1 Initial attempt at changing first run behavior 2017-08-25 17:48:35 -07:00
Elisa Lupin-Jimenez
4c40e3bdf4 fixed weird info box display of filenames 2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez
7cee80f0cf my own objects (or rather objects with low poly count) download now 2017-08-25 11:09:11 -07:00
Sam Gateau
c5fbd5a2a5 Merge pull request #11131 from jherico/threaded_render_entities 
Threaded rendering of Entities
 2017-08-24 17:34:49 -07:00
Chris Collins
43b1e67e4a Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter 
Create home bookmark for new content sets loaded in
 2017-08-24 16:25:04 -07:00
Zach Fox
56950e4614 It's working! 2017-08-24 14:17:39 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04:00
David Kelly
eb9436ba96 Merge pull request #11235 from davidkelly/dk/encryptFile 
Initial wallet app plus some encryption of security image
 2017-08-24 13:17:14 -07:00
Zach Fox
e834e9d7a7 Progress 2017-08-24 10:46:18 -07:00
Zach Fox
657beef70f I understand again...getting started again 2017-08-23 17:42:02 -07:00
Liv
1050141b11 Create home path for new content sets loaded in 2017-08-23 17:38:24 -07:00
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Zach Fox
69364f2ecd Initial progress 2017-08-22 17:10:57 -07:00
Zach Fox
ec2a27e68c Progress 2017-08-22 15:02:06 -07:00
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
Anthony J. Thibault
d62a0ea8ff Correct controller offsets with sensor scaling 2017-08-22 11:43:39 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
Anthony J. Thibault
ffdb10681e Fix for laser rendering and positioning with sensor scale 2017-08-22 11:07:04 -07:00
Anthony J. Thibault
8e56404c40 Fixes for flying and rotation re-centering in wikiplanet 2017-08-21 17:42:25 -07:00
Anthony J. Thibault
963ddce7bc Use eye-height to match user and avatar scales, follow fixes 
Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.
 2017-08-21 17:42:24 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
vladest
4e5c650621 Modified some usecases for async dialogs 2017-08-16 21:41:18 +02:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
vladest
8326600274 Merge branch 'master' into modal_dialogs_async 2017-08-16 13:48:47 +02:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
vladest
757af1e2e5 Added Save, Directory and Assets async methods 2017-08-15 14:44:01 +02:00
vladest
ac7aa609f2 Open file async implemented 2017-08-14 16:23:53 +02:00
vladest
63e907e7b6 Merge branch 'master' into modal_dialogs_async 2017-08-12 13:04:52 +02:00
Seth Alves
972a24fea9 Merge pull request #11169 from anshuman64/new-branch 
High Fidelity Interface Application Rename
 2017-08-10 15:57:10 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Anshuman Dewangan
f79bf4e009 High Fidelity Interface rename 2017-08-10 13:40:00 -07:00
vladest
b780d4bce3 Merge branch 'master' into modal_dialogs_async 2017-08-10 10:52:35 +02:00
Liv
6bde4db0d7 wrap in marketplace check and change landing point 2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez
17acf0520d Download from blocks in marketplace working 2017-08-09 11:08:14 -07:00
Liv
0784686450 small typo fix 2017-08-09 10:17:31 -07:00
howard-stearns
9349e72eeb Merge branch 'master' of https://github.com/highfidelity/hifi into buy 2017-08-09 10:00:36 -07:00
Liv
bd1619b1b2 update error message wording 2017-08-09 09:14:46 -07:00
vladest
556569819d 1st stage of moving to async dialogs 2017-08-09 14:00:19 +02:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
Liv
ab8f5c1288 add user logging detail message 2017-08-08 13:55:07 -07:00
Liv
3f30162215 Make spawning point not 0,0,0 and change error message 2017-08-08 09:44:36 -07:00
SamGondelman
42147640e2 remove LaserPointerManager as a dependency 2017-08-07 14:18:56 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Seth Alves
af1e27dc36 Merge pull request #11053 from hyperlogic/feature/secondary-pose-support 
Improved support for Vive Trackers on biceps
 2017-08-07 13:11:48 -07:00
howard-stearns
9bad26c2db stub files 2017-08-07 12:51:30 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
Elisa Lupin-Jimenez
a246c59277 changed debug print for unsupported entity files 2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez
8c9ce82986 Fixed Mac and Ubuntu platform build issue (hopefully) 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
692aa4c4b9 Clara download working again, still can drag in Blocks zip 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6 Removed extraneous print statements 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c3d943ff72 Drag zip folder works 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb Merge pull request #11110 from Armads/WL21423 
Camera mode on startup is determined by user settings and HMD status
 2017-08-04 13:16:34 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
Armads
dff4e6e32c WL21423 Changing order of camera setup steps 2017-08-03 15:40:38 -04:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
Armads
24718e2424 WL21423 Camera mode on startup is determined by user settings and HMD status 2017-08-03 09:03:23 -04:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
humbletim
3bcbec87e0 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-30 16:15:34 -04:00
Stephen Birarda
17dd028ec7 make Paths available to desktop and tablet QML context 2017-07-28 14:23:18 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi 
Midi support for Entities
 2017-07-28 10:51:43 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Liv
be860d6c87 small string fix 2017-07-26 10:20:29 -07:00
Liv
63d637c4db Add line to move user back to origin to be near new content 2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
2377e4a5db fix message formatting 2017-07-25 11:32:02 -07:00
Liv
89a1c7a697 code cleanup 2017-07-25 11:24:57 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8 Move logic for confirmation into Application.cpp for handling files directly 2017-07-24 18:09:32 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Seth Alves
97756e6140 accidently deleted a break 2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753 use alt+h for mirror-mode 2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b use alt+f for 1st person camera and alt+o for 3rd 2017-07-24 15:56:37 -07:00
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01:00
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02:00
anshuman64
5f3b68d544 Use ctrl+H instead of alt+H 2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927 mods for changes camera views 2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa Add hover/unhover handlers to context overlays 2017-07-20 16:51:00 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
084f4d2ab0 Why were Web3DOverlays done this way? 2017-07-18 14:42:59 -07:00
humbletim
f9e0e616f7 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-18 17:34:39 -04:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d Ensure we continue calling idle when minimized 2017-07-18 13:44:58 -07:00
SamGondelman
55a025b827 initial code review 2017-07-18 12:43:34 -07:00
Dante Ruiz
976fec66f8 fixed loading script whitespace 2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub
d94365cc44 Merge pull request #10979 from zfox23/hoverOverlay_lasers 
Create/Destroy Hover Overlays using hand controller lasers
 2017-07-18 08:44:48 -07:00
Olivier Prat
236270d798 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-18 10:47:21 +02:00
Zach Fox
67c8ddfd57 Merge in changes from laser PR 2017-07-17 17:09:40 -07:00
Zach Fox
96f52a9812 First pass at getting overlays to show up on hover 2017-07-17 17:05:16 -07:00
utkarshgautamnyu
758ae9825d Merge pull request #10939 from highfidelity/bug/6118 
Record total number of ATP/HTTP/File bytes downloaded during session
 2017-07-17 13:53:21 -07:00
Zach Fox
974dff36b0 Make hover overlays work for hand controller lasers 2017-07-17 13:16:53 -07:00
Zach Fox
aadf407842 Merge pull request #10978 from zfox23/hoverOverlayInterface 
New HoverOverlayInterface skeleton
 2017-07-17 13:16:32 -07:00
Olivier Prat
9e9c0aff65 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-17 09:59:59 +02:00
Zach Fox
e602d3610e Initial commit for HoverOverlayInterface 2017-07-14 17:26:53 -07:00
SamGondelman
8f533636f5 c++ side laserpointer rendering with renderstates 2017-07-14 11:13:40 -07:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420 
[Worklist #21420] Implement Create button disabled state (details below).
 2017-07-14 10:06:45 -07:00
Seth Alves
741feb7e54 Merge pull request #10951 from druiz17/tablet-modal-fixes 
Allow the tablet to be closed when a modal dialog is open.
 2017-07-14 09:40:58 -07:00
SamGondelman
6f970fd7a0 Merge remote-tracking branch 'upstream/master' into sharks 2017-07-14 09:37:11 -07:00
Olivier Prat
82da9fb537 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-14 17:28:35 +02:00
Anthony J. Thibault
c85e187c61 first stab at secondary target pose support 2017-07-13 18:12:33 -07:00
Anthony J. Thibault
fe711ccbe9 Refactored how controller poses are stored in MyAvatar. 2017-07-13 15:01:14 -07:00
Dante Ruiz
03fbd2a1e6 fixed another warning 2017-07-13 19:12:34 +01:00
Dante Ruiz
b46dc7d389 removed space 2017-07-13 18:42:26 +01:00
Dante Ruiz
070db2922d fixed warning compile error 2017-07-13 18:40:38 +01:00
SamGondelman
ea65a04f28 expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing) 2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782 framework for LaserPointers and abstracted RayPicking on C++ side, including JS API 2017-07-12 14:20:39 -07:00
utkarshgautamnyu
6b969bc39d added code to record total number of ATP/HTTP/File bytes downloaded during session 
Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update AssetResourceRequest.cpp

Update AssetResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update HTTPResourceRequest.cpp

Update FileResourceRequest.cpp

Update FileResourceRequest.cpp

Update Application.cpp

Update Application.cpp
 2017-07-12 11:13:13 -07:00
Olivier Prat
0f60cca617 Merged cleaned up fader branch from Sam 2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672 Cleaning up changes, removing comments and dead code etc... 2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
Dante Ruiz
bedd0628b9 allowed tablet to toggle when a dialog is open 2017-07-12 00:51:07 +01:00
Sam Gateau
1f2f539507 Merge branch 'orange' of https://github.com/samcake/hifi into hobbes 2017-07-11 10:26:26 +02:00
David Kelly
4843b91f47 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-10 09:50:17 -07:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
Brad Davis
8043caa9e9 Merge pull request #10925 from jherico/overlay_performance 
Fix terrible script performance when rendering load is too high
 2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6 More tweaks for improved script performance 2017-07-07 22:02:56 -07:00
Brad Davis
148eece065 Tweak frame timing to avoid overloading the main thread 2017-07-07 21:00:33 -07:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Zach Fox
3d14d3755e Merge pull request #10898 from 1P-Cusack/21425 
Add View->Enter First Person Mode in HMD checkbox.
 2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5 Merge pull request #10878 from mnafees/21355 
CR for Job #21355 - Clean up and remove menu hotkeys
 2017-07-07 14:01:21 -07:00
Olivier Prat
06d69d04c3 TransitionStage + FadeJob compiling but not linked to entity events 2017-07-07 18:22:11 +02:00
Sam Gateau
d15c4ea2d3 Merging with the stage branch 2017-07-07 15:12:40 +02:00
Sam Gateau
156c20d01e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-07-07 10:58:05 +02:00
Clément Brisset
34e3f56002 Merge pull request #10843 from birarda/bug/user-activities-interface-only 
disable user activity logger in DS/AC/ac-client
 2017-07-06 14:01:49 -07:00
LaShonda Hopper
85111131da [Worklist #21420] Resolves issue where domain changes didn't refresh the icon (details below). 
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.

Item Ticket Link: https://worklist.net/21420

Changes to be committed:
	modified:   interface/src/Application.cpp
	modified:   scripts/system/edit.js
 2017-07-06 15:27:15 -04:00
Stephen Birarda
916f57772b default the UAL off for all targets, enable manually for Interface 2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-06 09:58:00 -07:00
David Kelly
1ccf0da7d8 Merge pull request #10897 from davidkelly/dk/cacheSwitchFix 
redo cache switch
 2017-07-06 09:53:01 -07:00
Andrew Meadows
4fad9d9b1a Merge pull request #10858 from jherico/trace_cores 
Additional threaded tracing of CPU cores
 2017-07-06 08:23:21 -07:00
Olivier Prat
018c0489f4 Merged with 21378 2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f Drafting a better SHape plumber to render the items 2017-07-06 16:35:40 +02:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
Mohammed Nafees
eb354a4333 Cleanup menu shortcut keys 2017-07-05 14:50:48 +05:30
Olivier Prat
5cee2cff9f Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-07-04 17:48:07 +02:00
Zach Fox
fcc131187d Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup 
Spectator Camera position/orientation update speedup
 2017-07-03 16:44:12 -07:00
David Kelly
5f015ec77f Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-07-03 13:57:25 -07:00