Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 11:42:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18798 commits 21 branches 28 tags 1.2 GiB
Commit graph

18798 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
701059d797 removed some debug 2014-11-13 08:58:33 -08:00
ZappoMan
bc60c90308 only actually set the properties if they were in the buffer 2014-11-13 08:39:19 -08:00
ZappoMan
55c177594b only set animationIsPlaying if it changed 2014-11-13 08:37:54 -08:00
ZappoMan
09a06c9d82 add debug streamer for xColor 2014-11-13 08:14:01 -08:00
ZappoMan
ea0022501b only set animation properties if they actually changed 2014-11-13 08:13:30 -08:00
ZappoMan
43f44f4131 suppress some potentially repeated log messages 2014-11-13 07:52:00 -08:00
ZappoMan
e4355cd139 calculated animationSettings property to include older properties 2014-11-13 07:34:54 -08:00
ZappoMan
4077f6c2ab Merge branch 'master' of https://github.com/highfidelity/hifi into animationUnification 2014-11-12 20:39:39 -08:00
Philip Rosedale
2c4335d1c5 Merge pull request #3783 from ZappoMan/modelSceneRendering 
Model scene rendering
 2014-11-12 20:38:02 -08:00
ZappoMan
63a8608ac6 handle per model transforms, default scene mode off 2014-11-12 20:20:36 -08:00
ZappoMan
13f08e65d1 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 
Conflicts:
	interface/src/renderer/Model.h
 2014-11-12 19:31:27 -08:00
ZappoMan
c9e8c21d8d partial work on blending of animation settings 2014-11-12 19:23:48 -08:00
AndrewMeadows
65a2aaee9d Merge pull request #3778 from samcake/temp1 
Introduce the Transform class and use it in the gpu api and for rendering models
 2014-11-12 18:26:04 -08:00
Sam Gateau
859c99b9de Fix bug in the cache of GLBackend::TransformStage 2014-11-12 18:15:35 -08:00
ZappoMan
8a2e3d5045 add animationSettings property to model entities 2014-11-12 17:41:55 -08:00
Sam Gateau
b6c004c431 Fix syntax that doesn't compile on linux and used smart glm::max instruction 2014-11-12 17:16:43 -08:00
ZappoMan
ef17659ea2 cleanup 2014-11-12 16:57:42 -08:00
ZappoMan
dd22683672 fixing up animation loop issues 2014-11-12 16:53:16 -08:00
Sam Gateau
c0496fd466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2014-11-12 16:52:34 -08:00
Sam Gateau
d3a7b011bf defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design. And cleaned the dead code in Application.cpp 2014-11-12 16:52:11 -08:00
Sam Gateau
8fb04af59d defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design 2014-11-12 16:40:45 -08:00
Brad Hefta-Gaub
99dd20f828 Merge pull request #3780 from ctrlaltdavid/20182 
CR for Job #20182 - Add ability to set alpha on text overlays
 2014-11-12 16:26:59 -08:00
Brad Hefta-Gaub
70c463695a Merge pull request #3779 from PhilipRosedale/master 
Remove buckyBalls and faceshift lean-to-drive
 2014-11-12 16:26:50 -08:00
Brad Hefta-Gaub
331e9d6558 Merge pull request #3775 from birarda/lobby 
repairs to local audio injection
 2014-11-12 16:26:38 -08:00
ZappoMan
ba79f40007 add some debug 2014-11-12 16:12:34 -08:00