Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-15 16:36:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62161 commits 74 branches 59 tags 1.2 GiB
Commit graph

22845 commits

Author SHA1 Message Date
Seth Alves
a467f30993 Merge pull request #11624 from highfidelity/AlanZimmerman-patch-1 
Change tablet model's screen
 2017-10-19 09:40:30 -07:00
Brad Hefta-Gaub
f951a23356 Merge pull request #11627 from druiz17/reload-script 
fixed toolbar disapearing after reloading default scripts
 2017-10-19 09:32:36 -07:00
Olivier Prat
32df0209f3 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-10-19 17:38:05 +02:00
vladest
92fc6daecc Merge branch 'master' into webbrowser_updates 2017-10-19 14:56:31 +02:00
Melissa Brown
1a3821e984 Merge pull request #11591 from ctrlaltdavid/21568 
Add some Quat and Uuid JavaScript helper properties
 2017-10-18 22:07:06 -07:00
samcake
b29f276db3 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-18 16:42:30 -07:00
Zach Fox
dc1b3aef8f Don't show purchases tutorial if user clicks what is rez 2017-10-18 16:25:06 -07:00
Zach Fox
322bac035c Don't show 'no permission' text on wearables 2017-10-18 16:19:54 -07:00
druiz17
36912f1cd4 fixed toolbar disapearing after reloading default scripts 2017-10-18 16:03:32 -07:00
Zach Fox
77f967c7e1 Merge pull request #11623 from zfox23/mergeRC57IntoMaster_20171018 
2017-10-18: Merge RC57 into Master
 2017-10-18 15:52:51 -07:00
Zach Fox
1b7b35fe91 What does Rez mean? 2017-10-18 15:44:06 -07:00
Zach Fox
91ac2ab58c LowerKeyboard button changes 2017-10-18 15:31:12 -07:00
Bradley Austin Davis
aa6c841357 Merge pull request #11588 from jherico/future/qrc 
Package all UI resources into a QRC built into the application.
 2017-10-18 15:29:34 -07:00
Zach Fox
a993386613 Change color of 'Instructions Opened on Desktop' to disabled gray 2017-10-18 15:13:28 -07:00
Zach Fox
33508b6b2b Update help text 2017-10-18 14:55:45 -07:00
Zach Fox
e829bd2919 Fix 'Recent Activity' indentation 2017-10-18 14:47:14 -07:00
Zach Fox
6f5fafb62f Add 'showDebugButtons' switch on Help ta 2017-10-18 14:12:43 -07:00
Zach Fox
876001146a Get categories from backend instead of site 2017-10-18 14:05:47 -07:00
Zach Fox
de50eef9c7 Fix rez certified... 2017-10-18 13:54:46 -07:00
Zach Fox
949da17046 Wear It button for items with category 'Wearables' 2017-10-18 13:51:58 -07:00
Alan Z
6a2ee8c632 Change tablet model's screen 
Changed the texture for the model's screen to say: "Loading... If nothing happens shortly, re-open tablet"
 2017-10-18 10:54:18 -07:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Olivier Prat
25b3549e04 Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled 2017-10-18 15:00:53 +02:00
David Rowe
fcc7a3e440 Code review 2017-10-18 21:08:10 +13:00
Seth Alves
f1abb0cd55 don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them 2017-10-17 19:01:24 -07:00
Cain Kilgore
16467128a2 WL 21571 2017-10-18 02:42:08 +01:00
SamGondelman
58172cfbd4 merge from master 2017-10-17 18:05:59 -07:00
SamGondelman
640ad514bc updates based on austin's comments 2017-10-17 17:53:10 -07:00
Seth Alves
e9d4da5a01 Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard 
Fix web3Doverlays and webEntities keyboard not showup
 2017-10-17 17:32:04 -07:00
Bradley Austin Davis
9e46e288b1 Merge pull request #11604 from SamGondelman/endSphere 
Scale LaserPointer end overlay in C++
 2017-10-17 16:37:35 -07:00
SamGondelman
05f4883104 get rid of valid 2017-10-17 16:15:54 -07:00
druiz17
9a881c5e57 fix keyboard 2017-10-17 15:43:23 -07:00
SamGondelman
6d6ede075f resolve conflicts 2017-10-17 15:26:32 -07:00
SamGondelman
8a5759df69 PickManager::addPick 2017-10-17 15:22:39 -07:00
SamGondelman
3ef7ebffba working generalized pickmanager 2017-10-17 15:09:41 -07:00
SamGondelman
596be8ec27 pickmanager wip 2017-10-17 13:16:37 -07:00
SamGondelman
ba4f41b59a fix warnings 2017-10-17 12:03:59 -07:00
Sam Gondelman
2e69d2b1ad missed one scripting interface reference 2017-10-17 11:13:02 -07:00
Olivier Prat
76589316df Working debug script with multiple selection 2017-10-17 10:24:05 +02:00
Sam Gateau
74b02a3e9b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-16 20:58:11 -07:00
David Rowe
ed1c974f75 Use MyAvatar.SELF_ID instead of Uuid.SELF 2017-10-17 15:58:51 +13:00
Brad Hefta-Gaub
f7a1816a99 Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue 
Reduce present traffic on main thread event queue.
 2017-10-16 18:02:11 -07:00
John Conklin II
42a018c2c5 Merge pull request #11606 from ElderOrb/case8213 
8213 Keyboard Input Field: Reveals Passwords (RC-57)
 2017-10-16 16:14:43 -07:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00
