Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 10:36:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86507 commits 25 branches 0 tags 1.1 GiB
Commit graph

782 commits

Author SHA1 Message Date
dante ruiz
ce2849b570 Revert "Merge pull request #15944 from danteruiz/add-signing" 
This reverts commit 47b7e9a5dc, reversing
changes made to 6d0ba98bfc.
 2019-07-23 09:38:32 -07:00
Matt Hardcastle
afb5f81ca0 Add signing to macOS Interface and HQ Launcher 
This change adds signing to the macOS version of Interface and HQ
Launcher. By default, signing is not enabled; to enable signing you must
add the `XCODE_DEVELOPMENT_TEAM` environment variable and rerun CMake.

Jira: https://highfidelity.atlassian.net/browse/DEVOPS-52
 2019-07-15 10:54:44 -07:00
Andrew Meadows
f2f11b9509 only build qt.conf for DEV macos and unix builds 2019-05-20 15:00:07 -04:00
Andrew Meadows
9b78edd062 more correct qt.conf for Linux and MacOS dev environment 2019-05-20 11:50:09 -04:00
Andrew Meadows
c660ddd1af Merge master into 22007-hifiQtBuildv2 2019-05-16 12:31:39 -07:00
Andrew Meadows
9884d390b8 fix qt.conf location for MacOS 2019-05-15 09:34:08 -07:00
Andrew Meadows
2d21b5c269 use qt.conf file to find Qt resources 2019-05-13 14:26:16 -07:00
amerhifi
0d97543ece code cleanup based on discussion with Sam. Adding implementation for graphics and display info from gpuiden. removed dxgi references in platform 2019-05-09 12:04:41 -07:00
amer cerkic
f09f6ebd08 initial interface setup for platform 2019-05-02 15:50:35 -07:00
Revofire
47af406440 merged 0.80.0-kasen into 0.81.0-kasen, 0.81.0-kasen source ready for build. 
various changes, idk, added a whitelist filter to ent script filter
 2019-05-01 22:13:51 -04:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Sam Gateau
384d4fb959
Merge pull request #14809 from highfidelity/commandLineAndroid 
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
 2019-02-14 12:10:08 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Brad Davis
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -08:00
Brad Davis
8a1a55189a CMake cleanup and modernization 2019-01-30 16:23:14 -08:00
amer cerkic
708da45ccc recreated changes due to CLA issue in previous pr. Adding args to intent so that app can parse as comamnd line args. 2019-01-30 11:47:06 -08:00
sabrina-shanman
566d09dc9c Add model preparation step to ModelCache using new library model-baker 2018-12-11 11:15:54 -08:00
sabrina-shanman
753557736e Merge branch 'master' into hfm_library 2018-11-12 15:03:30 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
sabrina-shanman
e00024e8b0 Create HFM library 2018-11-05 12:47:34 -08:00
Wayne Chen
a7abebd7aa adding redirect json to post build in Mac 2018-09-04 11:11:34 -07:00
Wayne Chen
6cdcae3349 switching address syntax, updating redirection domain 2018-08-29 16:11:51 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Andrew Meadows
a18ba36dd2 merge 'master' into 'workload' 2018-06-18 13:40:08 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
Gabriel Calero
3911a93a38 Merge remote-tracking branch 'upstream/master' into breakpad_android 2018-06-07 19:00:16 -03:00
Gabriel Calero
8869af069e Integrate Breakpad in android Interface 2018-06-07 18:59:43 -03:00
Bradley Austin Davis
fa51c15849 Use binary resources on OSX 2018-06-06 15:10:52 -07:00
Andrew Meadows
06af31594e merge 'master' into 'workload' 2018-04-20 15:07:46 -07:00
David Rowe
06bb873e8d Include JSDoc Web pages in the install 2018-04-16 16:08:26 +12:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -07:00
Stephen Birarda
0172c24cf2 fix cmake changes for script copy for dev builds 2018-03-28 14:47:09 -07:00
Ryan Huffman
d01a58517f Fix serverless content not using correct directories 2018-03-26 14:32:52 -07:00
Stephen Birarda
787947b6a8 add a default tutorial json for dev interface 2018-03-26 14:32:26 -07:00
Stephen Birarda
b52a877d8d optionally grab serverless tutorial, on for installers 2018-03-26 14:32:11 -07:00
Stephen Birarda
1405c8fcb3 add a client only option to cmake 2018-03-20 14:20:58 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
Stephen Birarda
f8df90e36d disable the sixense plugin by default 2018-03-15 13:53:10 -07:00
samcake
f8acca76e2 Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master 2018-03-13 09:31:50 -07:00
SamGondelman
4bef033d6f cleanup, don't compress rcc file to fix corruption 2018-03-12 13:05:03 -07:00
Stephen Birarda
2158acecf4 tell cmake we are fine ignoring generated for CMP0071 2018-03-08 12:39:40 -08:00
Andrew Meadows
3ca21dda67 Merge hifi/master of into hifi/workload 2018-02-28 10:28:31 -08:00
humbletim
caab532d80 remove dupe line 2018-02-22 06:00:03 -05:00
Andrew Meadows
7a684058b5 fix link errors on linux build 2018-02-21 15:25:16 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
humbletim
06afaa7470 BufferView <-> QVariant/QScriptValue conversion 
update MeshProxy/SimpleMeshProxy and ScriptableModel

