Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-26 11:30:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
80673 commits 25 branches 0 tags 1.1 GiB
Commit graph

733 commits

Author SHA1 Message Date
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
Seth Alves
5af07dfb62 more memory-debugger 2017-06-23 08:16:48 -07:00
Seth Alves
7ff576ef18 add memory-debugging macro to some cmake files 2017-06-22 10:07:39 -07:00
Burt Sloane
7022c4009f midi in and out 2017-06-15 15:18:06 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Brad Davis
2b43a1989f Moving face and eye trackers out of interface 2017-04-28 23:28:17 -07:00
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
Brad Davis
a8de6eab8c Organize the files in the JS and QML projects to appear in a folder hierarchy 2017-04-20 14:39:06 -07:00
Bradley Austin Davis
0ca0874c52 Creating new avatar rendering library, prepping for crowd rendering project 2017-04-10 10:55:04 -07:00
Zach Fox
a231b57472 Merge pull request #9962 from birarda/cmake-with-space 
Fix failing POST_BUILD steps on Windows with spaces in build path
 2017-03-23 11:41:38 -07:00
Stephen Birarda
c9d1916eea fix for build with win path with spaces 2017-03-20 18:24:19 -07:00
Brad Davis
e94f803b84 Merge remote-tracking branch 'upstream/master' into HEAD 2017-03-08 09:03:21 -08:00
Vladyslav Stelmakhovskyi
2d2b2094fd Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination 2017-03-07 10:11:09 +01:00
sam
d56f982dec Maybe saving the first ktx textures, testing the save pipeline 2017-02-17 07:54:17 -08:00
Atlante45
588fdd6efa Add steamworks to interface externals 2016-12-14 16:07:33 -08:00
Atlante45
0dec97fc03 Make Steamworks a plugin 2016-12-14 15:37:49 -08:00
Zach Fox
5e8afb04c7 Potentially fix OSX and Linux build errors? 2016-11-18 14:39:30 -08:00
Zach Fox
fc21cae904 More stable than ever! Uses external GifCreator lib. Still frame timing issues. 2016-11-18 14:39:29 -08:00
Ryan Huffman
5f8cee787f Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename 2016-11-01 09:07:56 -07:00
Ryan Huffman
0cc98d4501 Add VersionInfo.rc to interface 2016-11-01 09:00:08 -07:00
Stephen Birarda
89a4bc8434 add custom QWebEngine request interceptor 2016-10-17 11:34:10 -07:00
Ken Cooke
9457d49103 Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
Brad Davis
9d057233c6 Fixing rebase 2016-09-06 17:40:48 -07:00
SamGondelman
74e5814a48 try to fix rpath issue 2016-09-06 17:40:43 -07:00
SamGondelman
7f2476f0f8 put pack macdeployqt call, but still removed qtwebprocess 2016-09-06 17:36:58 -07:00
SamGondelman
c993a6b818 try removing windows hack 2016-09-06 17:36:56 -07:00
SamGondelman
2db02fdde1 remove QtWebProcess hack on OSX 2016-09-06 17:36:56 -07:00
Brad Davis
20deae3242 Working on Qt 5.6 compatibility 2016-09-06 17:35:04 -07:00
Stephen Birarda
7b8293dc80 repairs for non-android builds after changes 2016-08-31 17:28:09 -07:00
Stephen Birarda
6efa47a04e workaround plugin build failures 2016-08-31 16:45:12 -07:00
Stephen Birarda
85ba0f36cf fix controllers/shared compile for android interface port 2016-08-31 16:34:31 -07:00
Stephen Birarda
b56a596c29 put android build output in target folder 2016-08-31 13:23:19 -07:00
Stephen Birarda
62504d457b put the apk and apk-build folders in root of build 2016-08-31 11:50:39 -07:00
Stephen Birarda
7c2fea4598 remove glew/oglplus requirement for android interface 2016-08-31 11:03:53 -07:00
Stephen Birarda
f1ed7a2e78 initial changes needed for android interface cmake 2016-08-31 10:53:29 -07:00
Ken Cooke
996bf0d763 Replace the Qt multimedia audio back-end on the Windows build. 
Adds an external project (wasapi) to download a low-latency audio plugin for Qt, as a precompiled DLL.
Adds a post-build command to use this new plugin instead of the default Qt audio plugin.
 2016-08-28 20:12:59 -07:00
Anthony J. Thibault
ad7fa971aa copy scripts into build directory 2016-07-18 17:09:10 -07:00
Brad Hefta-Gaub
c322317878 rework plugins to not depend on PluginContainer unless they want to 2016-06-21 12:07:05 -07:00
Atlante45
96258a795a Initial Steamworks integration 2016-06-14 16:29:50 -07:00
Brad Davis
07562f72af Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Brad Davis
40316498a4 Enable script debugging 2016-05-09 17:02:40 -07:00
Ryan Huffman
f92f29ecab Fix interfaces scripts not copying from /scripts in local builds 2016-04-27 16:34:30 -07:00
Andrew Meadows
3d1abf8fb1 use the new JS script location 2016-04-26 11:20:08 -07:00
Andrew Meadows
ae20bb5fa7 add pthread link dependency to interfac for UNIX 2016-04-14 16:35:51 -07:00
Anthony J. Thibault
a9197385b5 Make debug builds work again. 
Only run mt.exe on the manifest in non development builds.
 2016-04-04 12:24:26 -07:00
Ryan Huffman
1c1158b761 Add Windows manifest to interface.exe 2016-03-31 14:20:19 -07:00
Stephen Birarda
3750d5d780 manually install OpenSSL DLLs for Qt 2016-03-03 17:57:34 -08:00
Stephen Birarda
248aa58d23 force statically linked OpenSSL on windows 2016-03-01 13:04:37 -08:00