Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-13 02:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
67873 commits 74 branches 59 tags 1.2 GiB
Commit graph

1003 commits

Author SHA1 Message Date
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