Commit graph

18823 commits

Author SHA1 Message Date
Stephen Birarda
46ffbb13aa copy the assets folder to the apk build 2014-11-19 10:03:42 -08:00
Stephen Birarda
8a69f0de61 test for android figuring out about audio-mixer 2014-11-18 17:36:53 -08:00
Stephen Birarda
998457665f add back c++11 support to all, fix includes in networking 2014-11-18 17:26:42 -08:00
Stephen Birarda
9094fef8b8 preliminary support for oculus mobile SDK 2014-11-18 16:39:05 -08:00
Stephen Birarda
713beda440 changes to AndroidManifest for Oculus Mobile SDK 2014-11-18 16:11:29 -08:00
Stephen Birarda
a8cc565baf set the default hostname for GVRInterface client 2014-11-18 13:43:49 -08:00
Stephen Birarda
9f4e1c8a27 cleanup indentation in AndroidManifest file 2014-11-18 13:38:37 -08:00
Stephen Birarda
86000799ac cleanup indentation in AndroidManifest file 2014-11-18 13:02:55 -08:00
Stephen Birarda
a0c8ccf3a1 use strings.xml to clean application name 2014-11-18 13:02:12 -08:00
Stephen Birarda
2b54300469 add the app icon to gvr-interface 2014-11-18 12:54:19 -08:00
Stephen Birarda
7c38abcde8 actually grab AndroidManifest from apk-build dir 2014-11-18 12:49:10 -08:00
Stephen Birarda
9fd6fe49a4 fix leftover method define, make apk creation a sep target 2014-11-18 12:09:57 -08:00
Stephen Birarda
5c9c89826e only enable C++11 on android 2014-11-18 12:01:06 -08:00
Stephen Birarda
f5f9513e4e add basic GVRInterface class that creates a NodeList 2014-11-18 11:59:38 -08:00
Stephen Birarda
6e6a3173db copy static libs directly to libs folder of apk 2014-11-18 11:49:47 -08:00
Stephen Birarda
27630e31f9 add back api and app name info to deploy json 2014-11-18 11:24:31 -08:00
Stephen Birarda
a04ee42c0d complete successful apk creation via androiddeployqt 2014-11-18 11:13:24 -08:00
Stephen Birarda
fe0d9cc034 repairs to deployment json file creation 2014-11-18 10:10:12 -08:00
Stephen Birarda
225e326420 being to rebuild gvr-interface deploy with androiddeployqt 2014-11-18 09:39:43 -08:00
Stephen Birarda
2316cfb885 link hifi libs and openssl statically to gvr-interface 2014-11-17 15:19:07 -08:00
Stephen Birarda
05cfd05e47 add the list of hifi shared libs to apk libs 2014-11-17 14:19:39 -08:00
Stephen Birarda
fce239fb70 replace auto_ptr with unique_ptr 2014-11-17 14:17:50 -08:00
Stephen Birarda
287ab61618 link Gui and Script to shared since they are dependencies 2014-11-17 14:06:41 -08:00
Stephen Birarda
473ae10104 shuffle files with QtGui dependency out of shared 2014-11-17 13:33:07 -08:00
Stephen Birarda
c3f57cd07f modify apk.cmake to allow caller to include jar libs 2014-11-17 13:13:54 -08:00
Stephen Birarda
52750f1ec5 use PixelLight's original Apk.cmake for shared library support 2014-11-17 12:42:53 -08:00
Stephen Birarda
785f309512 use slightly more advanced event handling in native glue main 2014-11-17 11:09:07 -08:00
Stephen Birarda
05cab9a3ba add a gvr-interface target that uses native glue to make apk 2014-11-17 10:58:12 -08:00
Stephen Birarda
f23b08971c merge with cuckoo branch, fix makefile OS X support 2014-11-14 10:52:12 -08:00
Stephen Birarda
424aceadb8 compile tools on android for mtc 2014-11-14 10:18:09 -08:00
Stephen Birarda
9dfdbc4352 remove unused includes in NetworkPacket 2014-11-14 10:14:47 -08:00
Stephen Birarda
36a6344c36 include C++11 check for android support 2014-11-14 10:12:54 -08:00
Stephen Birarda
5b379ae2ff use portable solution for setSockOpt 2014-11-14 10:12:34 -08:00
Stephen Birarda
df23366b8c remove setsockopt calls for DTLS to pass android build 2014-11-14 10:01:01 -08:00
Stephen Birarda
40dc3c517f changes for android to find GLM and OpenSSL 2014-11-13 17:14:53 -08:00
Stephen Birarda
63304210c1 allow sep specification of android Qt location on system 2014-11-13 15:35:19 -08:00
AndrewMeadows
e509a4c41a Merge pull request #3787 from samcake/temp0
Simplified the Transform usage in the gpu::api
2014-11-13 14:10:55 -08:00
AndrewMeadows
b797c7b38c Merge pull request #3782 from ctrlaltdavid/20140
CR for Job #20140 - Add Overlays.getTextWidth
2014-11-13 13:52:53 -08:00
Sam Gateau
5c9c78e62b Moving all the variables for the Input stage cache into a struct just like for transformStage 2014-11-13 12:32:48 -08:00
David Rowe
6f4952c7d5 More consts 2014-11-13 12:25:15 -08:00
David Rowe
493455fdac Fix const 2014-11-13 11:34:40 -08:00
David Rowe
8d4cecda62 Optimization and coding standard 2014-11-13 11:06:40 -08:00
Sam Gateau
420118e9db Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-13 11:04:12 -08:00
Sam Gateau
7e2c4c0561 SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint 2014-11-13 10:57:32 -08:00
Philip Rosedale
9cfc95bc6a Merge pull request #3786 from ZappoMan/animationUnification
Animation unification
2014-11-13 10:23:36 -08:00
ZappoMan
3e521e089b fix unix build 2014-11-13 09:48:15 -08:00
Brad Hefta-Gaub
b92a617290 Merge pull request #3785 from birarda/script-cleanup
remove some scripts from example dir
2014-11-13 09:34:59 -08:00
ZappoMan
8ad3ce7daf bump packet version 2014-11-13 09:32:59 -08:00
Stephen Birarda
42a73e280e remove the concert camera scripts from examples 2014-11-13 09:29:37 -08:00
ZappoMan
8ec12ea954 add full animation settings support 2014-11-13 08:59:06 -08:00