Brad Hefta-Gaub
c4e672d6b8 Merge pull request #11582 from ElderOrb/case8213 
8213 Keyboard Input Field: Reveals Passwords
 2017-10-16 14:57:18 -07:00
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -07:00
SamGondelman
c6b636901a fewer undesirable couplings 2017-10-16 13:46:23 -07:00
SamGondelman
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
SamGondelman
d274d99411 merge from master 2017-10-16 12:17:37 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -07:00
Zach Fox
febc725520 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57 2017-10-16 09:53:15 -07:00
Olivier Prat
e42699c0ea Added multiple selections but still only first linked to outline 2017-10-16 10:57:06 +02:00
Sam Gateau
ec934335dc CLeaning up the pr regarding the scripts with my branch blue 2017-10-15 22:34:58 -07:00
Brad Davis
2ae61cb96b Prototype packaging QML and related resources into a QRC 2017-10-14 14:40:46 -07:00
Zach Fox
bcbddb7106 Fix unix warnings 2017-10-14 14:13:19 -07:00
SamGondelman
c4e6cb28ce move contextoverlay connection to contextoverlayinterface 2017-10-13 16:23:29 -07:00
Anthony J. Thibault
67d43b4fac Use atomic<bool> and compare_exchange_strong 2017-10-13 16:03:56 -07:00
Ryan Huffman
4a9aa30630 Merge pull request #10956 from birarda/feat/update-default-avatar 
update default avatar to be better with oculus grab triggers
 2017-10-13 15:57:37 -07:00
SamGondelman
5bfb0baf09 const references 2017-10-13 14:38:46 -07:00
Zach Fox
5be9f2022e Fix writing backup instructions when restoring wallet backup 2017-10-13 14:33:36 -07:00
Anthony J. Thibault
a2a6cd0c7a Reduce present traffic on main thread event queue. 
In an effort to diagnose the root cause of several deadlocks,
it seems possible that the main thread event queue can grow
to a size where it can take many seconds to drain.

This PR attempts to address this in two ways:
  * Change the connection between the DisplayPlugin::presented signal and
    the Application::onPresent slot to be a DirectConnection.  This should
    prevent the main thread from filling up with signal events.
  * Within Applicaiton::onPresent use an atomic counter to prevent the main
    thread from filling up with repeated Idle events.
 2017-10-13 14:28:23 -07:00
Zach Fox
6b7c997a4c Minor text tweak 2017-10-13 13:37:11 -07:00
Zach Fox
051019a57a Fix certificate username text eliding too early 2017-10-13 12:10:37 -07:00
Brad Hefta-Gaub
60030c08fa Merge pull request #11573 from druiz17/bug-hud-module 
hud module intersects with dev stats window
 2017-10-13 11:48:06 -07:00
Dante Ruiz
d14e6b6e5a Merge pull request #11450 from ElderOrb/case7722 
7722 Add onHover Outline to Tablet "X" Button
 2017-10-13 11:38:38 -07:00
Zach Fox
95a9675220 Final help QA - minus link to blockchain docs 2017-10-13 10:58:15 -07:00
druiz17
2422c9d9f3 made requested changes 2017-10-13 10:45:24 -07:00
Bradley Austin Davis
4dcce6ef45 Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread 
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
 2017-10-12 17:37:05 -07:00
SamGondelman
dacd48862f put back overlay signals for scripts 2017-10-12 16:43:33 -07:00
Zach Fox
d75c0a00bb Closer than ever 2017-10-12 16:29:05 -07:00
SamGondelman
0d164363af cleanup mousePressOffEntity signal 2017-10-12 15:29:29 -07:00
SamGondelman
a48221d915 fix context overlays 2017-10-12 14:51:15 -07:00
SamGondelman
7f3268548c direct connection to web3doverlay 2017-10-12 14:14:08 -07:00
druiz17
83d2a54b0f fixed some bugs 2017-10-12 13:48:21 -07:00
Zach Fox
6a47884fcf Cleanup and fix 2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub
1bba5ff812 Merge pull request #11554 from sethalves/import-av-entities 
Import av entities
 2017-10-12 13:30:53 -07:00
beholder
c31aa6bcdb 8213 Keyboard Input Field: Reveals Passwords 2017-10-12 22:08:46 +03:00
Zach Fox
abe1cd1b51 Minor cleanup 2017-10-12 11:53:47 -07:00
vladest
45f1f074df Reduce combobox dropdown height taking keyboard in account 2017-10-12 20:52:40 +02:00
Zach Fox
30d6c78e4e Merge pull request #11580 from ElderOrb/case8210 
8210 Keyboard Input Field: Pressing Space should Clear Field
 2017-10-12 11:49:18 -07:00
Zach Fox
0e96fc5cab It's working! 2017-10-12 11:37:26 -07:00
SamGondelman
27b585cb0b Merge remote-tracking branch 'upstream/master' into pointerEvents 2017-10-12 11:22:23 -07:00
SamGondelman
53fde83922 cleaning up pointerevents, wip 2017-10-12 11:21:50 -07:00
vladest
67ee4a7679 Merge branch 'master' into webbrowser_updates 2017-10-12 20:15:53 +02:00
Zach Fox
5efa920712 Getting closer 2017-10-12 11:13:23 -07:00
Zach Fox
1227168939 Merge pull request #11575 from ElderOrb/QTBUG-49297 
workaround for https://bugreports.qt.io/browse/QTBUG-49297
 2017-10-12 10:56:45 -07:00
druiz17
a6bc6a09a5 Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module 2017-10-12 10:34:17 -07:00
vladest
2d010980b0 Removed special sound for Mute and replace it with hover and click sounds 2017-10-12 19:15:09 +02:00
vladest
35b146b59a Added sounds in Audio menu 2017-10-12 19:01:38 +02:00
vladest
b965049651 Do not produce sound and highlight on disabled items and menu separators 2017-10-12 18:39:26 +02:00
vladest
f1d5df5926 Restore lost-in-merge context property 2017-10-12 18:26:50 +02:00
vladest
145149fedd Merge branch 'master' into tablet_extended_sounds 2017-10-12 18:01:23 +02:00
beholder
f31316b0aa 8210 Keyboard Input Field: Pressing Space should Clear Field 2017-10-12 15:03:32 +03:00
samcake
480047548d exposing the Render interface to the overlay web3d 2017-10-11 18:04:29 -07:00
Anthony J. Thibault
0a943fbe7b Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. 
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.