ModelScriptingInterface / scriptable::ModelProvider

integration

update to RC-63

initial graphics-scripting refactoring

graphics-scripting baseline commit

wip commit

Geometry -> MeshPart

remove SimpleMeshProxy

collapse graphics-utils -> graphics-scripting

scriptable::Model => scriptable::ScriptableModel
 2018-02-01 16:30:29 -05:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete 
JS scripting console auto-complete
 2018-01-31 10:39:51 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
Atlante45
db08f1dda6 Move backtrace to interface 2018-01-30 11:39:48 -08:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Thijs Wenker
8fdbac521f move ADD_CUSTOM_QRC_PATH function to its own file 2018-01-27 19:58:15 +01:00
Thijs Wenker
898c99e5b8 append file jsdoc json file to resources.rcc resource file 2018-01-27 19:50:52 +01:00
Seth Alves
1237749628 oops 2018-01-26 12:05:26 -08:00
Seth Alves
cb5ca26600 quiet warnings 2018-01-26 09:23:34 -08:00
Seth Alves
88f66f03cc remove merge mistake 2018-01-26 09:20:46 -08:00
Atlante45
093fff9c9e Add crashpad 2018-01-26 09:20:38 -08:00
Seth Alves
47f44eb21f extirpate bugsplat 2018-01-26 09:20:23 -08:00
Atlante45
ced5aad1d1 backtrace for rc-63 2018-01-26 09:20:07 -08:00
Thijs Wenker
2874a3d2ca fix android build (skip auto-complete when BUILD_TOOLS is FALSE) 2018-01-25 23:39:32 +01:00
Thijs Wenker
45487a1e45 Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete 
# Conflicts:
#	interface/CMakeLists.txt
 2018-01-25 22:51:35 +01:00
Thijs Wenker
79dbde6a6f optional auto-complete build (requires NPM installed) 2018-01-23 23:01:59 +01:00
Thijs Wenker
67effd1ad1 create folder 2018-01-23 02:15:31 +01:00
Brad Davis
288e753eea Fix font loading from non-QRC html 2018-01-22 16:48:00 -08:00
Thijs Wenker
483074b11e jsdoc cmake fixes 2018-01-22 17:59:01 +01:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Thijs Wenker
0f7f58417b JS scripting console auto-complete 2018-01-19 19:11:12 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Brad Davis
c126e4fa1c Fix automatic binary resources rebuilding 2018-01-14 10:51:16 -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
d6dd29b952 Merge remote-tracking branch 'upstream/master' into android_nov 2018-01-09 11:43:03 -08:00
Sam Gondelman
02100a405d
Merge pull request #12100 from samcake/blue 
Restore packing of QRC qml and resources to interface.exe in DEV_BUILD
 2018-01-08 17:41:34 -08:00
Gabriel Calero
6050737e7c Resolving comments in PR 2018-01-08 17:36:08 -03:00
samcake
5a5d475c6c Reinstall the packing of the qrc in the executable in DEV_build 2018-01-05 14:03:52 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00
Gabriel Calero
8cac98545a Fixes for Android 2018-01-04 17:36:10 -03:00
Gabriel Calero
32494a8e24 Set QMLEngine base path for android 2018-01-03 22:13:31 -03:00
Gabriel Calero
76b38bebad Make Interface run in Android 2018-01-03 16:36:11 -03:00
Brad Davis
829e521320 Merge remote-tracking branch 'upstream/master' into HEAD 2018-01-02 11:37:33 -08:00
Brad Davis
6cff86b0f3 Fix polyvox archive, correct build errors, add additional libraries 2017-12-12 18:29:36 -08:00
Bradley Austin Davis
9df9cf7a47 Adding more libs, ifdefs for android incompatible code 2017-12-11 13:18:23 -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
Brad Hefta-Gaub
26ea8bea6a Merge pull request #11612 from highfidelity/pointers 
Fix tablet intersection bug and start of Pointer migration work (WIP)
 2017-10-20 13:53:52 -07:00
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -07:00
Brad Davis
2ae61cb96b Prototype packaging QML and related resources into a QRC 2017-10-14 14:40:46 -07:00
Seth Alves
aa08053a28 fix osx build 2017-10-09 17:34:43 -07:00
Seth Alves
4d2f16efc3 allow project to be built with clang on Linux 2017-10-08 18:01:41 -07:00
Bradley Austin Davis
b93e91b9f3 New android toolchain 2017-09-19 13:45:12 -07:00
beholder
a1e0f31cd8 fix for 'C1128: number of sections exceeded object file format limit' 2017-08-23 00:24:09 +03:00
David Kelly
f784bc42de Initial cut using RSA keys for now 2017-08-11 16:54:04 -07:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00