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

5818 commits

Author SHA1 Message Date
Seth Alves
93246b24b0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7 Merge branch 'master' of github.com:highfidelity/hifi into menuFix 2017-03-06 16:29:37 +00:00
Anthony J. Thibault
e56f02d94f Changed default for preferFingerOverStylus to false. 2017-03-03 14:12:04 -08:00
Anthony J. Thibault
45febe8565 Merge branch 'master' into feature/fingers-on-tablet 2017-03-03 09:04:43 -08:00
Dante Ruiz
f867f4e739 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-03-03 15:40:41 +00:00
David Rowe
9384dfd89c Merge branch 'tablet-ui-edit-js' into 21197 2017-03-03 18:05:18 +13:00
David Rowe
854292b193 Merge branch 'tablet-ui-edit-js' into 21199 2017-03-03 17:51:12 +13:00
Seth Alves
3b581a8dfe merge from upstream 2017-03-02 16:35:44 -08:00
Seth Alves
10cb7aab06 Merge pull request #9684 from Menithal/parent-hotkey 
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
 2017-03-02 16:30:43 -08:00
David Rowe
b592205f7e Fix OSX warning 2017-03-02 18:45:42 +13:00
Anthony J. Thibault
4f03c06a94 Added General Preference to control stylus vs finger usage 
By default the finger is preferred over the stylus.
 2017-03-01 18:07:53 -08:00
David Rowe
e445fe551f Fix showing wrong version of dialog in desktop mode 2017-03-02 15:00:38 +13:00
David Rowe
b9869264ba Display avatar settings dialog in tablet 2017-03-02 13:16:23 +13:00
Seth Alves
c2085ebb6e Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-28 13:33:51 -08:00
Dante Ruiz
d5714bfa6e Merge branch 'master' into menuFix 2017-02-28 16:55:44 +00:00
Seth Alves
117be16c31 pull from upstream 2017-02-27 16:48:23 -08:00
Seth Alves
8110921abf git rid of _mouseToOverlays until I remember why I thought I needed it 2017-02-27 11:11:04 -08:00
Ryan Huffman
5b59939195 Merge pull request #9602 from huffman/feat/shortbow-entity-server 
Add shortbow to marketplace scripts
 2017-02-27 11:09:52 -08:00
Dante Ruiz
19110ecfee Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-27 16:00:08 +00:00
Seth Alves
34c5d480c4 Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-27 06:35:50 -08:00
Seth Alves
1864975c51 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay 2017-02-27 06:35:22 -08:00
Seth Alves
a2f527b28a Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-25 08:44:03 -08:00
Seth Alves
36bcaa8d0f delete tablet overlays when switching domains 2017-02-25 08:43:06 -08:00
kunalgosar
d6c1f1c99a Fixed Wed Entity not leaving Focus 2017-02-24 18:18:48 -08:00
Dante Ruiz
73c337efd0 Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f some modal clean up 2017-02-25 00:40:38 +00:00
Seth Alves
70060eb464 in 2d mode, clicks on tablet don't get used for other things 
Conflicts:
	scripts/system/libraries/entitySelectionTool.js
 2017-02-24 11:37:04 -08:00
Seth Alves
e43c4c17f5 in 2d mode, clicks on tablet don't get used for other things 2017-02-23 21:27:25 -08:00
Seth Alves
ce717d04e9 merge in tablet-as-overlay code 2017-02-23 18:40:20 -08:00
Seth Alves
37004e4347 steps toward making mouse work on tablet 2017-02-23 08:11:31 -08:00
Dante Ruiz
93ae93a45a Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-23 15:43:24 +00:00
Seth Alves
41ef7b8dbb add setting to control if tablet is an entity or overlay 2017-02-22 21:13:42 -08:00
Dante Ruiz
3ba605bf23 saving work 2017-02-23 00:28:30 +00:00
Seth Alves
84b93826d0 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 09:30:16 -08:00
Seth Alves
1d446064be Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-22 08:23:36 -08:00
Seth Alves
3b181eb803 code review 2017-02-21 13:56:28 -08:00
Dante Ruiz
f58a018c64 fixing merge conflicts 2017-02-21 15:46:41 +00:00
Seth Alves
43f47c1106 merge from upstream 2017-02-20 12:45:39 -08:00
Menithal
d9f86612de Fixed view toggle, Added new Notifications 
- View Toggle now only toggles if no other modifiers are pressed
- More notification, and cases for notification
   - Parenting to existing parent
   - Unparenting when there is no parent
   - Unparenting single entities
 2017-02-19 20:18:11 +02:00