The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
 2017-10-11 17:32:34 -07:00
Zach Fox
c3e66c9581 Fixes 2017-10-11 16:56:47 -07:00
Brad Hefta-Gaub
cd2a742974 Merge pull request #11576 from SamGondelman/pointerEvents 
Remove unused HFMetaEvents
 2017-10-11 16:10:43 -07:00
beholder
dcdf85b08e workaround for https://bugreports.qt.io/browse/QTBUG-49297 2017-10-12 02:10:09 +03:00
druiz17
42cab19ab2 generialze window search 2017-10-11 16:04:35 -07:00
samcake
9abe098436 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-11 15:48:40 -07:00
Sam Gateau
38b467a6bf Merge pull request #11570 from jherico/overlays_blocking 
Remove unnecessary blocking call
 2017-10-11 15:40:53 -07:00
SamGondelman
403b18977b remove unused HFMetaEvents 2017-10-11 14:37:23 -07:00
Seth Alves
a4462056df Merge pull request #11549 from sethalves/linux-clang-build 
allow project to be built with clang on Linux
 2017-10-11 13:28:45 -07:00
Zach Fox
9e570fdba3 First pass at encryption/decryption. Exciting! 2017-10-11 13:08:04 -07:00
druiz17
8f3fa08b1e hud module intersects with stats window 2017-10-11 11:41:10 -07:00
Seth Alves
ca128a3251 merge from upstream 2017-10-11 11:09:33 -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
Zach Fox
99109fe8e5 Merge pull request #11567 from zfox23/commerce_daveIntegration3 
2017-10-10 Commerce Frontend Updates
 2017-10-11 11:07:03 -07:00
Brad Davis
69f869b339 Remove unecessary blocking call 2017-10-11 11:01:06 -07:00
Zach Fox
3f0ec73be6 Fix date displays 2017-10-11 10:55:14 -07:00
Anthony J. Thibault
cb01c5cada compile fix 2017-10-10 16:30:11 -07:00
Zach Fox
4ebccfa65c Use put instead of get sob 2017-10-10 16:23:43 -07:00
Anthony J. Thibault
cbb0d27f68 div by zero fix 2017-10-10 16:20:52 -07:00
Anthony J. Thibault
18d723b6b4 div by zero fixes, detected by address sanitizer 2017-10-10 16:17:39 -07:00
Zach Fox
5e383e2b1c My Item certificates 2017-10-10 14:56:17 -07:00
Dante Ruiz
742cf0debe Merge pull request #11383 from ElderOrb/case7384 
7384 On Domains without Edit Access, Create Button Text still Highlights
 2017-10-10 14:30:49 -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
702528a8cc Fully integrate cert properties 2017-10-10 13:27:17 -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
1c0a564155 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3 2017-10-10 12:36:06 -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
Zach Fox
be2b241629 Lots of progress; don't yet have some things 2017-10-10 12:20:48 -07:00
Ryan Huffman
568a7ba439 Merge pull request #11557 from cain-kilgore/21562 
WL 21562 - Fix the error in the Asset Browser
 2017-10-10 11:12:33 -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
Zach Fox
8d0d9a159f Bugfixes 2017-10-10 10:38:19 -07:00
Gerard Maguire
e5f65b5fb1 Merge branch 'master' of https://github.com/highfidelity/hifi into 21466 2017-10-10 17:44:27 +01:00
Ryan Huffman
9c120f1194 Update AssetMappingsScriptingInterface to not open file for activity event 2017-10-10 09:44:13 -07:00
Gerard Maguire
afb03b3d2d Avatar pitch and roll cleared 2017-10-10 16:19:31 +01:00
Cain Kilgore
583b0c521e Open 2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d WL 21562 - Fix the error in the Asset Browser 2017-10-10 03:39:13 +01:00
Seth Alves
8ac1875a91 Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login 
Find nearby entities at login
 2017-10-09 17:54:44 -07:00
Seth Alves
3cef3779df Merge branch 'master' of github.com:highfidelity/hifi into linux-clang-build 2017-10-09 17:34:50 -07:00
Seth Alves
aa08053a28 fix osx build 2017-10-09 17:34:43 -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
58534a5a6d Merge pull request #11550 from druiz17/fix-test-audio 
fixed looping sample sound bug
 2017-10-09 15:21:24 -07:00
Zach Fox
38b95b5403 Instructions HTML file and flow 2017-10-09 15:07:14 -07:00
Seth Alves
d1d2b8a4da don't export avatar-parent sessions IDs into json 2017-10-09 14:02:20 -07:00
Zach Fox
733df8391f Round 2 2017-10-09 12:27:56 -07:00
Seth Alves
13da20e1f0 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-09 12:18:09 -07:00
Seth Alves
54204833df add a getParentTree call for overlays 2017-10-09 12:17:56 -07:00
Zach Fox
acdd1e32e4 First round 2017-10-09 12:11:07 -07:00
Anthony Thibault
13919907de Merge pull request #11539 from Nex-Pro/patch-1 
Fixed typo in qWarning message.
 2017-10-09 12:10:27 -07:00
Seth Alves
23f41457be Revert "Revert "fix importing of avatar entities"" 
This reverts commit 28a8b18060.
 2017-10-09 11:52:43 -07:00
