samcake
01e4bfc53e
Trying to avoid calling getTransform on nestables from render thread
2017-09-11 17:36:10 -07:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Chris Collins
8563a05431
Merge pull request #11255 from misslivirose/feat/tablet-tutorial
...
Removing tutorial paths for first run experience
2017-09-06 09:23:45 -07:00
Liv
930243539c
add back first run to false and fix formatting
2017-09-05 17:50:25 -07:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
Liv
7eab80e494
change message when permissions to replace domain content are not present
2017-09-01 13:17:37 -07:00
Liv
8d21b286b4
string fix
2017-08-31 19:34:01 -07:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
Zach Fox
271fcbf8b4
Merge pull request #11271 from davidkelly/dk/securityImageIssue
...
security image shows up in every qml engine now
2017-08-30 10:52:48 -07:00
Liv
2f2b406047
Remove unneeded handcontrollertype code from handle first run checks
2017-08-30 09:23:33 -07:00
Chris Collins
47a2e57e26
Merge pull request #10625 from humbletim/21180-C++
...
CR 21180-C++ Camera app -- core changes
2017-08-30 07:20:00 -07:00
David Kelly
a2b1cfc7ac
security image shows up in every qml engine now
2017-08-29 17:06:57 -07:00
Liv
59deccaeb5
Remove unused skipTutorial code
2017-08-29 14:55:59 -07:00
Zach Fox
0cdef28cfd
Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-28 14:55:18 -07:00
Liv
59fe5ffdc1
Initial attempt at changing first run behavior
2017-08-25 17:48:35 -07:00
Elisa Lupin-Jimenez
4c40e3bdf4
fixed weird info box display of filenames
2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez
7cee80f0cf
my own objects (or rather objects with low poly count) download now
2017-08-25 11:09:11 -07:00
Sam Gateau
c5fbd5a2a5
Merge pull request #11131 from jherico/threaded_render_entities
...
Threaded rendering of Entities
2017-08-24 17:34:49 -07:00
Chris Collins
43b1e67e4a
Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter
...
Create home bookmark for new content sets loaded in
2017-08-24 16:25:04 -07:00
Zach Fox
56950e4614
It's working!
2017-08-24 14:17:39 -07:00
Brad Davis
e817d3ced4
Threaded rendering & entity rendering refactor
2017-08-24 13:34:34 -07:00
humbletim
9348048387
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-08-24 16:23:47 -04:00
David Kelly
eb9436ba96
Merge pull request #11235 from davidkelly/dk/encryptFile
...
Initial wallet app plus some encryption of security image
2017-08-24 13:17:14 -07:00
Zach Fox
e834e9d7a7
Progress
2017-08-24 10:46:18 -07:00
Zach Fox
657beef70f
I understand again...getting started again
2017-08-23 17:42:02 -07:00
Liv
1050141b11
Create home path for new content sets loaded in
2017-08-23 17:38:24 -07:00
David Kelly
138534c3ff
encrypt security image
2017-08-23 15:01:09 -07:00
SamGondelman
d7b3686364
include noncollidable entities
2017-08-22 17:37:51 -07:00
Zach Fox
69364f2ecd
Initial progress
2017-08-22 17:10:57 -07:00
Zach Fox
ec2a27e68c
Progress
2017-08-22 15:02:06 -07:00
Zach Fox
2a75d97006
First steps
2017-08-22 12:56:16 -07:00
SamGondelman
a904ae1a8a
can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API
2017-08-22 11:41:20 -07:00
Elisa Lupin-Jimenez
44f1f340e1
Merge pull request #11147 from elisa-lj11/blocks
...
Adding Blocks Tablet App to Marketplace
2017-08-18 15:06:18 -07:00
Sam Gondelman
cbf2bb3a61
Merge pull request #10980 from SamGondelman/sharks
...
Reduce laser pointer lag
2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
2b44608ece
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-17 10:18:40 -07:00
Zach Fox
ecd1f13197
Allow users to take a snapshot from the secondary camera
2017-08-16 15:34:06 -07:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Liv
aea5f170f2
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-08-15 13:58:22 -07:00
Liv
49eab847fd
Refactor handleOctreeFileReplacement, style changes, align with handler for other file types
2017-08-15 13:58:02 -07:00
SamGondelman
9bb7e66859
separate raypickscriptinginterface, cleanup
2017-08-15 13:36:41 -07:00
Elisa Lupin-Jimenez
3d7995da34
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-15 10:01:24 -07:00
Seth Alves
972a24fea9
Merge pull request #11169 from anshuman64/new-branch
...
High Fidelity Interface Application Rename
2017-08-10 15:57:10 -07:00
SamGondelman
4c55849290
merge from master
2017-08-10 15:43:23 -07:00
Sam Gateau
79f3be1efe
Merge pull request #11021 from Zvork/fade2
...
Fade dissolve effect JUST AVATARS
2017-08-10 13:48:30 -07:00
Anshuman Dewangan
f79bf4e009
High Fidelity Interface rename
2017-08-10 13:40:00 -07:00
Liv
6bde4db0d7
wrap in marketplace check and change landing point
2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
a2e407f786
fixed merge conflicts in marketplacesInject.js
2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95
Downloading blocks from marketplace in own asset folder
2017-08-09 15:56:07 -07:00
Sam Gondelman
85c3f94976
Merge branch 'master' into sharks
2017-08-09 13:36:18 -07:00
