Commit graph

22356 commits

Author SHA1 Message Date
David Back
08a6eb4dd3 reset tablet contextual mode back to false when toggling tablet show/hide 2017-10-24 15:50:09 -07:00
David Back
b5f1793863 add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place 2017-10-23 14:21:18 -07:00
vladest
b791dcba7f Add sound cues to create app 2017-10-22 14:59:53 +02:00
vladest
cf7b050680 Sound cues for GoTo interface 2017-10-21 20:47:56 +02:00
SamGondelman
88b8d7bc46 fix image3d overlay isFacingAvatar 2017-10-20 16:56:42 -07:00
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers
Fix tablet intersection bug and start of Pointer migration work (WIP)
2017-10-20 13:53:52 -07:00
Brad Hefta-Gaub
f6af1d1ecf Merge pull request #11387 from vladest/tablet_extended_sounds
Tablet extended sounds
2017-10-20 13:49:06 -07:00
Brad Hefta-Gaub
d6ad389dab Merge pull request #11611 from AndrewMeadows/faster-update-renderables
Faster renderables update
2017-10-20 13:43:08 -07:00
vladest
908d601a43 Code style fixes #1 2017-10-20 20:00:11 +02:00
Seth Alves
9d00606505 Merge pull request #11635 from druiz17/fix-hud-issues
actually fix toolbar from completely dispersing
2017-10-20 10:22:34 -07:00
vladest
fa349a694c Code style fixes 2017-10-20 15:12:09 +02:00
vladest
ea6c2e1bb5 Merge branch 'master' into tablet_extended_sounds 2017-10-20 14:46:02 +02:00
druiz17
f2ad61934b fix toolbar from completely dispearing 2017-10-19 14:02:21 -07:00
Zach Fox
aa48215933 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2 2017-10-19 10:54:31 -07:00
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
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
Zach Fox
dc1b3aef8f Don't show purchases tutorial if user clicks what is rez 2017-10-18 16:25:06 -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
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
David Rowe
fcc7a3e440 Code review 2017-10-18 21:08:10 +13: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
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
druiz17
9a881c5e57 fix keyboard 2017-10-17 15:43:23 -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
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
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
aee817fbbc scale end sphere in c++ for controller modules 2017-10-16 13:31:25 -07:00
Andrew Meadows
e109101acc update profiling timers 2017-10-16 11:52:30 -07:00
Brad Davis
2ae61cb96b Prototype packaging QML and related resources into a QRC 2017-10-14 14:40:46 -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
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