druiz17
cd97ab0fdf fixed looping sample sound bug 2017-10-09 11:39:57 -07:00
Zach Fox
a7d43c63b6 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-09 11:38:13 -07:00
Stephen Birarda
1fb7b0df7a re-bake new default avatar to compress mesh 2017-10-09 10:57:34 -07:00
Andrew Meadows
bbde1bcd63 move stuff out of writelock when possible 2017-10-09 10:42:42 -07:00
Stephen Birarda
78c5e84140 update to re-baked hipsFixed avatar 2017-10-09 10:33:35 -07:00
Stephen Birarda
198dbf83c3 fix name in mannequin FST 2017-10-09 10:33:34 -07:00
Stephen Birarda
429e037534 fix path to mannequin FBX from FST 2017-10-09 10:33:34 -07:00
Stephen Birarda
72b23a0fbb update default avatar to be better with oculus grab triggers 2017-10-09 10:33:34 -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
samcake
1f3623e8e9 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-09 09:37:25 -07:00
Seth Alves
4d2f16efc3 allow project to be built with clang on Linux 2017-10-08 18:01:41 -07:00
Brad Davis
7aeeaeb4e7 Fix rendering transform for text3d overlays 2017-10-07 19:41:43 -07:00
Seth Alves
28a8b18060 Revert "fix importing of avatar entities" 2017-10-07 16:54:05 -07:00
samcake
988d8a1a62 TRying to debug the overlay notifications to show ?) 2017-10-06 18:17:48 -07:00
Brad Hefta-Gaub
62fc193bff Merge pull request #11532 from sethalves/import-av-entities 
fix importing of avatar entities
 2017-10-06 17:59:54 -07:00
Thijs Wenker
77a36bf788 Merge pull request #10892 from ctrlaltdavid/vr-edit-a 
VR edit app
 2017-10-07 02:19:00 +02:00
Zach Fox
59a6726af6 Checkpoint; lotsa changes... 2017-10-06 16:55:05 -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
Seth Alves
195d96bd43 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 11:02:35 -07:00
Nex-Pro
24974fdae3 Fixed typo in qWarning message. 2017-10-06 18:42:02 +01:00
Gerard Maguire
93caa7e259 Merge branch 'master' of https://github.com/highfidelity/hifi into 21466 2017-10-06 17:52:42 +01:00
Zach Fox
e5e6d84e07 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-06 09:47:21 -07:00
Zach Fox
051b63503c Merge pull request #11534 from zfox23/commerce_daveIntegration1 
Commerce backend changes sync, October 5 2017
 2017-10-06 09:45:45 -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
Seth Alves
8d00731620 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-06 07:20:34 -07:00
Zach Fox
525e0d8f61 Make SettingsScriptingInterface accessible to tablet 2017-10-05 16:51:13 -07:00
David Rowe
28c7ef2e97 Merge branch 'master' into vr-edit-a 2017-10-06 11:54:08 +13:00
Zach Fox
0b600a74c3 Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout 2017-10-05 14:34:53 -07:00
Andrew Meadows
a3bafa3c44 Merge pull request #11506 from SamGondelman/sharks 
Fix and improve laser pointer locking
 2017-10-05 14:10:06 -07:00
Zach Fox
9290a51685 Fix confirmed text 2017-10-05 14:03:56 -07:00
Seth Alves
30269c6794 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 13:57:44 -07:00
Andrew Meadows
05f2dfbbc3 Merge pull request #11529 from vladest/fix_audiotab_name_alignment 
Fix alignment of audio devices input header
 2017-10-05 13:50:29 -07:00
SamGondelman
6b02cbb911 move locking inside laserpointer and raypick 2017-10-05 13:17:57 -07:00
Zach Fox
8e82095135 Number sold and limited run 2017-10-05 12:46:20 -07:00
samcake
1e1731345d Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-10-05 12:25:07 -07:00
Seth Alves
b96fac2f00 Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities 2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc fix importing of avatar-entities 2017-10-05 11:43:19 -07:00
Zach Fox
d605bd9ef4 Preprocess inventory endpoint result 2017-10-05 11:01:15 -07:00
Ryan Huffman
f0c9badbd6 Fix misspelling in lost-connection-to-atp error 2017-10-05 09:10:46 -07:00
vladest
193dc83b99 Fix alignment of audio devices input header 2017-10-05 13:59:42 +02:00
Sam Gateau
69e68ef5ad Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-10-04 18:58:33 -07:00
Sam Gateau
25dae2f24e Merge pull request #11499 from samcake/blue 
Moving Camera update and render frame to Game Loop (Main thread)
 2017-10-04 18:42:02 -07:00
Zach Fox
27d6cc2657 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-04 15:49:33 -07:00
Zach Fox
9d51d40af4 Merge pull request #11489 from vladest/login_dialog_rework 
Login dialog rework
 2017-10-04 15:47:44 -07:00
David Rowe
63e7521711 Merge branch 'master' into vr-edit-a 2017-10-05 11:29:49 +13:00
Clément Brisset
74fd69ac2d Merge pull request #11523 from Atlante45/new-master 
RC56 into Master
 2017-10-04 15:17:52 -07:00
Zach Fox
b35eaf2cc8 Throw a bunch of code at the wall and hope some sticks 2017-10-04 15:06:55 -07:00
samcake
7f86a4ee28 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-10-04 13:35:31 -07:00
samcake
d773b40a63 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-04 13:25:14 -07:00
Zach Fox
ab08dc6bd6 Progress? 2017-10-04 12:33:58 -07:00
Andrew Meadows
e3ea013d5f Merge pull request #11518 from SamGondelman/avatarRay 
Fix calling AvatarManager.findRayIntersection() from script
 2017-10-04 12:04:30 -07:00
SamGondelman
477dfdff1e wip hud layering and fix crashes 2017-10-04 11:45:21 -07:00
vladest
86e8076362 Fix puntuation mode 2017-10-04 20:30:25 +02:00
Zach Fox
1ed10ecf59 Fix passphrase crash 2017-10-04 11:05:17 -07:00
samcake
d7333d3fa3 Merging with master 2017-10-04 10:55:38 -07:00
Zach Fox
23245e2fb9 Modify context overlay filter 2017-10-04 10:39:23 -07:00
vladest
073fa81d5b Merge branch 'master' into login_dialog_rework 2017-10-04 19:37:38 +02:00
vladest
0a505617df Implemented single keyboard instance for all Tablet login dialog items 2017-10-04 19:33:36 +02:00
Zach Fox
fcafbef109 Fix buying free items using Commerce system 2017-10-04 09:34:32 -07:00
Brad Hefta-Gaub
a1979a2600 Merge branch 'master' into RC-56 2017-10-03 18:16:21 -07:00
SamGondelman
fa838e4715 merge from master 2017-10-03 15:53:33 -07:00
SamGondelman
0614fd9b4f fix AvatarManger::findRayIntersection from script thread 2017-10-03 15:31:49 -07:00
Zach Fox
9c4b02c659 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 14:37:07 -07:00
Zach Fox
b7e50c5b73 First steps 2017-10-03 14:36:22 -07:00
Seth Alves
ea4068f1f9 Merge pull request #11478 from vladest/fix_menu_linux 
Added workaround to enable menu bar under Linux
 2017-10-03 13:10:34 -07:00