Seth Alves
ea03f41b57 Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-18 10:32:11 -08:00
Chris Collins
ec07969c0b Merge pull request #9703 from kunalgosar/logDisplayMode 
Logging HMD/Desktop Transitions
 2017-02-17 17:07:02 -08:00
Seth Alves
def669364b Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid 2017-02-17 15:45:19 -08:00
Seth Alves
d7bb6f105b make tablet part IDs available through qApp 2017-02-17 15:43:20 -08:00
Dante Ruiz
3f8ea4ac54 fixed merge conflict 2017-02-17 23:33:39 +00:00
kunalgosar
b8b5927351 Logging display mode changes 2017-02-17 13:21:01 -08:00
Dante Ruiz
dedd85d296 saving work 2017-02-17 18:47:59 +00:00
Seth Alves
4c1f5c1dc8 Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js 2017-02-17 09:58:58 -08:00
Dante Ruiz
80551cf0dd Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix 2017-02-17 15:50:27 +00:00
Dante Ruiz
3189b44612 refreshing with master 2017-02-17 15:50:08 +00:00
Seth Alves
05c135b9d8 uuid keys for overlays appears to work 2017-02-16 21:22:23 -08:00
Seth Alves
c1e41311fc working toward using uuids for overlay IDs 2017-02-16 17:18:09 -08:00
Dante Ruiz
628b97bfc6 fixed merge issues 2017-02-17 00:08:31 +00:00
Dante Ruiz
afd56bbbbe fixed qml font path issue for desktop and tablet 2017-02-17 00:01:12 +00:00
Anthony J. Thibault
8ccca86dee Settings for Tablet Becomes Toolbar 2017-02-16 15:57:36 -08:00
Seth Alves
21b0e45b0f don't show keyboard in edit.js unless HMD is being worn 2017-02-16 09:56:50 -08:00
Dante Ruiz
7ad8a389f6 refreshing with master 2017-02-16 08:13:17 -08:00
Dante Ruiz
2a97ebb076 updating branch with master 2017-02-16 08:11:50 -08:00
Dante Ruiz
896f9d7181 refreshing with master 2017-02-16 15:58:26 +00:00
Brad Davis
127a014b46 Clear caches on domain switch 2017-02-15 15:21:08 -08:00
Dante Ruiz
485592751f fixing merge changes 2017-02-15 15:38:22 +00:00
Dante Ruiz
22baab1359 updating branch with master 2017-02-15 15:24:08 +00:00
Anthony J. Thibault
5e25d073f3 WIP commit 2017-02-14 15:36:01 -08:00
David Rowe
625f5efdf8 Merge branch 'master' into 21164 
# Conflicts:
#	scripts/system/audio.js
 2017-02-15 10:00:52 +13:00
Seth Alves
ba025d44e0 Merge pull request #9642 from AndrewMeadows/beware-humbletim 
fix performance problem for invalid "avatarEntityData"
 2017-02-14 06:33:48 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
