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
Andrew Meadows
37c501b131
LODManager uses renderTime instead of main loop fps
2017-09-25 13:17:21 -07: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
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
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -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
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
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
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
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
vladest
6e3cfe81ab
Fix crash on second bookmark saving
2017-09-20 21:01:16 +02: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
67771bc297
Merge branch 'master' into modal_dialogs_async
2017-09-19 21:51:02 +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
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
1cde504c74
Memleak fix. Cleanup
2017-09-16 22:57:26 +02:00
vladest
a8d24d9161
Cleanup
2017-09-16 22:41:18 +02:00
vladest
3ceeb0d83e
Rework all c++ calls
2017-09-16 22:04:53 +02: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
samcake
524c94cdd4
Adding more comments for future fixmes
2017-09-15 14:35:45 -07:00
Anthony Thibault
c7fc45e0ae
Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering
...
Avatar Attachments now render correctly
2017-09-15 13:28:00 -07:00
samcake
c687932ca7
One more:
2017-09-15 11:44:35 -07:00
samcake
a49b4dc31f
Merge back blue-bis in
2017-09-15 11:40:26 -07:00
Anthony J. Thibault
3f6c88e77f
Avatar Attachments now render correctly
...
* moved Avatar::fixupModelsInScene off the newly created render thread back
to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
changes in avatar attachment scale, commit 712aff7ad
2017-09-15 11:23:09 -07:00
samcake
19cd537e65
addressing review comments
2017-09-15 11:10:25 -07:00
Seth Alves
8a49edbecb
code review
2017-09-15 10:08:35 -07:00
Cain Kilgore
67a5c75a0d
Doesn't need to be here anymore
2017-09-15 06:08:22 +01:00
Cain Kilgore
c2e342ddac
Gravity Implementation
2017-09-15 06:03:56 +01:00
Sam Gateau
30bf800963
Cleanup
2017-09-14 20:33:08 -07:00
samcake
ec7536db2c
Brining the changes just to fix the tablet issue
2017-09-14 18:36:20 -07:00
samcake
bff578b283
Working version that fixes the web overlay / tablet
2017-09-14 17:07:50 -07:00
Atlante45
ae14f1f88e
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-09-14 15:34:20 -07:00
vladest
0bfa29d0d4
Merge branch 'master' into modal_dialogs_async
2017-09-14 20:21:29 +02:00
Seth Alves
d89f2b77da
rework ScriptEngine lifetimes using 'smart' pointers
2017-09-14 10:42:21 -07:00
vladest
2f86658308
Move Tablet becomes toolbar menu from General to Developer menu
2017-09-14 16:37:02 +02:00
Sam Gateau
a70f7dfc87
put updateCamera in its function
2017-09-13 22:05:20 -07:00
Sam Gateau
e4a5b7f250
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-13 19:28:56 -07:00
Anthony J. Thibault
8fb69a9867
Merge branch 'master' into feature/ant-man
2017-09-13 18:23:11 -07:00
Cain Kilgore
72ca62c4af
Initial Commit - more to do.
2017-09-14 00:25:11 +01:00
Atlante45
7d9daea0f6
Transmit baking errors to interface for display.
2017-09-13 09:54:54 -07:00
David Kelly
bce92a622e
cr feedback
2017-09-13 09:45:02 -07:00
Cain Kilgore
1c05311056
Some code cleanup
2017-09-13 16:48:18 +01:00
SamGondelman
a955381726
Merge remote-tracking branch 'upstream/master' into textAA
2017-09-12 16:50:16 -07:00
SamGondelman
1b85a453ab
working on text3d overlays and entities
2017-09-12 16:49:51 -07:00
samcake
216d74c112
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-12 14:36:12 -07:00
samcake
10b1e3f561
Trying to implement differnet solution to the transform updates problem and debug
2017-09-12 14:35:25 -07:00
David Kelly
187ed71a8a
more cleanup, plus now keyfile associated with user directly
2017-09-12 10:55:27 -07:00
David Kelly
61e8458d13
some cleanup
2017-09-12 08:08:41 -07:00
Sam Gateau
3669e66619
trying to update the transform at the right time in overlays
2017-09-12 00:02:54 -07:00
samcake
01e4bfc53e
Trying to avoid calling getTransform on nestables from render thread
2017-09-11 17:36:10 -07:00
David Kelly
5c12403b7c
first working pass at single file. Cleanup needed
2017-09-11 16:40:21 -07:00
Anthony J. Thibault
b81f85e1ae
Merge branch 'master' into feature/ant-man
2017-09-11 15:14:03 -07:00
David Kelly
4acbc2bfba
Just write the image file in the format we will use later
2017-09-11 13:03:21 -07:00
Howard Stearns
54deef8f32
Merge pull request #11329 from davidkelly/dk/walletSSLFix
...
fix wallet for new openssl
2017-09-11 10:07:12 -07:00
samcake
934364ec59
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-11 09:55:47 -07:00
Chris Collins
47a9337aa7
Merge pull request #11323 from jherico/mac_fixes
...
Mac fixes
2017-09-11 09:10:50 -07:00
Cain Kilgore
b69bd0ef49
Removed old Disconnect
2017-09-09 17:23:18 +01:00
Cain Kilgore
f6e22b0733
Changes
...
The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.
2017-09-09 17:21:42 +01:00
Cain Kilgore
0820eadc5b
Fixed a thing
2017-09-08 23:52:04 +01:00
Cain Kilgore
387e474889
WIP
2017-09-08 23:48:09 +01:00
Cain Kilgore
f109a86b23
Fixed small crash bug on exit
2017-09-08 23:05:22 +01:00
Anthony J. Thibault
72e0c844e4
Merge branch 'master' into feature/ant-man
2017-09-08 14:08:26 -07:00
David Kelly
c142215935
oops -- this is a windows-only thing (like so many other problems)
2017-09-08 12:52:12 -07:00
David Kelly
3e0b222ec4
fix wallet for new openssl
2017-09-08 11:44:19 -07:00
samcake
6fab8df8d2
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-08 09:13:29 -07:00
David Kelly
db0ecb61fd
Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework
...
Use new hfc account endpoint
2017-09-08 09:03:53 -07:00
Daniela
758f049f30
Correct offset for teleport pad.
2017-09-08 14:02:26 +01:00
Daniela
10e29d1cf0
Decrease offset for teleport pad. Add Bubble orientation and scale correction.
2017-09-08 12:45:29 +01:00
Daniela
fde5e14c04
Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man
2017-09-08 11:54:43 +01:00
Daniela
9eb429b25a
Fix offset for teleport pad.
2017-09-08 11:23:19 +01:00
David Kelly
bb07a586ca
warning, plus salting passphrase now
2017-09-07 19:24:31 -07:00
Cain Kilgore
b953c49461
Commit for Better Logger - WL 21537
2017-09-08 03:20:55 +01:00
David Kelly
efdc340c5c
Use new hfc account endpoint
2017-09-07 18:15:04 -07:00
samcake
73ec095235
fooling around with communicating the update transform to render thread through a trasnaction, not the solution yet
2017-09-07 17:58:16 -07:00
Anthony J. Thibault
7ca498dc7f
Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.
2017-09-07 16:28:08 -07:00
Anthony J. Thibault
f4f9c29bff
Fix for avatar scale preferences
2017-09-07 15:30:16 -07:00
Anthony J. Thibault
d0f9a20a01
Fix for tablet grabbing at small scales
2017-09-07 15:10:15 -07:00
Bradley Austin Davis
eb8b892571
Various Mac fixes
2017-09-07 14:45:35 -07:00
Stephen Birarda
7859b3b11f
remove image compression choices from Interface settings
2017-09-07 12:07:57 -07:00
Stephen Birarda
5e1decb02b
Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake
2017-09-07 12:06:53 -07:00
Chris Collins
12d720805c
Merge pull request #11319 from jherico/async_qml_load_crash
...
Fix potential crash on asynchronous QML loads
2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub
c5098abfb9
Merge pull request #10937 from kencooke/zzmp-audio/peak-values
...
Add peak values for all input devices in selection dialog
2017-09-07 11:58:50 -07:00
Daniela
d11a749365
Refactor 1 line. Pad alignment is correct.
2017-09-07 19:28:36 +01:00
Daniela
94e26a554d
Add 180 degrees rotation so that pad faces the avatar
2017-09-07 18:48:20 +01:00
Brad Davis
cc3beb3d91
Fix potential crash on asynchronous QML loads
2017-09-07 09:53:21 -07:00
Daniela
4c302b899d
Fix teleport pad alignment
2017-09-07 17:52:09 +01:00
Daniela
3ff707f27e
Add Avatar resize compatible teleport pad alignment
2017-09-07 13:31:41 +01:00
samcake
e48c456d24
Trying to sync the render transform for overlay web at the right time...
2017-09-06 17:57:18 -07:00
Howard Stearns
a0ae9ee747
Merge pull request #11311 from davidkelly/dk/walletCleanup
...
wallet cleanup
2017-09-06 14:29:24 -07:00
Daniela
37f959d749
Add Avatar resize compatible teleport pad alignment
2017-09-06 19:45:58 +01:00
Anthony J. Thibault
2f850826f2
Allow override of near/far clip planes in Oculus and OpenVR plugins
2017-09-06 11:02:44 -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
vladest
57643bd904
Merge branch 'master' into audio_devices_split
2017-09-06 14:20:41 +02: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
David Kelly
350cee5f35
Wallet cleanup
2017-09-05 16:33:16 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Thijs Wenker
08baa96dc9
Merge pull request #11296 from misslivirose/fix-content-message
...
More detailed domain replacement message
2017-09-06 00:44:48 +02:00
Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -07:00
Dante Ruiz
9f2bdce190
Merge pull request #11005 from Armads/WL21424
...
WL21424 hide head attachments when head joint is hidden
2017-09-05 13:04:14 -07:00
Dante Ruiz
e69227aef8
Merge pull request #11209 from vladest/tablet_login_button
...
Added login button to Tablet
2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1
Reset passphrase fix
2017-09-05 10:04:16 -07:00
Anthony J. Thibault
f0912987a3
Fix ray picks against HUD sphere at different sensor scale factors
2017-09-05 10:03:19 -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
Stephen Birarda
55d44a8c8f
Merge pull request #11285 from Atlante45/feat/baking-enabled
...
Wire "Use baked" checkbox
2017-09-01 16:25:49 -07:00
David Kelly
47cd47f819
log when no passphrase was set before trying to decrypt
2017-09-01 14:50:45 -07:00
David Kelly
feaa8d3120
Someday, a real rain will come and wash Wallet.cpp
...
Till then, this little change will have to do.
2017-09-01 14:06:43 -07:00
David Kelly
90316e275a
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
2017-09-01 13:33:23 -07:00
Liv
7eab80e494
change message when permissions to replace domain content are not present
2017-09-01 13:17:37 -07:00
David Kelly
9fe6ce0337
working change passphrase. some cleanup to come
2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
2017-09-01 11:53:47 -07:00
David Kelly
655dc61ff2
doh
2017-09-01 10:16:45 -07:00
vladest
681fc529dc
Merge branch 'master' into modal_dialogs_async
2017-09-01 13:31:15 +02:00
Liv
8d21b286b4
string fix
2017-08-31 19:34:01 -07:00
Anthony J. Thibault
6618ba12e9
Merge branch 'master' into feature/ant-man
2017-08-31 18:10:39 -07:00
Anthony J. Thibault
a1b94fd9d2
Bug fixes for laser offset and avatar hold action
2017-08-31 17:26:00 -07:00
David Kelly
451936214d
initial stab at changing passphrase
2017-08-31 17:05:55 -07:00
David Kelly
1eb503f526
we are qt5.6 on mac
2017-08-31 16:49:12 -07:00
Zach Fox
eab2947d40
Auth flow
2017-08-31 15:16:29 -07:00
David Kelly
f8341ce1da
warning
2017-08-31 13:24:07 -07:00
David Kelly
de2ce1cd5f
warning
2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39
Changes in what I think are the right direction
2017-08-31 13:16:10 -07:00
Atlante45
a9cfc01df3
Set Baking Enabled API
2017-08-31 13:11:27 -07:00
Atlante45
764e5d2e4c
Move constant to central location
2017-08-31 13:08:18 -07:00
Atlante45
da2bede6fe
Hide .baked items from the Asset Browser
2017-08-31 13:08:18 -07:00
Zach Fox
914a6bae00
Commerce: Wallet Passphrase Modal
2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8
display hfc in "pennies"
2017-08-31 12:10:12 -07:00
vladest
1b5e6fd5f8
Merge branch 'master' into modal_dialogs_async
2017-08-31 20:39:48 +02:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -07:00
Zach Fox
913618ded5
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 16:13:50 -07:00
Anthony J. Thibault
c9cdaadeb5
Better scale support in SpatiallyNestable class.
...
Previously avatar used SpatiallyNestable scale to keep track of model rendering scale.
It now uses a new member variable _modelScale instead. This is important because the
notion of "Avatar" space does NOT include scale, so this is now reflected correctly in
the SpatiallyNestable class.
Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale
field. a new _dimensions member variable is used instead. The SpatiallyNestable scale
field for entities should always be one.
Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale.
This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint.
Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions.
Added qDebug stream support for Transform class.
2017-08-30 15:46:36 -07:00
Zach Fox
dbb7023fc1
Fix warnings
2017-08-30 15:26:25 -07:00
David Kelly
988ee8c8d1
fix image provider, couple other things
2017-08-30 15:23:54 -07:00
vladest
b547b2573e
Added logged in property
2017-08-30 23:15:39 +02:00
Zach Fox
fdcc149c34
Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface
2017-08-30 13:27:18 -07:00
vladest
903036a709
Merge branch 'master' into tablet_login_button
2017-08-30 22:12:03 +02:00
howard-stearns
b8da08ca42
reset wallet
2017-08-30 11:29:43 -07:00
Zach Fox
e0878e7a3f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2
2017-08-30 11:07:24 -07:00
Zach Fox
f366743be7
Login; punctuationMode; new images
2017-08-30 11:07:03 -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
Zach Fox
1b48319a3f
Merge pull request #11267 from zfox23/commerce_zachsPunchlist1
...
Commerce: Zachs Punchlist 01
2017-08-30 10:10:56 -07:00
Liv
2f2b406047
Remove unneeded handcontrollertype code from handle first run checks
2017-08-30 09:23:33 -07:00
Anthony J. Thibault
9cd8b6991e
Merge branch 'master' into feature/ant-man
2017-08-30 08:58:55 -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
druiz17
2a97257698
Merge pull request #11140 from ElderOrb/case6788
...
6788: You can deselect your current view mode
2017-08-29 17:15:51 -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
91f4e59f61
Misc fixes. Get started.
2017-08-29 12:33:44 -07:00
David Kelly
67f25adac0
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-29 08:02:53 -07:00
David Kelly
a7af114144
fix wallet, use text from server in history (for now)
2017-08-28 17:04:19 -07:00
Zach Fox
22d3857501
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory
2017-08-28 15:10:17 -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
Zach Fox
1c1b841a86
Fix security images; actually do the right thing when wallet not set up
2017-08-28 12:18:53 -07:00
Atlante45
ca62e7168c
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake
2017-08-28 11:41:23 -07:00
Anthony J. Thibault
5230b03f4f
clang warning fixes
2017-08-28 10:35:03 -07:00
David Kelly
3955624e63
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay
2017-08-28 10:13:21 -07:00
Anthony J. Thibault
573985c7c9
Merge branch 'master' into feature/ant-man
2017-08-28 09:27:04 -07:00
Sam Gateau
a98d861600
Merge pull request #11242 from SamGondelman/tabletLayer2
...
Web overlays and entities are always non anti-aliased
2017-08-28 09:10:14 -07:00
vladest
d8fb7300c3
Merge branch 'master' into tablet_login_button
2017-08-28 16:59:35 +02:00
vladest
38295ab73f
Merge conflicts
2017-08-28 16:58:30 +02:00
vladest
78aa5820d0
Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings
2017-08-27 11:56:28 +02:00
vladest
7796946343
Merge branch 'master' into audio_devices_split
2017-08-26 20:00:00 +02:00
Anthony J. Thibault
937f400534
Bug fixes for Avatar::getEyeHeight() when no feet joints are present
2017-08-25 18:23:19 -07:00