vladest
6fddf49988 Merge branch 'master' into login_dialog_rework 2017-10-03 21:39:38 +02:00
Zach Fox
ea3da6c9dd Merge pull request #11495 from zfox23/pop_interfaceChanges2 
Commerce: One step closer!
 2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2 Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit 
Tweak debug stats for more clarity
 2017-10-03 11:23:16 -07:00
Zach Fox
409360e55d Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests 2017-10-03 11:17:38 -07:00
Zach Fox
e64b0861a1 Change passphrase working 2017-10-03 10:53:10 -07:00
Andrew Meadows
cd4be1473f put more of Application::update() under time measurement 2017-10-03 10:34:12 -07:00
Andrew Meadows
773c48bbc9 use floating point for game loop stats values 2017-10-03 10:32:19 -07:00
David Rowe
f52df6667a Merge branch 'master' into vr-edit-a 2017-10-03 21:50:49 +13:00
Sam Gateau
64f70f1ebb more cleanups 2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430 more cleanups 2017-10-02 21:46:52 -07:00
Sam Gateau
316156db46 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 21:31:59 -07:00
Andrew Meadows
21cd986645 tally PerformanceTimer records when it is active 2017-10-02 20:57:20 -07:00
druiz17
86f580919c remove what space 2017-10-02 17:43:43 -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
samcake
6639287418 Merging with master 2017-10-02 17:03:09 -07:00
Zach Fox
11d0062104 Progress on buy endpoint 2017-10-02 16:57:41 -07:00
druiz17
8a0ecf4e6f propertly determine is laser intersects with HUD UI 2017-10-02 16:46:43 -07:00
Andrew Meadows
c3167444a9 decouple 'general timing' from 'game loop' details 2017-10-02 16:31:20 -07:00
druiz17
68780f56b7 Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module 2017-10-02 14:06:26 -07:00
SamGondelman
97b09d680c fix and improve laser pointer locking 2017-10-02 13:17:53 -07:00
Andrew Meadows
8d2153d2f3 cleanup debug stats, use more correct names 2017-10-02 13:08:17 -07:00
Zach Fox
1d1b846f39 Better 'view backup instructions' behavior 2017-10-02 12:44:51 -07:00
Zach Fox
15c0a21e0e Varied commit - styling changes, beginnings of new Wallet endpoint, etc 2017-10-02 12:19:24 -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
vladest
bf39eb9a77 Test Tablet keyboard specific 2017-10-02 20:02:55 +02:00
Zach Fox
2b03e08c96 Fix errant status when requesting it for the first time 2017-10-02 10:20:24 -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
samcake
fc2329193e Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-02 10:15:38 -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
07ba2cce5b Merge branch 'master' into login_dialog_rework 2017-10-02 18:24:12 +02:00
vladest
e360c1363e Merge branch 'master' into tablet_extended_sounds 2017-10-02 18:03:49 +02:00
Zach Fox
2783293d24 Merge pull request #11490 from vladest/fix_walletsetup_focus 
Remove mouse area for text fields. use activeFocusOnPress property in…
 2017-10-02 08:38:04 -07:00
Sam Gateau
ec10d38983 more cleaning 2017-10-01 22:28:04 -07:00
David Rowe
829cc8e5e6 Merge branch 'master' into vr-edit-a 2017-10-02 17:08:27 +13: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
samcake
da4de38e91 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad fix modeloverlay visible change 
(cherry picked from commit 0bb27a7165)
 2017-10-01 13:40:00 -07:00
Sam Gateau
44cc6deac2 moving render specific code from Application.cpp to Application_render.cpp 2017-10-01 12:55:44 -07:00
vladest
ad32e7bdf5 Merge branch 'master' into login_dialog_rework 2017-10-01 19:27:23 +02:00
vladest
9a00468ea9 semicolons, yes 2017-10-01 19:21:30 +02:00
vladest
feafd441b1 Make sure keyboard will be rised after lowering on another click 2017-10-01 18:54:07 +02:00
vladest
c3bc67b72d Merge branch 'master' into fix_walletsetup_focus 2017-10-01 18:24:38 +02:00
David Rowe
0daa5012ca Enable toolbar and tablet icons to load from local script directory 2017-09-30 15:00:15 +13:00
SamGondelman
0bb27a7165 fix modeloverlay visible change 2017-09-29 17:48:59 -07:00
samcake
577378f539 Adding stuff that seems to break? 2017-09-29 17:45:10 -07:00
druiz17
20918641f4 saving work 2017-09-29 16:48:25 -07:00
Zach Fox
e6ea76eefe Tiny language fix - Thanks Cain! 2017-09-29 15:44:44 -07:00
Zach Fox
4668294389 Fix login flow regression 2017-09-29 15:25:24 -07:00
Zach Fox
bbbce96407 Fix gray securityimage 2017-09-29 14:30:02 -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
vladest
7f6773b1f4 Added semicolons 2017-09-29 21:12:21 +02: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
SamGondelman
f7af581c71 track traversal time, rename entity server stat 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
247764b679 add total entity packets in stat (kbps) 2017-09-29 11:34:34 -07:00
SamGondelman
cbf82a6f2c fix timeout for physics check 2017-09-29 11:34:34 -07:00
Andrew Meadows
171151b92a use new form of MovingEntitiesOperator ctor 2017-09-29 11:34:32 -07:00
Brad Davis
a7d507e9fd Disable watchdog with environment variable 2017-09-29 10:44:04 -07:00
Seth Alves
e7705175a3 Merge pull request #11481 from ZappoMan/animatedOverlays 
support animation of model overlays
 2017-09-29 10:26:24 -07:00