David Rowe
a08347936e Make clicking the tablet mic icon or audio bar toggle the mute state 2017-02-11 15:11:27 +13:00
Andrew Meadows
ee702f945f cleanup around when to send identityPacket 2017-02-10 13:14:20 -08:00
Atlante45
3a30de79aa CR 2017-02-09 13:04:43 -08:00
Atlante45
43d2501993 Add HMD friendly window for the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
191121888c Add log window to the ESS log 2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2 Factor LogDialog 2017-02-09 13:04:43 -08:00
Seth Alves
9881dd261a Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-02-03 12:57:14 -08:00
Ryan Huffman
0cc137d26b Remove unintentionally added fps + download profiling 2017-02-03 10:14:34 -08:00
Ryan Huffman
537f639d16 Revert "Update scriptengine update rate to match displayPlugin target framerate" 
This reverts commit d5effc89776b0b2480db364f21384a245bdcd4f0.
 2017-02-03 10:14:33 -08:00
Ryan Huffman
97719cd128 Update scriptengine update rate to match displayPlugin target framerate 2017-02-03 10:01:02 -08:00
Ryan Huffman
ce9f8bed1b Remove duplicate fps/downloads PROFILE_COUNTER 2017-02-03 09:41:48 -08:00
Ryan Huffman
e181c2a16e Add script_udpate_rate to trace 2017-02-03 09:19:03 -08:00
Ryan Huffman
f2638637f7 Add thread names to traces 2017-02-03 09:18:58 -08:00
Anthony J. Thibault
b44e5b5a1f tablet-ui: preferences for tablet ui scaling 
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
 2017-02-02 14:05:07 -08:00
Seth Alves
24510ee3fe Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-02-01 18:42:56 -08:00
Anthony J. Thibault
2760065ee1 Bug fix for previous commit 2017-02-01 13:51:31 -08:00
Anthony J. Thibault
9be6fe2192 tablet-ui: Fix for keyboard focus box still being visible sometimes 2017-02-01 13:44:12 -08:00
Anthony J. Thibault
ca79397ee8 tablet-ui: Fix for keyboard focus 
Don't allow clicks on non-web entities from stealing focus away from web overlays.
 2017-02-01 11:22:17 -08:00
Seth Alves
5131d1edf2 Merge branch 'master' of github.com:highfidelity/hifi into model-scripting 2017-01-31 09:22:16 -08:00
Seth Alves
7c2957cfa7 merge from upstream 2017-01-31 08:57:36 -08:00
Andrew Meadows
0809149a8c harvest collision events before disowning 2017-01-30 13:21:23 -08:00
Seth Alves
541692c5ca start on scripting interface to allow saving polyvox meshes to obj files 2017-01-28 15:38:18 -08:00
Seth Alves
fa61bbe2a6 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 18:21:39 -08:00
ZappoMan
3c3dcbbbaa Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-26 08:20:03 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Anthony J. Thibault
584a9a3c98 UI navigation work with game pads 
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active.  Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
 2017-01-23 15:22:49 -08:00
ZappoMan
29fff2e556 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-23 13:09:59 -08:00
Ryan Huffman
9b1cd52fb4 Add the ability to get the context that a script is running in 2017-01-23 08:58:01 -08:00
Atlante45
04e81c5db7 Fix interface build 2017-01-20 10:53:57 -08:00
Stephen Birarda
25bd6fa2c1 move recording interface to Agent/Application only 2017-01-20 10:27:08 -08:00
Seth Alves
c492319be2 merge from upstream 2017-01-20 10:14:11 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
Brad Davis
1ef4ac9a6c Additional trace details for GPU timing, frame data updates 2017-01-18 16:19:32 -08:00
Ryan Huffman
8137c59ef7 Add support for sending requests to entity script server 2017-01-18 11:15:29 -08:00
Dante Ruiz
baff07b0f9 controller with menus finally work 2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b tabletFocus update 2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9 some what working d-pad 2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8 saving work 2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Stephen Birarda
1e04aebb8d add --fast-hearbeat command line switch for 1s stats 2017-01-17 11:25:40 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
Seth Alves
f900629cdb Merge pull request #9390 from sethalves/load-models-in-keyhole 
fix physics not starting up when a model is close behind
 2017-01-16 18:06:23 -08:00
Stephen Birarda
1993e358d6 Merge pull request #9318 from birarda/ovr-platform-entitlement 
handle OVR Platform entitlement checks
 2017-01-16 11:16:31 -08:00
