Commit graph

52 commits

Author SHA1 Message Date
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Bradley Austin Davis
6200d31c93 Fixing OSX resources URL 2018-01-17 14:46:27 -08:00
Bradley Austin Davis
503fed19a7 Trying to fix mac resource loading 2018-01-17 10:36:34 -08:00
Bradley Austin Davis
b4223215ef Use old style resources on OSX for now 2018-01-16 14:44:05 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
97593bc4d8 Fixing compiled resource access 2018-01-10 17:18:12 -08:00
Brad Davis
7a7aee770c Switching to binary resources 2018-01-10 13:39:56 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Brad Davis
a2c2e7d9ff Fixes to load cubemap 2018-01-08 14:43:54 -08:00
Gabriel Calero
6050737e7c Resolving comments in PR 2018-01-08 17:36:08 -03:00
Gabriel Calero
32494a8e24 Set QMLEngine base path for android 2018-01-03 22:13:31 -03:00
Gabriel Calero
fc62b2d34a Fix ktx_cache path for android. Load the least js scripts for android 2018-01-03 16:42:18 -03:00
Gabriel Calero
78f2a8c566 Copy scripts from android assets at startup 2018-01-03 16:40:14 -03:00
Zach Fox
b81cdf49ef Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist 2017-12-11 09:52:32 -08:00
Ryan Huffman
e3d00c4aa5 Remove unnecessary logging from PathUtils 2017-12-08 17:48:10 -08:00
Ryan Huffman
982607eedf Remove unused variable from PathUtils 2017-12-08 15:40:33 -08:00
Ryan Huffman
2eecb41337 Update metatype registration in assetBakeTask 2017-12-06 13:59:46 -08:00
Ryan Huffman
cb9a30413d Rename removeTemporaryDis to removeTemporaryApplicationDirs 2017-12-06 12:50:20 -08:00
Ryan Huffman
f20aa2e680 Fix asset server baking not working on *nix 2017-12-06 11:49:34 -08:00
Ryan Huffman
de7e3e60cd Add temp dir removal to asset server 2017-12-06 11:49:34 -08:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
Bradley Austin Davis
e42068f681 Merge branch 'master' into android_new 2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
Ryan Huffman
b862336d17 Add PathUtils::generateTemporaryDir() 2017-08-21 13:40:51 -07:00
David Kelly
4a22fbca1b redo cache switch 2017-07-05 17:01:31 -07:00
David Kelly
01155ba4e3 this handles redirecting ktx_cache, data8, prepared 2017-06-27 08:47:54 -07:00
David Kelly
bda50af780 this uses qt's test location for AppData/Local, but leaves Roaming alone 2017-06-23 11:06:48 -07:00
David Kelly
04160f2ca1 switch to change ktx_cache directory (only) 2017-06-23 09:19:41 -07:00
David Kelly
7ef50042ba remove turd 2017-06-23 08:00:18 -07:00
David Kelly
ff5b37c785 new --scripts switch overrides default scripts location 2017-06-22 14:09:05 -07:00
Zach Pomerantz
808973d7d2 use QStandardPaths instead of hardcoded paths 2017-03-13 17:26:42 -04:00
Zach Pomerantz
172a638ef0 move resource paths to PathUtils 2017-03-13 17:26:34 -04:00
humbletim
b15956278c separate out supporting changes into 21114-part2 branch 2017-02-16 07:40:19 -05:00
Ryan Huffman
e24a01d1fe Add path parameter to goToSandbox 2016-10-07 10:30:18 -07:00
Seth Alves
b28cfd27ec fix problem where canonicalFilePath will strip a trailing slash 2016-04-29 13:17:59 -07:00
Seth Alves
0f288247a7 include script in default script location 2016-04-01 10:50:22 -07:00
Seth Alves
e8f26b675a try to fix path to osx scripts 2016-03-30 15:04:29 -07:00
Seth Alves
62372415be get this working on windows 2016-03-30 14:01:35 -07:00
Seth Alves
26e01bbacd rewrite a bunch of path/url mangling code 2016-03-30 13:33:49 -07:00
Seth Alves
7c0bb72aff started on making ~ mean the application directory in script paths 2016-03-29 18:32:46 -07:00
Seth Alves
0c72ca1be3 works on windows now 2016-03-29 13:39:35 -07:00
Seth Alves
3aa1090ced working toward allowing local files in running-scripts window 2016-03-29 11:58:21 -07:00
Seth Alves
b88770228e convert running-scripts window to use local script files 2016-03-29 10:40:56 -07:00
Seth Alves
b273d5efd3 fix defaultScripts filename 2016-03-28 13:48:19 -07:00
Seth Alves
de8153bd75 on windows and osx use default scripts bundled with interface 2016-03-28 12:23:23 -07:00
Stephen Birarda
666830c04d add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
Brad Davis
897e47e8e6 Removing debug hack to load resources from source folder 2015-04-27 23:17:56 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Seth Alves
9ef9452cf6 make filename extension checking less wrong 2015-04-03 16:39:45 -07:00