David Kelly
f0091f16a1
cr feedback
2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12
Open marketplace when we know the marketplaceID of an entity
2017-07-19 14:11:14 -07:00
Zach Fox
c866bd814d
Make clicks work right
2017-07-19 12:24:20 -07:00
David Kelly
c09c5b2861
Merge pull request #10996 from zfox23/HoverOverlay_CubeOverlay
...
1st version of (i) overlay interface for lasers and mouse
2017-07-19 10:11:35 -07:00
Zach Fox
f06ec715f2
Quick bugfix
2017-07-19 09:59:44 -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
Andrew Meadows
d48f45f7e6
Merge pull request #10990 from druiz17/bug-help-issue
...
fixed another instance of the tablet getting stuck on the help screen
2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013
Merge pull request #10970 from Atlante45/feat/ac-shutdown-info
...
AC shutdown info + PPID watcher on Unix
2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb
made requested changes
2017-07-19 16:28:16 +01:00
Zach Fox
761d35d633
Getting there!
2017-07-18 17:10:23 -07:00
Brad Hefta-Gaub
044b8fc19a
Merge pull request #10993 from druiz17/bug-rogue-laser
...
Do not show lasers when editing in 2D mode.
2017-07-18 16:53:11 -07:00
Zach Fox
82111a8f6a
Timer for hand controller lasers
2017-07-18 16:40:18 -07:00
Zach Fox
8f6af3a1ab
ContextOverlay
2017-07-18 16:28:24 -07:00
Brad Davis
43476afff5
Merge pull request #10995 from AndrewMeadows/fix-debug-build
...
fix broken debug build
2017-07-18 16:00:18 -07:00
Brad Davis
90048cdb4b
Merge pull request #10991 from jherico/minimized_deadlock
...
Ensure we continue calling idle when minimized
2017-07-18 15:59:28 -07:00
Zach Fox
265f978a06
It's working!
2017-07-18 15:57:26 -07:00
Andrew Meadows
8dafc30bf9
fix debug build: stub pure virtual function
2017-07-18 15:57:00 -07:00
Dante Ruiz
b3ec306063
better version
2017-07-18 23:48:21 +01:00
Clément Brisset
18be917358
Merge pull request #10574 from humbletim/21180
...
CR #21180 Camera control app
2017-07-18 15:35:32 -07:00
David Kelly
4d4d9421d3
Merge pull request #10983 from davidkelly/dk/marketplaceIDHack
...
Get marketplaceID into imported entities
2017-07-18 15:25:49 -07:00
Dante Ruiz
8cbe63f296
removed search laser in edit mode for 2d mode
2017-07-18 22:45:54 +01:00
Zach Fox
084f4d2ab0
Why were Web3DOverlays done this way?
2017-07-18 14:42:59 -07: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
Chris Collins
e99683fdcf
Merge pull request #10985 from jherico/audio_deadlock
...
Trying to resolve QML / Audio deadlocks
2017-07-18 12:40:03 -07:00
Dante Ruiz
06a69c8bd7
fixed another tablet stuck on help screen
2017-07-18 20:27:55 +01:00
Brad Hefta-Gaub
0ba9d65732
Merge pull request #10989 from druiz17/bug-whitespace-script-url
...
Fixed not being able to load a script url that has a white space
2017-07-18 11:39:10 -07:00
David Kelly
c4d5d16eb3
cr feedback
2017-07-18 11:12:06 -07:00
Andrew Meadows
6e59e451c4
Merge pull request #10986 from Atlante45/fix/avatar-audio-timer
...
Use timer instead of dedicated thread to tick AC scripted avatar audio
2017-07-18 10:25:35 -07:00
Andrew Meadows
888f2f64a5
Merge pull request #10981 from druiz17/bug/delete-avatar-entity
...
Fixed not being able to delete avatar entities when switching domains
2017-07-18 10:09:34 -07:00
Dante Ruiz
bcc15dd4ae
Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url
2017-07-18 17:59:56 +01:00
Dante Ruiz
976fec66f8
fixed loading script whitespace
2017-07-18 17:59:42 +01:00
Clément Brisset
bcc9cf7c60
Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
...
Fix Avatar/Audio Mixer crash
2017-07-18 09:59:30 -07:00
Brad Davis
9f13533560
Ensure input and output device containers are protected by mutex
2017-07-18 08:58:17 -07:00
Dante Ruiz
7fe47e4e2f
Merge branch 'master' of github.com:highfidelity/hifi into bug/delete-avatar-entity
2017-07-18 16:51:41 +01:00
Dante Ruiz
d504000604
made requested changes
2017-07-18 16:51:21 +01:00
Brad Hefta-Gaub
2dfaf7b02a
Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
...
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
2017-07-18 08:51:13 -07: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
Brad Hefta-Gaub
a7e328285e
Merge pull request #10969 from druiz17/bug/addmodel-textbox
...
allow user move the cursor with the mouse for the add model URL textbox
2017-07-18 08:41:08 -07:00
Brad Hefta-Gaub
0d504e57a9
Merge pull request #10984 from druiz17/bug/tablet-position
...
trying new tablet spawn position.
2017-07-18 08:07:56 -07:00
Andrew Meadows
5f4df0da2b
Merge pull request #10847 from AndrewMeadows/entitymap
...
faster EntityItem lookup by EntityItemID
2017-07-18 08:04:37 -07:00
NeetBhagat
ff51fa7199
Resolved review comments.
2017-07-18 10:42:01 +05:30
Brad Davis
d43432bd71
Cleanup dead code, fix startup behavior
2017-07-17 18:54:52 -07: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
Brad Davis
aab56cf2a9
Trying to resolve QML / Audio deadlocks
2017-07-17 16:21:28 -07:00
Atlante45
91d65469a0
Use timer instead of dedicated thread to tick avatar
2017-07-17 15:52:52 -07:00
Dante Ruiz
f5abb4a090
trying new tablet position spwan
2017-07-17 23:18:16 +01:00
David Kelly
061f084d9f
Get marketplaceID into imported entities
...
Rather than doing this on the backend, we can do it here at the
time we import. Later we will have some support for getting
an entities identity hash and querying the backend to get a
marketplaceID for them as needed. However for now this is enough
to get us moving forward.
2017-07-17 15:08:30 -07:00
Zach Fox
a37f0137e7
Destroy overlays when trigger released
2017-07-17 14:29:43 -07:00
