Cain Kilgore
3b4185fdb3
WL 21508 - Improve upon Skybox Changer
...
This involved a second PR, due to optimizing the way the Skyboxes are laid out. All of the Skyboxes will now appear at once, with the random button being removed. You are able to scroll up and down the list and choose which Skybox you'd like to pick.
2017-10-23 19:30:36 +01:00
Daniela
f15038c54f
Re-add isFacingAvatar to true and delete rotation of the grabbermoveup tool.
2017-10-23 19:11:32 +01:00
Zach Fox
5c8451a626
Auto-refresh Wallet Home & Purchases on 4s timer
2017-10-23 10:36:23 -07:00
Melissa Brown
20787c9c7c
Merge pull request #11644 from cain-kilgore/21508
...
WL 21508 - Improve upon Skybox Changer
2017-10-23 10:30:55 -07:00
SamGondelman
9bbb2eb692
austin's comments, send events directly to selected web entity
2017-10-23 10:17:45 -07:00
Cain Kilgore
b42afdaff0
WL 21508 - Cleanup from Code Review
2017-10-23 16:27:28 +01:00
beholder
cadf00fecf
add missing 'eyeToWorld' assignment
2017-10-22 19:27:04 +03: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
Cain Kilgore
bc772a2f9a
WL 21508 - Improve upon Skybox Changer
2017-10-21 19:42:53 +01:00
Sam Gateau
50a3ccdbca
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-21 10:01:07 -07:00
SamGondelman
88b8d7bc46
fix image3d overlay isFacingAvatar
2017-10-20 16:56:42 -07:00
Zach Fox
fbd393d918
Add newline to cert ID when updating location
2017-10-20 15:10:24 -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
Zach Fox
c217992866
Order of operations lol
2017-10-20 11:42:03 -07:00
vladest
908d601a43
Code style fixes #1
2017-10-20 20:00:11 +02:00
Zach Fox
c0ab320da6
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-20 10:40:35 -07: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
Howard Stearns
352243c01b
Merge pull request #11629 from zfox23/wearItButton
...
REZ IT -> WEAR IT
2017-10-20 09:36:09 -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
Zach Fox
b3acdfa9d8
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into wearItButton
2017-10-19 14:37:47 -07:00
druiz17
f2ad61934b
fix toolbar from completely dispearing
2017-10-19 14:02:21 -07:00
Seth Alves
f2cb5d4aff
clean-up concept of puffed queryAACube
2017-10-19 13:19:13 -07:00
Zach Fox
24d109cfe7
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-19 12:13:38 -07:00
samcake
902334e1ec
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-19 12:04:01 -07:00
Zach Fox
9537e19ad4
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-19 10:58:55 -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
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
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
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
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
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
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
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
Zach Fox
4ebccfa65c
Use put instead of get sob
2017-10-10 16:23:43 -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
