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

847 commits

Author SHA1 Message Date
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
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08: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
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