ZappoMan
9c81bc5479 CR fixes 2017-09-29 09:52:30 -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
3265fe62ad Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-29 09:09:27 -07:00
vladest
01a0b26b90 Remove mouse area for text fields. use activeFocusOnPress property instead 2017-09-29 17:14:35 +02:00
vladest
d3cd034d61 Cleanup 2017-09-29 16:33:52 +02:00
vladest
174287c5f5 Merge branch 'master' into login_dialog_rework 2017-09-29 15:57:27 +02:00
Atlante45
af69222fdb Fix icon name change 2017-09-28 18:34:42 -07:00
samcake
e637842f8a Separating some of the code sepecific to render in its own cpp 2017-09-28 17:45:50 -07:00
Zach Fox
a1ae13489e Slight changes to tutorial 2017-09-28 16:41:29 -07:00
Zach Fox
4814f277c1 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 16:07:32 -07:00
ZappoMan
be7729b276 support animation of model overlays 2017-09-28 15:14:59 -07:00
Zach Fox
2cff5c1fa6 First time Purchases tutorial 2017-09-28 15:12:55 -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
Zach Fox
66be558a04 My Items Interface 2017-09-28 14:04:57 -07:00
Ryan Huffman
ff019d6195 Fix extension detection when tracking asset uploads 2017-09-28 13:56:49 -07:00
vladest
4023c40149 Cleanup 2017-09-28 22:55:01 +02:00
Zach Fox
3a537cdcc3 Make usernameDropdown collapse when clicking anywhere outside it 2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3 Fix keyboard focus during setup while tip is up 2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761 styling updates for purchases 2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae Update Purchases 2017-09-28 12:49:38 -07:00
Andrew Meadows
60fe9ec5e9 Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928 
fix interface crash in Debug build
 2017-09-28 12:41:12 -07:00
vladest
c3225c2c76 Make fix precisely for Linux 2017-09-28 21:38:03 +02:00
vladest
769c57208c Signup ready 2017-09-28 21:35:41 +02:00
Zach Fox
b5dc6b791b Fix commerce setting handle 2017-09-28 10:42:45 -07:00
Zach Fox
8d74487393 Use edition number; fix CONFIRMED timer 2017-09-28 10:25:05 -07:00
samcake
2f9779c02c Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 10:08:20 -07:00
Seth Alves
912305fd4b Merge pull request #11476 from ElderOrb/case7925 
7925 Create Mode: keyboard focused entry field is not visible
 2017-09-28 10:03:28 -07:00
