David Rowe
|
5c97954e66
|
Merge branch 'master' into M19404
# Conflicts:
# scripts/system/interstitialPage.js
|
2018-11-09 13:35:11 +13:00 |
|
Wayne Chen
|
f66326fc4d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
|
2018-11-08 15:51:24 -08:00 |
|
Wayne Chen
|
e266532888
|
Merge branch 'master' into loginInitiative2
|
2018-11-08 11:17:24 -08:00 |
|
Dante Ruiz
|
501746b156
|
3D Keyboard
|
2018-11-08 09:58:53 -08:00 |
|
Zach Fox
|
1ab1cb95d8
|
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
|
2018-11-08 09:57:10 -08:00 |
|
Zach Fox
|
cee1454f6e
|
CR feedback - thanks Ken!
|
2018-11-07 15:09:53 -08:00 |
|
Wayne Chen
|
8e075c2a7c
|
fixing login qml/using HMD position for overlay
|
2018-11-07 14:05:06 -08:00 |
|
NissimHadar
|
189a799a3a
|
Added method to detect OS type. Needed for running automated tests.
|
2018-11-07 08:58:38 -08:00 |
|
David Rowe
|
28097933ed
|
Add setting to enable/disable the mini tablet
|
2018-11-07 14:39:06 +13:00 |
|
Howard Stearns
|
05becb870f
|
remove urls from logs in Interface
|
2018-11-06 13:47:07 -08:00 |
|
Clement
|
0ca0a6f3be
|
Fix JSDoc arrays
|
2018-11-06 12:57:17 -08:00 |
|
Zach Fox
|
378bf911d4
|
Fix another build error
|
2018-11-06 12:48:17 -08:00 |
|
Clement
|
4e802b0f3f
|
Add JSDoc comments
|
2018-11-06 11:59:15 -08:00 |
|
Zach Fox
|
58dd690c0a
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-11-06 10:29:05 -08:00 |
|
NissimHadar
|
91fb592d3f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into MAC
|
2018-11-06 10:19:52 -05:00 |
|
NissimHadar
|
c0e7a4348b
|
Reverted changes to Interface.
|
2018-11-05 22:10:20 -05:00 |
|
Zach Fox
|
d0854ca2ab
|
Use AccountManager instead of settings
|
2018-11-02 16:42:18 -07:00 |
|
Zach Fox
|
402c23e359
|
Use useragent instead of queryparam to determine limitedCommerce
|
2018-11-02 16:07:29 -07:00 |
|
NissimHadar
|
51272d8fec
|
Added setGeometry script command.
|
2018-11-02 13:09:07 -07:00 |
|
NissimHadar
|
70c0addc3f
|
Removed setWindowSize - crashes on both Windows and Mac.
Fixed typo.
|
2018-11-02 10:47:17 -07:00 |
|
NissimHadar
|
c7353e6c59
|
Added setWindowSize - FOR TESTING ON MAC
|
2018-11-02 09:57:58 -07:00 |
|
NissimHadar
|
470a490494
|
Typo.
|
2018-11-01 17:31:10 -07:00 |
|
NissimHadar
|
d851720cb0
|
Added method to detect OS type. Needed for testing.
|
2018-11-01 16:57:28 -07:00 |
|
Zach Fox
|
20cd1df22c
|
Lotsa changes
|
2018-11-01 16:48:08 -07:00 |
|
Zach Fox
|
b6344acc1d
|
Big checkpoint. be aware - things may be broken
|
2018-10-30 15:08:13 -07:00 |
|
David Rowe
|
e2ae50362e
|
Add missing JSDoc of Window.interstitialModeEnabled property
|
2018-10-26 19:21:58 +13:00 |
|
Howard Stearns
|
c85dbb8233
|
limitedCommerce switch
|
2018-10-25 11:25:56 -07:00 |
|
Zach Fox
|
d1556ae4e8
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-23 15:51:34 -07:00 |
|
Zach Fox
|
947391e49e
|
Fix build errors
|
2018-10-23 12:45:16 -07:00 |
|
Zach Fox
|
1d8994993c
|
Whitelist TTS scripting interface to TTS app, which is now a default script
|
2018-10-22 17:05:31 -07:00 |
|
Zach Fox
|
1023e6d2b9
|
Fix ClipboardScriptingInterface:
|
2018-10-22 14:00:04 -07:00 |
|
Zach Fox
|
d44f9e2ccc
|
Tons of improvements
|
2018-10-22 13:59:57 -07:00 |
|
Zach Fox
|
493262052c
|
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
|
2018-10-22 13:59:52 -07:00 |
|
Zach Fox
|
7be5d5674d
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-22 13:59:35 -07:00 |
|
Zach Fox
|
1eca1bfd55
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-22 11:18:10 -07:00 |
|
Brad Hefta-Gaub
|
1ff69844f2
|
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
hide progress overlays if interstitial mode
|
2018-10-19 16:35:42 -07:00 |
|
Zach Fox
|
2f37a2b1a1
|
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
|
2018-10-18 11:12:26 -07:00 |
|
Zach Fox
|
2a9e0041b2
|
Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech
|
2018-10-18 10:16:07 -07:00 |
|
Kerry Ivan Kurian
|
3b15548ea3
|
Display resource-access events in marketplace item tester
Includes refactoring marketplace item tester into a single-page app.
|
2018-10-18 01:04:47 -07:00 |
|
Wayne Chen
|
fd3c0d2f76
|
pushing with new fix
|
2018-10-17 15:03:09 -07:00 |
|
Zach Fox
|
26e388b139
|
Some experimentation yields promising results...
|
2018-10-16 17:34:48 -07:00 |
|
SamGondelman
|
ded8d4b547
|
variant conversions
|
2018-10-16 11:55:28 -07:00 |
|
Zach Fox
|
53226e7924
|
Prevent overflows; still not working
|
2018-10-12 11:19:52 -07:00 |
|
Zach Fox
|
daeedc6ef1
|
Lots of progress today
|
2018-10-11 17:10:14 -07:00 |
|
Zach Fox
|
5d4de3d3b0
|
I love it.
|
2018-10-10 17:36:38 -07:00 |
|
Zach Fox
|
d8c9712dd2
|
It's working!
|
2018-10-10 16:19:11 -07:00 |
|
Zach Fox
|
f1446532d0
|
Almost working
|
2018-10-10 16:13:23 -07:00 |
|
Zach Fox
|
7de784ce27
|
First steps (definitely not working)
|
2018-10-10 12:32:55 -07:00 |
|
Sam Gondelman
|
67662df760
|
Merge branch 'master' into scriptvec3
|
2018-10-08 12:59:34 -07:00 |
|
Dante Ruiz
|
36c2cceb57
|
fix for failing to enter domain
|
2018-10-05 15:39:51 -07:00 |
|
Wayne Chen
|
0a7102b4d3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
|
2018-10-04 08:59:26 -07:00 |
|
Sam Gondelman
|
4e96c3297b
|
Merge branch 'master' into scriptvec3
|
2018-10-03 17:14:15 -07:00 |
|
Sam Gondelman
|
5b6e7b2566
|
Merge branch 'master' into scriptvec3
|
2018-10-02 08:58:04 -07:00 |
|
David Rowe
|
f7fd76b316
|
Merge branch 'master' into M18586
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
|
2018-10-02 16:49:16 +13:00 |
|
John Conklin II
|
9cbd819a39
|
Merge pull request #13965 from ctrlaltdavid/M17428-f
Mini tablet in palm
|
2018-10-01 16:56:36 -07:00 |
|
John Conklin II
|
dd5cd5de82
|
Merge pull request #14091 from gcalero/fix-case-18465
Fix case 18465: redirect to domain after login
|
2018-10-01 16:48:27 -07:00 |
|
Seth Alves
|
b69d0f3997
|
get interface building and working with clang-7 on ubuntu 18
|
2018-09-28 13:46:51 -07:00 |
|
David Rowe
|
545c2591e3
|
Merge branch 'master' into M18586
|
2018-09-28 16:19:44 +12:00 |
|
David Rowe
|
45993ba475
|
Provide mini tablet details via API instead of messages
|
2018-09-28 14:23:08 +12:00 |
|
Wayne Chen
|
813defebfc
|
Merge branch 'update-interstitial' of https://github.com/danteruiz/hifi into interstitialMerged
|
2018-09-26 16:45:22 -07:00 |
|
Gabriel Calero
|
3163ae5997
|
Fix case 18465: redirect to domain after login
|
2018-09-26 19:41:43 -03:00 |
|
Wayne Chen
|
db41a1c16b
|
error state signal for 404/interstitial
|
2018-09-26 13:48:15 -07:00 |
|
Dante Ruiz
|
fa5dfb6e28
|
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
|
2018-09-26 09:18:12 -07:00 |
|
Dante Ruiz
|
57ae8ff8a1
|
update interstitial page stability count and loading bar
|
2018-09-24 16:09:53 -07:00 |
|
Wayne Chen
|
69d5299362
|
patching fix for previous commits
|
2018-09-24 15:22:46 -07:00 |
|
David Rowe
|
e29b403abc
|
Merge branch 'master' into M18586
# Conflicts:
# interface/src/raypick/PointerScriptingInterface.cpp
# interface/src/raypick/PointerScriptingInterface.h
# interface/src/raypick/StylusPointer.h
# libraries/pointers/src/Pointer.h
# scripts/system/controllers/controllerModules/teleport.js
|
2018-09-24 11:44:28 +12:00 |
|
SamGondelman
|
c522d1bc93
|
merge with master
|
2018-09-14 00:57:13 -07:00 |
|
Wayne Chen
|
20cab87a17
|
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
|
2018-09-11 18:53:06 -07:00 |
|
Wayne Chen
|
30e9d57026
|
adding pattern for during timeout to put into error state
|
2018-09-11 18:52:28 -07:00 |
|
Wayne Chen
|
a7321f950a
|
pushing requested changes - adding timeout refusal
|
2018-09-11 18:32:17 -07:00 |
|
Wayne Chen
|
84f95dd4b8
|
updating typo
|
2018-09-11 17:03:06 -07:00 |
|
Wayne Chen
|
d4dfaec8ea
|
updating typo
|
2018-09-11 17:02:38 -07:00 |
|
Wayne Chen
|
d478fcf027
|
remove unused signal from domain handler
|
2018-09-11 17:01:14 -07:00 |
|
Wayne Chen
|
0f25756908
|
expose domain connection error to Window
|
2018-09-11 16:29:39 -07:00 |
|
SamGondelman
|
589e88af4a
|
Merge remote-tracking branch 'upstream/master' into scriptvec3
|
2018-09-04 17:54:45 -07:00 |
|
SamGondelman
|
9b75c7e07f
|
trying to separate colors and vectors
|
2018-09-04 17:20:05 -07:00 |
|
David Rowe
|
c41d74621e
|
Merge branch 'master' into M17217-b
# Conflicts:
# interface/src/raypick/PathPointer.cpp
|
2018-08-31 14:26:24 +12:00 |
|
Dante Ruiz
|
03ede9371e
|
cleaning code
|
2018-08-30 14:26:39 -07:00 |
|
Dante Ruiz
|
8c77820e30
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-30 09:45:41 -07:00 |
|
danteruiz
|
e2cd695dfb
|
PR code clean up
|
2018-08-27 11:01:29 -07:00 |
|
luiscuenca
|
ddbadf5a69
|
change to Test API
|
2018-08-24 11:59:46 -07:00 |
|
SamGondelman
|
283c0c0311
|
s i m p l i f y
|
2018-08-23 11:47:56 -07:00 |
|
Dante Ruiz
|
26a30edec9
|
trying to fix loading bar
|
2018-08-21 18:27:21 -07:00 |
|
Dante Ruiz
|
db3d3d3d93
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-21 09:56:59 -07:00 |
|
Sam Gondelman
|
f0986a7f5a
|
Merge branch 'master' into scriptvec3
|
2018-08-20 10:56:45 -07:00 |
|
David Rowe
|
7e46a99400
|
Merge branch 'master' into M17217-b
|
2018-08-17 10:35:52 +12:00 |
|
John Conklin II
|
1edf1b4337
|
Merge pull request #13555 from SamGondelman/destroy
Trying to fix dependency shutdown
|
2018-08-16 13:14:58 -07:00 |
|
David Rowe
|
a08bcd325d
|
Merge branch 'master' into M17217-b
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
|
2018-08-10 11:25:39 +12:00 |
|
Dante Ruiz
|
faa5411757
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-09 08:42:14 -07:00 |
|
David Rowe
|
96767c1103
|
Merge branch 'master' into M17217-b
# Conflicts:
# plugins/openvr/src/OpenVrDisplayPlugin.cpp
|
2018-08-08 10:43:58 +12:00 |
|
Dante Ruiz
|
d78c571df6
|
revert to use overlays instead of entities for tablet highlighting
|
2018-08-07 10:56:53 -07:00 |
|
Dante Ruiz
|
6a4a56cee3
|
imporving the interstitial page script
|
2018-08-06 17:42:21 -07:00 |
|
Sam Gondelman
|
2edefe3209
|
Merge branch 'master' into destroy
|
2018-08-06 09:51:14 -07:00 |
|
Dante Ruiz
|
cca76f7022
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-06 08:02:03 -07:00 |
|
Sam Gondelman
|
7772e8adf2
|
Merge branch 'master' into scriptvec3
|
2018-08-03 14:57:49 -07:00 |
|
David Rowe
|
11b85e30db
|
Merge branch 'master' into M17217-a
|
2018-08-04 09:44:39 +12:00 |
|
Dante Ruiz
|
2377626203
|
exposing physics progress
|
2018-08-03 10:47:58 -07:00 |
|
David Rowe
|
32e3bb0e1d
|
Merge branch 'master' into M08513-a
# Conflicts:
# libraries/audio/src/SoundCache.h
|
2018-08-03 10:29:32 +12:00 |
|
SamGondelman
|
8a9c27ed92
|
Merge remote-tracking branch 'upstream/master' into destroy
|
2018-08-01 16:07:48 -07:00 |
|
John Conklin II
|
fcf32dbc6b
|
Merge pull request #13642 from ctrlaltdavid/M13352
Fix HMD.mountedChanged() API signal
|
2018-08-01 11:28:11 -07:00 |
|
David Rowe
|
41c4ecd465
|
Add HMD play area to API; Oculus and Vive
|
2018-08-01 15:20:51 +12:00 |
|
SamGondelman
|
2ca217eb4a
|
merge with master
|
2018-07-30 17:43:15 -07:00 |
|
Sam Gondelman
|
8201997a16
|
Merge pull request #13660 from SamGondelman/parabolic
Parabolic Picking + Pointers
|
2018-07-30 10:49:02 -07:00 |
|
Dante Ruiz
|
8da1db31df
|
fix audio page being in desktop when your in HMD
|
2018-07-25 08:44:11 -07:00 |
|
SamGondelman
|
956c1511b6
|
Merge remote-tracking branch 'upstream/master' into parabolic
|
2018-07-19 15:23:25 -07:00 |
|
David Rowe
|
5e624246a8
|
Fix HMD.mountedChanged() API signal
|
2018-07-19 13:00:57 +12:00 |
|
David Rowe
|
396382afd7
|
Fill in Audio API JSDoc
|
2018-07-19 09:31:48 +12:00 |
|
SamGondelman
|
845ddda695
|
parabola-overlay and -avatar intersection, handle case where acceleration == 0
|
2018-07-17 12:41:03 -07:00 |
|
David Rowe
|
806228299e
|
Stub out Audio JSDoc
|
2018-07-15 10:31:48 +12:00 |
|
David Rowe
|
46c9853152
|
Remove deprecated Window.raiseMainWindow API function
|
2018-07-12 14:04:08 +12:00 |
|
SamGondelman
|
16ad9cb5d3
|
xcolor/rgbcolor conversion
|
2018-07-11 18:06:06 -07:00 |
|
John Conklin II
|
6e13b0e141
|
Merge pull request #13453 from gcalero/web_overlay_android
Support web3d overlays in android
|
2018-07-06 13:02:56 -07:00 |
|
SamGondelman
|
7954865141
|
trying to fix dependency shutdown
|
2018-07-05 14:34:37 -07:00 |
|
Thijs Wenker
|
3a32472b0b
|
added test / more docs
|
2018-07-04 02:49:20 +02:00 |
|
Thijs Wenker
|
d886bc2d9c
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window
|
2018-07-03 18:19:48 +02:00 |
|
Thijs Wenker
|
7390983721
|
introduce scriptable presentationMode instead of automatic mode switching windows
|
2018-07-03 16:49:49 +02:00 |
|
Gabriel Calero
|
a6d093d8c9
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-29 15:09:32 -03:00 |
|
Thijs Wenker
|
5029767493
|
InteractiveWindow scripting API
|
2018-06-28 19:04:08 +02:00 |
|
Anthony J. Thibault
|
70a3c9ce3c
|
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
Using gflags on windows and enabling full page heap verification, I was able to detect this as a source of
memory corruption.
https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
Running interface with pageheap before and after, this change leads me to believe that this is a source of
some of our heap-corruption crashes on backtrace.
Specifically these 19 crashes in the last month, and possibly more.
https://highfidelity.sp.backtrace.io/dashboard/highfidelity/project/Interface/query-builder?qb=%7B%22mode%22%3A%22aggregate%22%2C%22sorting%22%3A%7B%22aggFactor%22%3A%22count%22%2C%22aggSortOrder%22%3A%22descending%22%2C%22selectFactor%22%3A%22timestamp%22%2C%22selectSortOrder%22%3A%22descending%22%2C%22sortedColumnNames%22%3A%5B%5D%7D%2C%22dateTimePicker%22%3A%7B%22granularity%22%3A%221M%22%2C%22start%22%3A%222018-05-27T07%3A00%3A00.000Z%22%2C%22end%22%3A%222018-06-27T23%3A05%3A29.399Z%22%7D%7D&qn=&query=%7B%22filter%22%3A%5B%7B%22callstack%22%3A%5B%5B%22contains%22%2C%22saveAll%22%5D%5D%2C%22timestamp%22%3A%5B%5B%22at-least%22%2C1527404400%5D%2C%5B%22at-most%22%2C1530140729%5D%5D%7D%5D%2C%22fold%22%3A%7B%22timestamp%22%3A%5B%5B%22range%22%5D%2C%5B%22bin%22%2C32%2C1527404400%2C1530140729%5D%5D%7D%2C%22group%22%3A%5B%22classifiers%22%5D%2C%22select%22%3A%5B%22timestamp%22%2C%22fingerprint%22%2C%22_deleted%22%2C%22callstack%22%2C%22object%22%5D%7D
|
2018-06-27 16:06:23 -07:00 |
|
Gabriel Calero
|
fedc0a9e61
|
Support web3d overlays in android
|
2018-06-25 16:37:03 -03:00 |
|
Zach Fox
|
e83b76781b
|
Be a bit more specific in the docs
|
2018-06-18 11:47:26 -07:00 |
|
Zach Fox
|
614b512411
|
Add docs
|
2018-06-18 11:43:31 -07:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Dante Ruiz
|
59c50b7f26
|
remove highlight overlay in favor of materialEntity
|
2018-06-06 08:38:58 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
Zach Fox
|
7f344c33a7
|
Docs update
|
2018-06-01 13:51:18 -07:00 |
|
Zach Fox
|
96858c9586
|
MS15529: Add secondary camera snapshot notification flag
|
2018-06-01 13:38:41 -07:00 |
|
David Rowe
|
08cb5c7191
|
Fix JSDoc example typo
|
2018-05-30 10:25:16 +12:00 |
|
NissimHadar
|
5fb7ec7b72
|
Updated jsdoc
|
2018-05-29 11:50:23 -07:00 |
|
NissimHadar
|
855084b6d5
|
Updated jsdoc.
|
2018-05-29 11:29:59 -07:00 |
|
NissimHadar
|
0af1599b53
|
Added jsdoc to TestScriptingInterface.
|
2018-05-29 09:45:03 -07:00 |
|
David Rowe
|
a9c4eab099
|
Fix up JSDoc for Window.takeSnapshot() and related
|
2018-05-28 12:46:51 +12:00 |
|
NissimHadar
|
54b64c59d7
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-25 08:29:09 -07:00 |
|
NissimHadar
|
77d6ea6bec
|
Added hide/show for task bar (Windows only).
|
2018-05-24 16:48:03 -07:00 |
|
milad
|
1a4fa92a29
|
Merge commit 'refs/pull/13206/head' of https://github.com/highfidelity/hifi into gravprep-redo
|
2018-05-22 14:33:53 -07:00 |
|
David Rowe
|
fa54461788
|
Update some recent JSDoc additions
|
2018-05-22 08:52:39 +12:00 |
|
David Rowe
|
6d4f704279
|
Regularize some JSDoc usage
|
2018-05-21 09:32:10 +12:00 |
|
milad
|
46efb2b868
|
merging onto mac
|
2018-05-19 22:44:18 -07:00 |
|
Liv
|
40ff3f966f
|
Merge pull request #13165 from ctrlaltdavid/21872-b
JSDoc stubs for various APIs
|
2018-05-18 09:11:55 -07:00 |
|
Sam Gondelman
|
74840d2130
|
Merge pull request #12935 from gcalero/android_new_login
Android new login
|
2018-05-17 15:53:25 -07:00 |
|
David Rowe
|
d20cd6ad44
|
Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot()
|
2018-05-17 20:25:25 +12:00 |
|
David Rowe
|
6db4dd8673
|
Merge branch 'master' into 21872-b
# Conflicts:
# interface/src/ui/Snapshot.h
|
2018-05-17 20:11:14 +12:00 |
|
Gabriel Calero
|
5afc9c6df3
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-05-16 12:45:17 -03:00 |
|
David Rowe
|
f571e90ef5
|
Merge branch 'master' into 21872-b
|
2018-05-16 10:20:53 +12:00 |
|