Seth Alves
bd67715cd2 don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed 2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af Merge pull request #9300 from zzmp/graphics/forward-opaque 
Add opaques/skinned to forward rendering path
 2017-01-16 08:48:18 -08:00
ZappoMan
c884b276e2 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-14 22:15:22 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Seth Alves
481cc47f79 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-13 09:28:18 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
Brad Davis
659badd8bf Change minimum threadpool size 1 2017-01-12 14:43:31 -08:00
samcake
b9e8f7ee14 Merge pull request #9359 from jherico/cached_qml_surfaces 
Eagerly cache QML surfaces for Web3D overlays
 2017-01-12 14:28:35 -08:00
Brad Davis
2de83d42bc Add process and system CPU usage to traces 2017-01-12 09:19:08 -08:00
David Rowe
8cd7e1b377 Improve user messages 2017-01-12 15:48:25 +13:00
Brad Davis
f235a52a6d Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet 2017-01-11 14:21:29 -08:00
ZappoMan
5b76eaaf52 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-11 10:22:14 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Brad Davis
1dd2747ef9 Push some tracing into 'detail' categories for easy filtering. Add new tracing categories, add counter change tracking. 2017-01-10 10:44:04 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
Faye Li Si Fi
93e4f9126f disable drawing highlight if "showKeyboardFocusHighlight" flag is false 2017-01-09 11:01:15 -08:00
Brad Hefta-Gaub
ef7b9bfde0 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-09 10:07:05 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
Atlante45
428a7f3bf8 Log Dialog doesn't float on top 2017-01-05 17:49:39 -08:00
Seth Alves
d072b1524a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-05 15:27:11 -08:00
Stephen Birarda
46086cdcce set the OCULUS_STORE property with oculus store arg 2017-01-05 14:02:35 -08:00
Brad Hefta-Gaub
acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2017-01-04 18:07:22 -08:00
Atlante45
56a25dfdee Check setting value changed 2017-01-04 11:56:24 -08:00
Brad Hefta-Gaub
60d48bcd49 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-03 14:42:59 -08:00
Zach Pomerantz
01cf48807c change Render.RenderForwardTask to Render.Forward 2017-01-03 14:47:48 -05:00
Zach Pomerantz
26cfc83e20 Merge branch 'master' into graphics/fetch-cull-sort 2017-01-03 14:04:39 -05:00
Anthony J. Thibault
00980366d6 Merge branch 'master' into tablet-ui 2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub
84eca0159e Merge branch 'master' of https://github.com/highfidelity/hifi into improveInterval 
Conflicts:
	tests/networking/src/ResourceTests.cpp
 2016-12-29 16:42:52 -08:00
Zach Pomerantz
0e9da87549 FetchSortCull->FetchCullSort 2016-12-29 19:27:37 -05:00
Brad Hefta-Gaub
a72f60152b audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate 2016-12-29 08:53:37 -08:00
Atlante45
f79c6e08f5 Track dropped frames as reported by the Oculus SDK 2016-12-28 14:18:23 -08:00
Brad Hefta-Gaub
73bfc069da more work on only sending changes 2016-12-27 17:19:55 -08:00
Zach Pomerantz
ca1a14e5b0 add RenderFetchSortCull task 2016-12-23 15:54:22 -05:00
Andrew Meadows
2209c0ebba remove debug hook for dumping stats to logs 2016-12-21 10:55:59 -08:00
Andrew Meadows
8ab6974233 optimizations for processing avatar joint data 2016-12-21 10:55:59 -08:00
Brad Hefta-Gaub
be62df2001 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-21 08:59:29 -08:00
David Kelly
50554e934e Merge branch 'master' of github.com:highfidelity/hifi into dk/noFingerprintWhenLoggedIn 2016-12-20 16:30:10 -08:00
Brad Hefta-Gaub
d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2016-12-20 16:25:12 -08:00