Zach Fox
b6ce294bb2 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2 2017-09-28 09:38:48 -07:00
Zach Fox
65a63ea8c3 Remove dead OS X code 2017-09-28 09:38:22 -07:00
samcake
b1daae0150 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-28 09:16:02 -07:00
Ryan Huffman
97bf093cab Fix ambiguous conversion in AssetMappingScriptingInterface 2017-09-28 08:16:54 -07:00
vladest
0a9bebeefc Added workaround to enable menu bar under Linux 2017-09-28 15:34:56 +02:00
vladest
8d23bf38ac Merge branch 'master' into login_dialog_rework 2017-09-28 14:55:12 +02:00
vladest
4f907aba1e sign in reworked 2017-09-28 14:49:48 +02:00
beholder
338a230de9 reduced delay to improve user experience 2017-09-28 13:01:14 +03:00
beholder
1021aa1a0e re-center focused eleemnt even if keyboard was already visible 2017-09-28 12:59:36 +03:00
samcake
40ca98214b Moving all of the camera and avatar eval to game loop 2017-09-27 17:58:43 -07:00
Zach Fox
60823903cf You own X others 2017-09-27 17:05:07 -07:00
Zach Fox
7b7e0bc78b Updated Recent Activity 2017-09-27 16:35:35 -07:00
samcake
29da0c663f Merge branch 'master' of https://github.com/highfidelity/hifi into flash 2017-09-27 16:21:55 -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
Atlante45
eb06c33187 Naming coding standard fix 2017-09-27 15:32:53 -07:00
samcake
3bd6e35e30 Fixing the broken on hud overlay's render transform 2017-09-27 15:19:21 -07:00
Zach Fox
7ad3a5a1e3 Commerce: Tons of Interface changes (#11463) 
* canRez(Tmp)Certified()

* CertifiedItem beginnings

* Skeleton of verifyOwnerChallenge()

* Controlled failure; updateLocation() skeletion

* Controlled failure on checkout page with ctrl+f

* Skeleton Purchases first-use tutorial

* Initial progress on new setup

* Security pic tip

* Skeleton Certificate page

* Updates to Certificate

* General progress; setup is nearly complete

* Better buttons; last step almost done

* Initial progress on wallet home

* Completed recent transactions

* Security page

* Scrollbar

* Fix auth error text

* PassphraseSelection

* Change security pic

* Minor layout changes; beginnings of emulated header

* Various layout changes; wallet nav bar

* Help screen

* Quick onaccepted change

* First pass at new purchases

* Small style updates

* Some error progress

* Lightbox in purchases

* Collapse other help answers when clicking on another

* REZZED notif

* Commerce Lightbox

* Lots of new interactions in Purchases

* Hook up 'view certificate'

* Fix errors, fix close button on cert

* Purchases timer; much faster filter

* Add debugCheckout

* Purchase updates

* GlyphButton; separator; Checkout Success; Ledger fix; debug modes

* Lock glyph below security pic should be white

* Various fixes, round 1

* Circular mask

* Passphrase change button fix; TextField error edge highlighting

* Recent Activity fixes

* Various changes

* Standard Security Pic location

* Color changes

* Filter bar changes

* Styling for multiple owned items

* Minor language change

* Header dropdown (harder than expected)

* Small fixes

* View backup instructions

* marketplaces.js onCommerceScreen

* Beginnign of new injection

* Marketplace injection changes

* Purchase button style changes

* More button styling

* MY PURCHASES button

* marketplace onUsernameChanged

* New help QA

* Help text changes etc

* Downscale security image, reducing filesize

* Lots of bugfixes

* Cleanup before PR

* Only open cert during inspection if commerce switch is on

* Help text changes

* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey

* Quick glyph change

* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
 2017-09-27 14:43:51 -07:00
Andrew Meadows
26ea7034d8 prevent zero scale for Line3DOverlay 2017-09-27 14:30:50 -07:00
Andrew Meadows
b602c18475 prevent zero dimensions for Volume3DOverlay 2017-09-27 14:30:50 -07:00
beholder
00c3dcee2f 7925 Create Mode: keyboard focused entry field is not visible 
note: changed the way of calculation scroll value after showing virtual keyboard.
Now it doesn't require KEYBOARD_HEGHT and will always try to position focused element at vertical center of the client area
 2017-09-28 00:28:54 +03:00
SamGondelman
553829f7ab make sure FadeEffect dependency is created early 2017-09-27 11:58:35 -07:00
beholder
3677718e48 7926 Create Mode: the keyboard tray is not styled correctly 2017-09-27 21:33:18 +03: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
88810d28c1 Add activity logging for uploading_asset 2017-09-27 09:33:11 -07:00
Ryan Huffman
014a7bc9b0 Fix bytes downloaded stat tracking 2017-09-27 09:33:10 -07:00
Atlante45
73483eef94 Update information sentence 2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a Fix tablet asset browser 2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a Re-sync files 2017-09-26 18:42:50 -07:00
Atlante45
dda715e171 Update TabletAssetServer 2017-09-26 18:25:20 -07:00
Sam Gateau
9317ad38aa Merge pull request #11462 from highfidelity/game-render-interface 
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
 2017-09-26 17:40:23 -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
anshuman64
ca4d5ef807 Merge pull request #11454 from ElderOrb/case7877 
7877 Unexpected Behavior when pressing Enter on Input Field
 2017-09-26 16:26:42 -07:00
SamGondelman
49512c95d7 possibly fix threading crashes, mirror and fade 2017-09-26 16:21:36 -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
samcake
badb45c921 fixing the web surface now getting scaled when the table t is grabbed is fixed 2017-09-26 15:20:45 -07:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Andrew Meadows
909e5e86b1 Merge pull request #11442 from vladest/fix_dde_visibility 
Fix dde visibility
 2017-09-26 14:19:47 -07:00
samcake
510b446409 mergine with master, resolving conflict 2017-09-26 13:13:46 -07:00
beholder
24a12a2f8f 7722 Add onHover Outline to Tablet "X" Button 2017-09-26 22:31:56 +03:00
Seth Alves
7397a123c5 Merge pull request #11345 from SamGondelman/textAA 
Text3D Overlays and Entities fixes and no-AA
 2017-09-26 12:26:08 -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
74f9e07f1a Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu 
Move Tablet becomes toolbar menu from General to Developer menu
 2017-09-26 11:26:42 -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
b5c942f7f6 Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-26 10:47:59 -07:00
samcake
669af73a96 Bringing as much as possible out from render to game 2017-09-26 10:47:24 -07:00
Andrew Meadows
ec80846281 Merge pull request #11443 from SamGondelman/sharks 
Laser Pointer fixes and updates
 2017-09-26 10:22:55 -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
Andrew Meadows
cc8e618bc0 remove cruft 2017-09-25 15:52:14 -07:00
samcake
11c55755d5 Removing unused call 2017-09-25 15:10:40 -07:00
Andrew Meadows
a3ac20d961 minor cleanup 2017-09-25 15:10:14 -07:00
beholder
5502a639e2 7877 Unexpected Behavior when pressing Enter on Input Field 2017-09-26 01:07:47 +03:00
Andrew Meadows
37c501b131 LODManager uses renderTime instead of main loop fps 2017-09-25 13:17:21 -07:00
vladest
083b52abaf CHeck containsMouse property for mouse area instead on hovered 2017-09-25 21:15:05 +02:00
vladest
b190fac4f1 Fix stylus 2017-09-25 19:45:51 +02:00
vladest
1a2d38e31f Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds 2017-09-25 17:11:44 +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
Sam Gateau
f90dc64241 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-24 19:32:57 -07:00
Andrew Meadows
cf0dd6f8c3 Merge pull request #11371 from cain-kilgore/21542 
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
 2017-09-23 22:20:52 -07:00
samcake
59006411c6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled 
Enable Inspection Mode for all; change Commerce setting name
 2017-09-22 17:52:27 -07:00
SamGondelman
0e3f1c5149 add setLaserLength, setLockEndUUID doesn't use defaultRenderStates 2017-09-22 16:11:24 -07:00
Zach Fox
702a4e9ade More tweaking to overlay position 2017-09-22 15:32:38 -07:00
SamGondelman
cbe621f2b7 add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate 2017-09-22 15:15:15 -07:00
Zach Fox
0eafdeab14 Fix hover -> unhover overlay behavior 2017-09-22 13:32:11 -07:00
Ryan Huffman
883bdc6003 Merge pull request #11425 from Atlante45/feat/auto-bake 
Asset Browser auto-refresh
 2017-09-22 13:17:04 -07:00
vladest
5aab9bf5b0 Merge branch 'master' into fix_dde_visibility 2017-09-22 21:10:21 +02:00
vladest
4d530ef173 Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close 2017-09-22 21:08:34 +02:00
Zach Fox
e3f2e70bca No magic numbers 2017-09-22 11:43:56 -07:00
Zach Fox
430d1b22bb Update angular size and i behavior 2017-09-22 11:41:28 -07:00
samcake
452a8f7175 Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into game-render-interface 2017-09-22 11:31:33 -07:00
Zach Fox
bb9db3ef6d Updates to behavior and shader appearance 2017-09-22 11:24:30 -07:00
samcake
47b7fcc532 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2017-09-22 11:03:05 -07:00
samcake
4ce774ab8e Merge branch 'blue-bis' of https://github.com/samcake/hifi into blue 2017-09-22 11:02:57 -07:00
samcake
b424505f65 FIxing the case of the Circle3D 2017-09-22 10:48:56 -07:00
samcake
219d63784b REmoving the extra variables in Linear3D and just use the _renderTRansform 2017-09-22 10:39:51 -07:00
Atlante45
8583be41ce Don't refresh if not connected to the Asset Server 2017-09-21 18:57:09 -07:00
samcake
16fb64afaa Merging with blue-bis 2017-09-21 18:01:04 -07:00
samcake
4a67e0421f minimise the changes compared to upstream 2017-09-21 17:33:50 -07:00
samcake
eed099502a minimise the changes compared to upstream 2017-09-21 17:20:32 -07:00
samcake
510ecbb137 Merging with upstream 2017-09-21 16:59:15 -07:00
samcake
2d369a4586 fixing the image3D updating its renderTransform from it s update() call 2017-09-21 16:20:13 -07:00
Atlante45
6cdbf0c44a Fix RunningScripts in tablet mode 2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991 Add Asset Server auto refresh 2017-09-21 14:41:59 -07:00
Anthony J. Thibault
54e627e2c5 Merge branch 'master' into feature/ant-man2 2017-09-21 13:59:47 -07:00
samcake
454e167d93 notifying a render transform / bound change when the dimension property change 2017-09-21 12:58:56 -07:00
samcake
7103864b37 Also rendering the line3D overlay with start and end captured in game loop 2017-09-21 12:23:53 -07:00
Zach Fox
57b5a23373 Enable Inspection Mode for all; change Commerce setting name 2017-09-21 11:18:21 -07:00
Zach Fox
81be62b6f7 Check if ContextOverlayInterface is enabled before highlighting 2017-09-21 09:34:15 -07:00
samcake
5dc4e89e4c Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-21 08:56:02 -07:00
Andrew Meadows
6b3b3a7448 Merge pull request #11382 from ElderOrb/case6618 
6618 [Worklist] Add Input Field On Top of Keyboard
 2017-09-21 08:54:11 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
samcake
cdf66887ef Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-20 18:09:28 -07:00
samcake
d112ffd8d6 Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d 2017-09-20 18:06:49 -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
Dante Ruiz
4f328524b1 Merge pull request #11182 from vladest/audio_devices_split 
Audio devices split
 2017-09-20 16:43:30 -07:00
Anthony J. Thibault
5e93c13856 warning fix 2017-09-20 16:36:33 -07:00
Anthony J. Thibault
09c61deda8 Fixes for Vive puck calibration 2017-09-20 15:41:49 -07:00
Cain Kilgore
322b7fc060 Cleanup from Merge 2017-09-20 23:37:33 +01:00
Cain Kilgore
a4655b9c73 Merge branch 'master' of https://github.com/highfidelity/hifi into 21542 2017-09-20 23:25:26 +01:00
Cain Kilgore
796e9e7ab3 Fixed things 2017-09-20 23:23:30 +01: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
vladest
c48aba423a Rename check box 2017-09-20 22:48:39 +02:00
vladest
6e3cfe81ab Fix crash on second bookmark saving 2017-09-20 21:01:16 +02:00
samcake
3adeb80858 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-20 10:18:49 -07:00
Anthony J. Thibault
a8a5138c18 remove USE_N_SCALE preprocessor check 2017-09-20 09:23:13 -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
3376786288 Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard 2017-09-20 17:02:54 +02:00
vladest
56e6c8674a Merge branch 'master' into webbrowser_updates 2017-09-20 14:38:09 +02:00
Bradley Austin Davis
bc4193f276 Merge branch 'master' into android_new 2017-09-19 14:27:31 -07:00
vladest
7a36894f76 Make sure audio device not gets unchecked 2017-09-19 23:25:41 +02:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
vladest
67771bc297 Merge branch 'master' into modal_dialogs_async 2017-09-19 21:51:02 +02:00
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
vladest
6297448e90 Build fix 2017-09-19 19:49:19 +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
Cain Kilgore
dbe7cc5d1a 21540 - Make Rotation using Vive Controller Work 2017-09-18 23:38:38 +01: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
bb214d7bf3 Merge branch 'master' into tablet_extended_sounds 2017-09-17 16:16:03 +02:00
vladest
1cde504c74 Memleak fix. Cleanup 2017-09-16 22:57:26 +02:00
vladest
a8d24d9161 Cleanup 2017-09-16 22:41:18 +02:00
vladest
5585265349 Merge branch 'master' into modal_dialogs_async 2017-09-16 22:06:49 +02:00
vladest
3ceeb0d83e Rework all c++ calls 2017-09-16 22:04:53 +02:00
Seth Alves
765031bf89 Merge pull request #11377 from vladest/create_resize 
Add resizable flag. Use the flag for Create only
 2017-09-16 11:14:40 -07:00
Seth Alves
04b99ef8a5 Merge pull request #11352 from 1P-Cusack/FogBugz/Case_6107 
[QML] Fixes FogBugz Case 6107: Can't sort on import menu (details below).
 2017-09-16 11:08:59 -07:00
beholder
353bab5277 7384 On Domains without Edit Access, Create Button Text still Highlights 
(override color in states if captionColorOverride was specified)
 2017-09-16 16:50:45 +03:00
beholder
871b169128 6618 [Worklist] Add Input Field On Top of Keyboard 2017-09-16 16:17:36 +03:00
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
Sam Gateau
512e9432ed Merge pull request #11370 from samcake/blue-bis 
Fixing the web surface of the tablet
 2017-09-15 15:36:55 -07:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
samcake
524c94cdd4 Adding more comments for future fixmes 2017-09-15 14:35:45 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00