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 |
|
Zach Fox
|
bccaa2dbe5
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-15 11:50:38 -07:00 |
|
NissimHadar
|
d4d2f3c957
|
Moved ownership of test location into the Test Scripting class.
|
2018-05-14 16:32:04 -07:00 |
|
David Rowe
|
d0596f8205
|
Fix Wallet JSDoc stubs
|
2018-05-14 10:43:55 +12:00 |
|
David Rowe
|
176dbb5557
|
Wallet API JSDoc stubs
|
2018-05-13 11:02:09 +12:00 |
|
David Rowe
|
fb175d7110
|
AudioEffectOptions API JSDoc stubs
|
2018-05-11 20:36:10 +12:00 |
|
NissimHadar
|
1364f4391d
|
Can store JSON object.
|
2018-05-10 18:02:44 -07:00 |
|
Zach Fox
|
44cfa95830
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-09 15:01:24 -07:00 |
|
Gabriel Calero
|
9b63b76b68
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-05-07 16:06:02 -03:00 |
|
Clement
|
da9fb9c751
|
Fix non self-sufficient headers
|
2018-05-04 16:26:41 -07:00 |
|
Gabriel Calero
|
1330132a32
|
Merge remote-tracking branch 'upstream/master' into android_new_login
|
2018-05-04 18:35:51 -03:00 |
|
Gabriel Calero
|
868b58e66d
|
Un-expose Application from javascript. Restore displayplugin deactivation when goes to background
|
2018-05-04 18:01:01 -03:00 |
|
Zach Fox
|
1da840984b
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-04 10:24:28 -07:00 |
|
milad nazeri
|
b32039f895
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gravprep-redo
|
2018-05-03 23:08:06 -07:00 |
|
Zach Fox
|
c3d3cdca3d
|
Add cubemap output format
|
2018-05-03 12:57:00 -07:00 |
|
David Rowe
|
e95c38d939
|
Merge branch 'master' into 21856-g
# Conflicts:
# libraries/model-networking/src/model-networking/TextureCache.h
|
2018-05-03 21:03:14 +12:00 |
|
Zach Fox
|
ecae3ceb9d
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-05-02 10:05:15 -07:00 |
|
David Rowe
|
3febdcb141
|
Miscellaneous JSDoc tidying
|
2018-05-02 16:15:35 +12:00 |
|
Zach Fox
|
249e2a2bac
|
Tons of stability and clarity improvements
|
2018-05-01 13:00:04 -07:00 |
|
David Rowe
|
1aa28b7f54
|
Merge remote-tracking branch 'upstream/master' into 21856-d
# Conflicts:
# interface/src/LODManager.h
|
2018-05-02 07:50:55 +12:00 |
|
milad nazeri
|
aeb78e69f6
|
Merge commit 'refs/pull/13061/head' of https://github.com/highfidelity/hifi into gravprep-redo
|
2018-05-01 06:12:00 -07:00 |
|
David Rowe
|
65f5915372
|
Add JSDoc for startFarTrigger etc. calls on entity scripts
|
2018-05-01 21:55:27 +12:00 |
|
milad nazeri
|
8845094afb
|
Added Lod fix
|
2018-04-30 16:55:42 -07:00 |
|
Zach Fox
|
aafcf056c4
|
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
|
2018-04-30 12:36:00 -07:00 |
|
Zach Fox
|
a2b84c0fbb
|
It's working!!
|
2018-04-30 12:11:46 -07:00 |
|
David Rowe
|
2cc3ed6287
|
List which contexts each namespace and object is available in
|
2018-04-28 20:00:28 +12:00 |
|
Zach Fox
|
1b29946a48
|
I feel so close; why isn't this variable capturing?
|
2018-04-27 17:26:05 -07:00 |
|
John Conklin II
|
dd32ca33a5
|
Merge pull request #12957 from sethalves/quiet-logging
Quiet logging
|
2018-04-27 14:59:38 -07:00 |
|
David Rowe
|
b8063840e7
|
Miscellaneous fixes
|
2018-04-26 21:17:05 +12:00 |
|
David Rowe
|
08dc9b133f
|
Docs to JSDoc review
|
2018-04-26 21:10:28 +12:00 |
|
MiladNazeri
|
0f87e53902
|
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
Docs/docs to js docs update
|
2018-04-25 12:26:19 -07:00 |
|
John Conklin II
|
f04200a620
|
Merge pull request #12976 from ctrlaltdavid/21856
Docs to JSDoc
|
2018-04-25 11:36:34 -07:00 |
|
milad nazeri
|
23d07fa292
|
fixed spacing issue
|
2018-04-24 13:14:55 -07:00 |
|
milad nazeri
|
1121fe8da0
|
fix tabs
|
2018-04-23 21:47:53 -07:00 |
|
SamGondelman
|
1deb38f06d
|
fix copy error
|
2018-04-23 12:05:30 -07:00 |
|
milad nazeri
|
4ac06fe99f
|
Updating previous jsdocs
|
2018-04-22 22:22:33 -07:00 |
|
David Rowe
|
497cb4dab6
|
Interim JSDoc for Selection
|
2018-04-23 13:53:35 +12:00 |
|
milad nazeri
|
e9b9c05b5d
|
removed cruft
|
2018-04-22 08:51:47 -07:00 |
|
David Rowe
|
748052614f
|
Doc review
|
2018-04-21 12:45:00 +12:00 |
|
Seth Alves
|
bec39369f7
|
remove some uncatagorized logging, suppress some categories by default
|
2018-04-20 16:08:57 -07:00 |
|
David Rowe
|
7087abd201
|
Merge branch 'master' into 21815
|
2018-04-21 10:49:56 +12:00 |
|
Seth Alves
|
c20346ca53
|
Merge pull request #12937 from SamGondelman/startup
Make Audio.cpp threadsafe
|
2018-04-20 11:36:08 -07:00 |
|
Seth Alves
|
512b1911eb
|
Merge pull request #12858 from ctrlaltdavid/21836
Update location.hostname JSDoc per serverless domains
|
2018-04-20 10:27:09 -07:00 |
|
SamGondelman
|
3b4b43cf66
|
try to fix audio crash on startup
|
2018-04-20 10:23:47 -07:00 |
|
Ken Cooke
|
a9c5edcb2f
|
Merge pull request #12942 from kencooke/audio-devices-crfix
Minor changes to meet coding standard
|
2018-04-20 08:20:32 -07:00 |
|
David Rowe
|
08defea755
|
Merge branch 'master' into 21836
|
2018-04-20 09:20:56 +12:00 |
|
milad
|
42471c539b
|
initial fixes from ctralt david's comments
|
2018-04-19 13:40:57 -07:00 |
|
Ken Cooke
|
764aa00069
|
Coding standard fixes
|
2018-04-19 07:33:14 -07:00 |
|
milad
|
364d193499
|
audio added
|
2018-04-18 21:04:57 -07:00 |
|
milad
|
3f129bda13
|
More done on audio
|
2018-04-18 20:04:41 -07:00 |
|
David Rowe
|
c1ede6ef58
|
Merge branch 'master' into 21815
# Conflicts:
# tools/jsdoc/plugins/hifi.js
|
2018-04-17 11:54:56 +12:00 |
|
David Rowe
|
9f83c606e9
|
Controller API JSDoc
|
2018-04-17 11:46:40 +12:00 |
|
John Conklin II
|
5705bac87f
|
Merge pull request #12723 from ctrlaltdavid/21801
HMD API JSDoc
|
2018-04-16 11:12:26 -07:00 |
|
Sam Gateau
|
77a27b2be7
|
Merge pull request #12835 from NissimHadar/speedUp1
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
|
2018-04-12 11:48:09 -07:00 |
|
David Rowe
|
c2f0f7ef5f
|
Doc review
|
2018-04-12 10:54:35 +12:00 |
|
David Rowe
|
7a9e3388fa
|
Merge branch 'master' into 21801
|
2018-04-12 09:48:51 +12:00 |
|
David Rowe
|
c836014d21
|
Fix JSDoc typo noticed in passing
|
2018-04-12 09:24:10 +12:00 |
|
John Conklin II
|
7a905ed420
|
Merge pull request #12777 from ctrlaltdavid/21813
Fix Window API position and size reporting
|
2018-04-11 13:48:21 -07:00 |
|
MiladNazeri
|
9f7a765ec3
|
Merge pull request #12729 from ctrlaltdavid/21814
Settings API JSDoc
|
2018-04-11 11:48:15 -07:00 |
|
Triplelexx
|
704499a76d
|
remove Limitless API
|
2018-04-09 18:22:48 +01:00 |
|
NissimHadar
|
7f70511d1a
|
Added a script command to clear caches.
|
2018-04-08 10:32:35 -07:00 |
|
Dante Ruiz
|
00713ab225
|
fix selection api
|
2018-04-06 14:00:50 -07:00 |
|
John Conklin II
|
2e37b4a312
|
Merge pull request #12747 from Zvork/fade
Update to Transitions debugging / editing script
|
2018-04-04 14:31:59 -07:00 |
|
David Rowe
|
095c1b837c
|
Update JSDoc
|
2018-04-04 09:48:33 +12:00 |
|
David Rowe
|
6868ca971f
|
Make Window.x and Window.y report top left of drawable area of window
|
2018-04-04 09:43:39 +12:00 |
|
David Rowe
|
a3c8b2792d
|
Fix Window.geometryChanged() values for moving and resizing window
|
2018-04-04 09:42:05 +12:00 |
|
David Rowe
|
63603ff97c
|
Fix window height reported by Window.geometryChanged() signal
|
2018-04-03 14:21:15 +12:00 |
|
John Conklin II
|
9dcef996c5
|
Merge pull request #12684 from vladest/assetserver_wrong_dialog
Fix invalid message if cancel adding asset to AssetServer
|
2018-04-02 15:28:46 -07:00 |
|
Olivier Prat
|
5c26b4030b
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-30 14:38:42 -04:00 |
|
Ken Cooke
|
ff6c9f3127
|
Merge pull request #12704 from ElderOrb/FB13057
Improve audio devices selection logic
|
2018-03-30 11:18:05 -07:00 |
|
Ken Cooke
|
a2be291363
|
Merge pull request #12715 from ctrlaltdavid/21677
Add Window.raise() as replacement for Window.raiseMainWindow()
|
2018-03-30 09:41:54 -07:00 |
|
Olivier Prat
|
3c8cd48dfb
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-29 07:21:01 -04:00 |
|
John Conklin II
|
586fb4829c
|
Merge pull request #12637 from druiz17/fix-asset-server-qml
Fix asset server qml sorting
|
2018-03-28 09:35:53 -07:00 |
|
Olivier Prat
|
7fa5e384b9
|
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
|
2018-03-28 11:21:07 -04:00 |
|
David Rowe
|
c3df741c62
|
Settings API JSDoc
|
2018-03-28 17:14:06 +13:00 |
|
David Rowe
|
f27e8868eb
|
Add HMD JSDoc
|
2018-03-28 12:25:12 +13:00 |
|
David Rowe
|
d1d58eceab
|
Add Window.raise() as replacement for Window.raiseMainWindow()
|
2018-03-27 13:04:50 +13:00 |
|
Alexander Ivash
|
06410ec342
|
temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged
|
2018-03-27 00:44:17 +03:00 |
|
Alexander Ivash
|
8e551f4dc0
|
re-select re-plugged device
|
2018-03-25 13:49:59 +03:00 |
|
Alexander Ivash
|
3c45f17d70
|
remove unused code
|
2018-03-25 13:44:16 +03:00 |
|
Alexander Ivash
|
f6bbdec902
|
remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged
note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop
|
2018-03-25 13:43:51 +03:00 |
|
John Conklin II
|
c61ed697df
|
Merge pull request #12552 from vladest/assetbrowser_cosmetics
Wrap text in query dialogs. Add right margins for input field and but…
|
2018-03-22 17:56:47 -07:00 |
|
Seth Alves
|
4033af9b11
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-03-21 11:11:43 -07:00 |
|
Olivier Prat
|
143a315f1d
|
Fade edited objects are now selected with ray picking
|
2018-03-20 15:29:50 -07:00 |
|
vladest
|
faf8328d6a
|
Fix invalid message if cancel adding asset to AssetServer
|
2018-03-20 15:47:30 +01:00 |
|
Dante Ruiz
|
2fb1fbe027
|
fix sorting
|
2018-03-14 09:17:22 -07:00 |
|
David Rowe
|
966d711e56
|
Fix Window.raiseMainWindow()
|
2018-03-14 13:38:48 +13:00 |
|
David Rowe
|
025d2807f4
|
Fix Window.setFocus() JSDoc
|
2018-03-14 12:59:27 +13:00 |
|
David Rowe
|
16aefea2e1
|
Merge branch 'master' into 21776
|
2018-03-13 14:46:07 +13:00 |
|
Seth Alves
|
621e6a62d6
|
merge from upstream
|
2018-03-09 12:07:24 -08:00 |
|
Seth Alves
|
58bc42990c
|
merge from upstream
|
2018-03-09 12:03:26 -08:00 |
|
Brad Hefta-Gaub
|
5437ffb2c8
|
Merge pull request #12536 from ctrlaltdavid/21700
Remove deprecated Window.openFileChanged() signal from API
|
2018-03-09 08:47:57 -08:00 |
|
David Rowe
|
b1bda281ee
|
Merge branch 'master' into 21776
|
2018-03-08 15:36:10 +13:00 |
|
Cristian Luis Duarte
|
bde2ba9272
|
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
|
2018-03-06 22:02:23 -03:00 |
|
Brad Davis
|
8bfc610cfb
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-05 11:48:58 -08:00 |
|
vladest
|
126f05f8bd
|
Added space
|
2018-03-04 13:28:26 +01:00 |
|
vladest
|
2a9bbfa808
|
Wrap text in query dialogs. Add right margins for input field and buttons
|
2018-03-04 13:19:56 +01:00 |
|
Seth Alves
|
45157a16f2
|
merge from upstream
|
2018-03-02 09:57:27 -08:00 |
|
David Rowe
|
287ea8eff2
|
Fix Window.setFocus() unsetting focus if Interface has focus
|
2018-03-02 15:40:49 +13:00 |
|
David Rowe
|
b50044fb2b
|
Remove deprecated Window.openFileChanged() signal from API
|
2018-03-02 13:15:27 +13:00 |
|
Seth Alves
|
33065fb51c
|
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
|
2018-03-01 11:07:37 -08:00 |
|
Cristian Luis Duarte
|
9acb83632c
|
Android - Make joystick move up when showing the bottom bar
|
2018-02-28 18:52:13 -03:00 |
|
Cristian Luis Duarte
|
55d52f92df
|
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
|
2018-02-28 15:55:50 -03:00 |
|
Seth Alves
|
666fa77be2
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-26 13:53:20 -08:00 |
|
Brad Davis
|
b9387f2a21
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-26 13:18:14 -08:00 |
|
Brad Davis
|
3e552e5739
|
Fix warnings
|
2018-02-26 09:53:35 -08:00 |
|
NissimHadar
|
c0f20900a0
|
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
Corrected edge case of creating a snapshot with "" as the filename.
|
2018-02-26 09:39:16 -08:00 |
|
Brad Davis
|
0550138609
|
Merge remote-tracking branch 'upstream/master' into android_dev
|
2018-02-23 12:48:10 -08:00 |
|
Seth Alves
|
99893d81e2
|
merge from upstream
|
2018-02-23 09:14:48 -08:00 |
|
Brad Davis
|
aeb29db37d
|
Merge remote-tracking branch 'upstream/stable' into android_stable
|
2018-02-22 17:35:00 -08:00 |
|
Nissim Hadar
|
a843a53427
|
Improved JSDoc comments.
|
2018-02-22 10:17:20 -08:00 |
|
Zach Fox
|
90f05f4db7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-22 09:23:49 -08:00 |
|
Seth Alves
|
c83dcbc626
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-22 07:42:49 -08:00 |
|
Seth Alves
|
db195c6184
|
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items
Remove some deprecated JavaScript API items
|
2018-02-21 16:31:16 -08:00 |
|
Nissim Hadar
|
049beba157
|
Corrected edge case of creating a snapshot with "" as the filename.
|
2018-02-21 14:15:41 -08:00 |
|
Zach Fox
|
2daa30f125
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-20 12:41:12 -08:00 |
|
Seth Alves
|
afa059d331
|
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
|
2018-02-16 12:58:56 -08:00 |
|
Seth Alves
|
b2a4181bc0
|
working to integrate serverless domains into history, etc
|
2018-02-16 12:58:50 -08:00 |
|
MiladNazeri
|
331b253ba0
|
Merge pull request #12386 from cain-kilgore/21668
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
|
2018-02-16 06:57:03 -08:00 |
|
Zach Fox
|
ae8a8a48eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
|
2018-02-13 13:55:32 -08:00 |
|
Zach Fox
|
0809210dc3
|
No permission card
|
2018-02-13 11:16:48 -08:00 |
|
Sam Gateau
|
714e3f445d
|
Merge pull request #11537 from jherico/threaded_qml
Migrating QML rendering off the main thread
|
2018-02-12 15:32:33 -08:00 |
|
Cain Kilgore
|
d1ecc85fb3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 21668
|
2018-02-12 23:19:20 +00:00 |
|
Cain Kilgore
|
5048bf16cb
|
Fixed Async Prompts/Assets/Dialogs
|
2018-02-12 23:01:19 +00:00 |
|
David Rowe
|
033b85a3a8
|
Merge branch 'master' into remove-deprecated-items
# Conflicts:
# scripts/system/libraries/entitySelectionTool.js
|
2018-02-13 09:42:40 +13:00 |
|
NissimHadar
|
5579eac034
|
Nothing...
|
2018-02-06 16:42:25 -08:00 |
|
NissimHadar
|
d5bf9cdbcd
|
Updated JSDoc comments.
|
2018-02-06 16:16:25 -08:00 |
|
Brad Davis
|
7d5502eb92
|
Migrating QML rendering off the main thread
|
2018-02-06 11:53:09 -08:00 |
|
NissimHadar
|
faec9a62b6
|
Changed "" to QString()
|
2018-02-06 11:01:50 -08:00 |
|
NissimHadar
|
cf87052b7f
|
Added option to select snapshot filename in scripts.
|
2018-02-05 17:29:00 -08:00 |
|
David Rowe
|
615e54620b
|
Remove Menu.isInfoViewVisible() and closeInfoView() from JavaScript API
|
2018-02-04 15:38:33 +13:00 |
|
David Rowe
|
efddec621f
|
Remove Menu.addActionGroup() and removeActionGroup() from JavaScript API
|
2018-02-04 15:16:20 +13:00 |
|
David Rowe
|
d842e532ee
|
Remove Window.customPrompt() from JavaScript API
|
2018-02-04 14:02:30 +13:00 |
|
David Rowe
|
3af7701cac
|
Fix the spectator camera
|
2018-02-04 12:06:20 +13:00 |
|
Liv
|
6363ded74b
|
Merge pull request #12280 from misslivirose/feat/expose-identity-verification
Expose functionality to enable entity scripts to check ownership verification on avatar entities
|
2018-02-01 10:07:58 -08:00 |
|
Seth Alves
|
50e6864988
|
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
|
2018-01-31 11:19:49 -08:00 |
|
Liv Erickson
|
8b7c989508
|
move emit signals to wallet interface
|
2018-01-29 16:34:44 -08:00 |
|
Liv Erickson
|
f8f76d6757
|
changing back to avatar only and making some changes to avoid multiple calls to dependency manager
|
2018-01-29 12:46:00 -08:00 |
|
MiladNazeri
|
9baf02b7a1
|
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
Leopoly_Phase1_003_Asset-Request
|
2018-01-29 11:40:41 -08:00 |
|
Liv Erickson
|
6a971e1362
|
remove restriction to be avatar only
|
2018-01-29 11:27:30 -08:00 |
|
Liv Erickson
|
0e3a01f1e8
|
it's working! removed my null pointer and just get it from the dependency manager when required
|
2018-01-29 10:20:16 -08:00 |
|
Liv Erickson
|
20635acf27
|
moving logic to wallet, crashes currently
|
2018-01-26 17:13:39 -08:00 |
|
Brad Davis
|
3e7872637d
|
Merge branch 'android' into android_new
|
2018-01-19 14:40:01 -08:00 |
|
Brad Davis
|
d53b8b38ac
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-19 14:35:20 -08:00 |
|
Ryan Downe Karpf
|
f1b18ccc00
|
Merge pull request #12184 from ctrlaltdavid/21700
Add Window browseChanged signal as replacement for openFileChanged
|
2018-01-19 10:45:27 -08:00 |
|
Brad Davis
|
3dba928b72
|
Merge remote-tracking branch 'upstream/android' into android_new
|
2018-01-19 10:36:46 -08:00 |
|
humbletim
|
dfb1619dc6
|
CR feedback; using namespace AssetUtils => inline AssetUtils::
|
2018-01-18 21:49:53 -05:00 |
|
Brad Davis
|
bdfa1273ba
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-18 17:33:10 -08:00 |
|
Clément Brisset
|
37504eca15
|
Merge pull request #12186 from ctrlaltdavid/21702
Add Window.protocolSignature() as a replacement for location.protocolVersion()
|
2018-01-18 15:20:03 -08:00 |
|
David Rowe
|
8c2427dd58
|
Rename Window.protocolVersion() to Window.protocolSignature()
|
2018-01-19 09:06:16 +13:00 |
|
Brad Davis
|
d3c4b0ef45
|
Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new
|
2018-01-18 10:04:03 -08:00 |
|
Brad Davis
|
cbb2d9d854
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-17 17:51:39 -08:00 |
|
Seth Alves
|
7af90d5429
|
Merge pull request #12171 from mnafees/21671
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
|
2018-01-17 13:42:47 -08:00 |
|
Bradley Austin Davis
|
9f6c2c3cdd
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-17 11:44:00 -08:00 |
|
David Back
|
92c0fd4877
|
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
Merge Account & GlobalServices follow-up
|
2018-01-17 10:50:54 -08:00 |
|
Gabriel Calero
|
970ca5e08f
|
Add virtual pad for android
|
2018-01-17 15:00:43 -03:00 |
|
Brad Davis
|
6a06bf405a
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-16 18:24:44 -08:00 |
|
David Rowe
|
2883e24285
|
Add Window.protocolVersion() as a replacement for location's
|
2018-01-17 12:00:35 +13:00 |
|
David Rowe
|
85bda1da8e
|
Add Window browseChanged signal as replacement for openFileChanged
|
2018-01-17 09:57:20 +13:00 |
|
Mohammed Nafees
|
885801c5ca
|
Fix copying to clipboard from JS scripts
|
2018-01-16 13:17:47 -05:00 |
|
Brad Davis
|
58530c595a
|
Pre-merge cleanup
|
2018-01-14 19:48:12 -08:00 |
|
David Rowe
|
a543d90090
|
Miscellaneous fixes
|
2018-01-11 15:53:45 +13:00 |
|
David Rowe
|
7ba42f0e76
|
Update JSDoc per recent changes in Window API
|
2018-01-11 15:52:56 +13:00 |
|
Brad Davis
|
560fd38547
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-10 17:31:50 -08:00 |
|
MiladNazeri
|
301731554f
|
Merge pull request #12102 from cain-kilgore/21664
WL 21664 - Window.innerHeight should not include the menu bar
|
2018-01-10 17:10:14 -08:00 |
|
Triplelexx
|
24f1fc3546
|
fix Ui keyboard navigation
various fixes to allow some support for keyboard navigation in message boxes and dialogs
|
2018-01-10 22:30:43 +00:00 |
|
Brad Davis
|
2c35242af1
|
Merge remote-tracking branch 'upstream/master' into android_nov
|
2018-01-10 13:40:12 -08:00 |
|
MiladNazeri
|
b73106fa7e
|
Merge pull request #12120 from cain-kilgore/21666
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
|
2018-01-10 12:30:21 -08:00 |
|
Cain Kilgore
|
b26e31a362
|
Copy paste? Never!
|
2018-01-10 20:27:19 +00:00 |
|
Brad Davis
|
d6dd29b952
|
Merge remote-tracking branch 'upstream/master' into android_nov
|
2018-01-09 11:43:03 -08:00 |
|
Brad Davis
|
bd5af2b493
|
Working on android avatar rendering
|
2018-01-09 11:40:32 -08:00 |
|
Cain Kilgore
|
0e3913baff
|
Removed Window.menuHeight
|
2018-01-09 09:07:26 +00:00 |
|
Cain Kilgore
|
773461bd30
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 21666
|
2018-01-09 08:33:44 +00:00 |
|
Cain Kilgore
|
46de7ed83b
|
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
|
2018-01-09 08:32:59 +00:00 |
|
David Back
|
43cd5586f3
|
nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface
|
2018-01-08 17:25:58 -08:00 |
|
David Rowe
|
8016ae1bf3
|
Fix typo
|
2018-01-09 12:47:12 +13:00 |
|
Gabriel Calero
|
7fbd23f36b
|
Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr
|
2018-01-08 17:38:28 -03:00 |
|
Gabriel Calero
|
6050737e7c
|
Resolving comments in PR
|
2018-01-08 17:36:08 -03:00 |
|
MiladNazeri
|
56d4429a8b
|
Merge pull request #12020 from ctrlaltdavid/21646
Window JSDoc
|
2018-01-08 11:53:34 -08:00 |
|
David Rowe
|
7a971b2d26
|
Fix typo
|
2018-01-09 08:17:15 +13:00 |
|
Bradley Austin Davis
|
68cd768a65
|
Merge branch 'android' into android_render_pr
|
2018-01-08 12:49:52 -05:00 |
|
Cain Kilgore
|
47038e4349
|
WL 21664 - Window.innerHeight should not include the menu bar
|
2018-01-07 08:31:36 +00:00 |
|
David Rowe
|
673bc7de38
|
Update Window JSDoc
|
2018-01-06 16:05:55 +13:00 |
|
Brad Hefta-Gaub
|
aebd098e6e
|
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
WL#21654: Make the Asset Browser Sort Case Insensitive
|
2018-01-05 13:34:39 -08:00 |
|
David Rowe
|
5463f1ae6b
|
Merge branch 'master' into 21646
|
2018-01-05 16:58:58 +13:00 |
|
Lexx
|
85b54f82d8
|
revert sorting change mistake
|
2018-01-05 01:58:23 +00:00 |
|
David Back
|
6c8987d75f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
|
2018-01-03 14:44:52 -08:00 |
|
Gabriel Calero
|
76b38bebad
|
Make Interface run in Android
|
2018-01-03 16:36:11 -03:00 |
|
Triplelexx
|
78a0175413
|
fix assetbrowser sorting case sensitivity
|
2017-12-29 23:16:12 +00:00 |
|
Elisa Lupin-Jimenez
|
84933131c4
|
changed api key variable name
|
2017-12-27 12:49:16 -08:00 |
|
Elisa Lupin-Jimenez
|
a428eb5b75
|
added const to several parameters
|
2017-12-27 12:47:04 -08:00 |
|
Elisa Lupin-Jimenez
|
01c1032540
|
fixed constant names, added another URL check
|
2017-12-27 10:51:58 -08:00 |
|
Elisa Lupin-Jimenez
|
03f06aadf4
|
keyword filters case insensitive now
|
2017-12-26 11:08:10 -08:00 |
|
Elisa Lupin-Jimenez
|
e1b344e36d
|
handles empty json object return
|
2017-12-26 10:50:10 -08:00 |
|
unknown
|
be736373f2
|
fix if else convention
|
2017-12-20 17:52:27 -08:00 |
|
unknown
|
dbbc87d72e
|
merge
|
2017-12-20 17:40:11 -08:00 |
|
Elisa Lupin-Jimenez
|
7de2918b9b
|
added newline to header
|
2017-12-20 12:44:47 -08:00 |
|
Elisa Lupin-Jimenez
|
ca062f9232
|
changed qtglobal include
|
2017-12-19 15:41:42 -08:00 |
|
Elisa Lupin-Jimenez
|
14935e5924
|
added const to valid inputs
|
2017-12-19 15:11:24 -08:00 |
|
Elisa Lupin-Jimenez
|
1b6c85edb0
|
cleaned up code
|
2017-12-19 13:22:31 -08:00 |
|
David Rowe
|
e6c40f4aae
|
Window JSDoc
|
2017-12-20 10:16:09 +13:00 |
|
Elisa Lupin-Jimenez
|
34d8fe307d
|
fixed getAssetList()
|
2017-12-19 11:25:15 -08:00 |
|
Elisa Lupin-Jimenez
|
8a9e5bc39d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
|
2017-12-19 10:41:39 -08:00 |
|
Elisa Lupin-Jimenez
|
1ee8445f43
|
added gltf import feature, getAssetList() not working
|
2017-12-18 17:47:21 -08:00 |
|
Elisa Lupin-Jimenez
|
e7fad05867
|
enabled fbx, obj, and blocks model url retrieval
|
2017-12-18 14:20:51 -08:00 |
|
Andrew Meadows
|
cfd2097f36
|
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
Cleanup names of debug stats and trace contexts.
|
2017-12-18 10:02:42 -08:00 |
|
Elisa Lupin-Jimenez
|
264f362994
|
resolved merge conflict again
|
2017-12-13 17:54:30 -08:00 |
|
Elisa Lupin-Jimenez
|
e49181c3a2
|
added getAssetList() and getFBX()
|
2017-12-13 17:45:57 -08:00 |
|
Elisa Lupin-Jimenez
|
f7be67b5b2
|
removed key
|
2017-12-13 16:19:36 -08:00 |
|
Elisa Lupin-Jimenez
|
392f290dd6
|
can fetch poly asset list synchronously
|
2017-12-13 16:19:36 -08:00 |
|
Elisa Lupin-Jimenez
|
dc999401d5
|
Created poly scripting interface template
|
2017-12-13 16:19:36 -08:00 |
|
Zach Fox
|
f0507e1608
|
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1
Set Wallet Status to 'Ready' after correctly authenticating wallet
|
2017-12-13 13:19:54 -08:00 |
|
Zach Fox
|
efd5c0ccb7
|
Add comment as per CR
|
2017-12-13 11:53:26 -08:00 |
|
Andrew Meadows
|
87fa919ac8
|
save files to Documents by default
|
2017-12-12 14:11:25 -08:00 |
|
Zach Fox
|
623e6395be
|
Set Wallet Status to 'Ready' after correctly authenticating wallet
|
2017-12-12 13:01:14 -08:00 |
|
MiladNazeri
|
16e16501cd
|
Merge pull request #11791 from ctrlaltdavid/21602
JSDoc updates
|
2017-12-12 12:18:02 -08:00 |
|
Andrew Meadows
|
2538204b1e
|
expose physics simulation stats to Test JS API
|
2017-12-11 11:31:00 -08:00 |
|
Sam Gateau
|
0ff91e5926
|
Merge pull request #11952 from samcake/light
Exposing multi highlight and selection feature to js api
|
2017-12-12 01:09:15 +07:00 |
|
Sam Gateau
|
cc4b266647
|
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
|
2017-12-11 00:31:54 -08:00 |
|
Sam Gateau
|
bb888f2d4c
|
Replace the name opacity for alpha
|
2017-12-10 23:07:06 -08:00 |
|
Sam Gateau
|
eec4e966a7
|
Fix the linux build and correct the name of the property Intensity to Opacity
|
2017-12-10 10:13:49 -08:00 |
|
Zach Fox
|
6f5028080b
|
Remove useless Wallet.buy() scripting endpoint
|
2017-12-08 18:23:23 -08:00 |
|
samcake
|
9a4f667059
|
Merge branch 'master' of https://github.com/highfidelity/hifi into light
|
2017-12-08 08:50:33 -08:00 |
|
Seth Alves
|
91b2d8df8a
|
Merge pull request #11874 from luiscuenca/audioscope
Improve Audio Scope
|
2017-12-08 07:15:28 -08:00 |
|
samcake
|
7a9d77fed4
|
return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown
|
2017-12-07 17:53:30 -08:00 |
|
samcake
|
ace8e153c2
|
making sure the ID of an object in the Selection list is unique and more refined debugging
|
2017-12-07 17:45:40 -08:00 |
|
samcake
|
6148458aeb
|
Workable state, need final clean up and testing
|
2017-12-07 16:04:08 -08:00 |
|
samcake
|
5f85e8e2cb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into light
|
2017-12-07 08:48:12 -08:00 |
|
Sam Gateau
|
0245a7005d
|
Adding the query of a particular selection content
|
2017-12-06 22:44:58 -08:00 |
|
samcake
|
5500a6d11c
|
More to come
|
2017-12-06 18:02:30 -08:00 |
|
Elisa Lupin-Jimenez
|
1d5875c45b
|
removed key
|
2017-12-06 17:40:39 -08:00 |
|
Elisa Lupin-Jimenez
|
66b6be1302
|
fixed weird merge conflicts
|
2017-12-06 17:37:44 -08:00 |
|
Elisa Lupin-Jimenez
|
4ed689672e
|
can fetch poly asset list synchronously
|
2017-12-06 16:07:29 -08:00 |
|
unknown
|
5e1064800a
|
fix marketplace
|
2017-12-05 18:39:17 -08:00 |
|
samcake
|
1483195285
|
almost complete setup working, yeah
|
2017-12-05 18:27:53 -08:00 |
|
luiscuenca
|
8abe8b9879
|
move save logic to audioclient
|
2017-12-05 18:22:14 -08:00 |
|
luiscuenca
|
20d6615417
|
emit only when recording
|
2017-12-05 16:13:44 -08:00 |
|
Elisa Lupin-Jimenez
|
d6e1a9defe
|
Created poly scripting interface template
|
2017-12-05 09:43:01 -08:00 |
|
samcake
|
de410b6833
|
I need a color editor
|
2017-12-04 17:29:01 -08:00 |
|
Elisa Lupin-Jimenez
|
7bb44f4139
|
Created poly scripting interface template
|
2017-12-04 16:46:58 -08:00 |
|
David Back
|
3873a8f91e
|
Merge branch 'master' into mergeAccountGlobalServices
|
2017-12-04 14:46:59 -08:00 |
|
luiscuenca
|
4030688e7a
|
added record wav files
|
2017-12-03 11:54:37 -07:00 |
|
SamGondelman
|
c5ebb8a279
|
expose Window.getDeviceSize()
|
2017-11-28 16:16:30 -08:00 |
|
samcake
|
1514cdfb2f
|
extend the set of interface for multi highlight
|
2017-11-21 17:59:45 -08:00 |
|
samcake
|
aa163db4e6
|
Trying to make selection threadsafe
|
2017-11-20 17:21:15 -08:00 |
|
samcake
|
e0740b323d
|
keep debuging the seelction highlight
|
2017-11-17 18:11:18 -08:00 |
|
samcake
|
08dd76c9a8
|
changes of the day
|
2017-11-16 17:52:12 -08:00 |
|
Sam Gateau
|
3a0b2651d5
|
Keep spinning on the bridge between js interface and the highlighting feature
|
2017-11-16 00:55:51 -08:00 |
|
samcake
|
771c64fc97
|
Working on the selection highlight js interface
|
2017-11-15 18:21:07 -08:00 |
|
David Rowe
|
4f083a1b20
|
Further Menu API JSDoc improvements
|
2017-11-16 13:39:14 +13:00 |
|
David Rowe
|
bdb1bbe88d
|
Menu API JSDoc improvements
|
2017-11-16 13:34:50 +13:00 |
|
samcake
|
d4f93b9203
|
Adding style from VariantMap
|
2017-11-14 18:21:02 -08:00 |
|
Sam Gateau
|
fc53c26190
|
drafting the interface
|
2017-11-14 00:40:37 -08:00 |
|
samcake
|
fd46aa15ff
|
adding occluded/visisble to highlight outline
|
2017-11-13 17:23:21 -08:00 |
|
David Rowe
|
4a84116877
|
Merge branch 'master' into 21602
|
2017-11-14 08:27:13 +13:00 |
|
David Rowe
|
2119e01ac3
|
Tidying
|
2017-11-13 11:59:21 +13:00 |
|
David Rowe
|
9d9f684af5
|
Tidying
|
2017-11-12 11:44:51 +13:00 |
|
David Rowe
|
f5e155bf94
|
Expand Menu's JSDoc
|
2017-11-11 17:01:55 +13:00 |
|
David Rowe
|
c8734ccd63
|
Menu JSDoc improvements
|
2017-11-11 16:18:05 +13:00 |
|
David Rowe
|
a576cc04e1
|
Clipboard JSDoc improvements
|
2017-11-11 16:16:24 +13:00 |
|
David Rowe
|
c77a12f5fa
|
Update Clipboard and Menu JSDoc to use JavaScript type names
|
2017-11-11 07:55:57 +13:00 |
|
David Rowe
|
036ac8de6d
|
Update JSDoc for Menu JavaScript API
|
2017-11-10 21:55:42 +13:00 |
|
David Rowe
|
875b9846a0
|
Remove unused signal
|
2017-11-10 21:55:03 +13:00 |
|
David Rowe
|
7bbe5cdf70
|
Update JSDoc for Clipboard JavaScript API
|
2017-11-10 21:53:55 +13:00 |
|
Sam Gateau
|
e145e30049
|
Drafting the selection to highlight interface
|
2017-11-06 22:47:07 -08:00 |
|
Olivier Prat
|
e9743d4c95
|
Added jsdoc to SelectionScriptingInterface
|
2017-11-02 10:00:30 +01:00 |
|
Olivier Prat
|
f2444f9a30
|
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
|
2017-11-02 09:25:07 +01:00 |
|
Ryan Downe Karpf
|
28a99fe685
|
Merge pull request #11655 from dback2/tabletcontextualmode
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
|
2017-10-30 08:56:26 -07:00 |
|
David Back
|
c8a0f9761a
|
fix reference return for getUsername
|
2017-10-24 16:13:22 -07:00 |
|
David Back
|
08a6eb4dd3
|
reset tablet contextual mode back to false when toggling tablet show/hide
|
2017-10-24 15:50:09 -07:00 |
|
Zach Fox
|
48c8d52c09
|
Cleanup
|
2017-10-24 13:30:27 -07:00 |
|
David Back
|
f6f49fc2e5
|
account to global services merge tweaks
|
2017-10-24 13:26:28 -07:00 |
|
David Back
|
b60bf4f8cb
|
remove unused AccountScriptingInterface functions and merge/wrap the rest into GlobalServicesScriptingInterface
|
2017-10-24 10:17:36 -07:00 |
|
David Back
|
b5f1793863
|
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
|
2017-10-23 14:21:18 -07:00 |
|
Olivier Prat
|
732fe3b8db
|
Improved outline debugging script for easier test plan
|
2017-10-20 11:32:43 +02: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 |
|
SamGondelman
|
403b18977b
|
remove unused HFMetaEvents
|
2017-10-11 14:37:23 -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
|
b105248dd7
|
Merge pull request #11555 from zfox23/commerce_daveIntegration2
2017-10-09 Commerce Frontend Updates
|
2017-10-10 12:34:30 -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 |
|
Ryan Huffman
|
9c120f1194
|
Update AssetMappingsScriptingInterface to not open file for activity event
|
2017-10-10 09:44:13 -07:00 |
|
Zach Fox
|
733df8391f
|
Round 2
|
2017-10-09 12:27:56 -07:00 |
|
SamGondelman
|
fa838e4715
|
merge from master
|
2017-10-03 15:53:33 -07:00 |
|
Zach Fox
|
ea3da6c9dd
|
Merge pull request #11495 from zfox23/pop_interfaceChanges2
Commerce: One step closer!
|
2017-10-03 11:56:00 -07:00 |
|
Sam Gateau
|
ab8757eeb2
|
Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit
Tweak debug stats for more clarity
|
2017-10-03 11:23:16 -07:00 |
|
Zach Fox
|
11d0062104
|
Progress on buy endpoint
|
2017-10-02 16:57:41 -07:00 |
|
druiz17
|
68780f56b7
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
|
2017-10-02 14:06:26 -07:00 |
|
Andrew Meadows
|
8d2153d2f3
|
cleanup debug stats, use more correct names
|
2017-10-02 13:08:17 -07:00 |
|
Zach Fox
|
15c0a21e0e
|
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
|
2017-10-02 12:19:24 -07:00 |
|
Andrew Meadows
|
0fc6bf1e89
|
Merge pull request #11471 from Atlante45/feat/auto-bake
Asset Browser tweaks
|
2017-10-02 11:29:36 -07:00 |
|
druiz17
|
20918641f4
|
saving work
|
2017-09-29 16:48:25 -07:00 |
|
Zach Fox
|
63396a2fc3
|
WalletScriptingInterface; wallet status refactor
|
2017-09-29 13:42:04 -07:00 |
|
SamGondelman
|
b59ec07171
|
move hud rendering to render thread, still need to separate out hud overlays
|
2017-09-29 09:49:08 -07:00 |
|
Ryan Huffman
|
ff019d6195
|
Fix extension detection when tracking asset uploads
|
2017-09-28 13:56:49 -07:00 |
|
Ryan Huffman
|
97bf093cab
|
Fix ambiguous conversion in AssetMappingScriptingInterface
|
2017-09-28 08:16:54 -07:00 |
|
Atlante45
|
eb06c33187
|
Naming coding standard fix
|
2017-09-27 15:32:53 -07:00 |
|
Ryan Huffman
|
88810d28c1
|
Add activity logging for uploading_asset
|
2017-09-27 09:33:11 -07:00 |
|
Ryan Huffman
|
014a7bc9b0
|
Fix bytes downloaded stat tracking
|
2017-09-27 09:33:10 -07:00 |
|
Atlante45
|
acb0bf8d20
|
Asset Browser tweaks
|
2017-09-26 17:26:46 -07:00 |
|