Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18928 commits 2 branches 0 tags 1.1 GiB
Commit graph

18928 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
fed711e331 Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-11-13 10:37:49 -08:00
Philip Rosedale
9cfc95bc6a Merge pull request #3786 from ZappoMan/animationUnification 
Animation unification
 2014-11-13 10:23:36 -08:00
Atlante45
2498fd11a3 Preload sounds / use hash injector options 2014-11-13 10:22:45 -08:00
Stephen Birarda
fd6b9c3550 changes to sound class to allow caching of sounds 2014-11-13 10:16:42 -08:00
ZappoMan
3e521e089b fix unix build 2014-11-13 09:48:15 -08:00
Atlante45
bc4514649e Merge branch 'master' of https://github.com/highfidelity/hifi into chessgame 2014-11-13 09:35:39 -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
Stephen Birarda
324b2fb18f Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-11-13 09:25:27 -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
David Rowe
fac6b6b426 Refactor QRect conversion to QScriptValue 2014-11-12 21:32:55 -08:00
David Rowe
9e19641a1d Add property getting for all 3D overlays 2014-11-12 21:05:44 -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
Atlante45
16e243aec5 typo 2014-11-12 17:19:16 -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
Atlante45
bada1d8e38 Cleaner code + metadata 2014-11-12 17:13:29 -08:00
Atlante45
7193fcc89d Metadata for pieces 2014-11-12 17:12:27 -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
David Rowe
725d56d41f Add property getting for all 2D overlays 2014-11-12 16:50:13 -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
ZappoMan
245f019836 first cut at migrating entity animation frame calculations to use AnimationLoop 2014-11-12 16:10:35 -08:00
Atlante45
6f8b702334 New grid 2014-11-12 15:34:39 -08:00
Atlante45
76d45953fd switch to mesh board 2014-11-12 15:34:14 -08:00
Sam Gateau
7fa4ea7527 commented on the else branch in the update TRansform stack doing nothing 2014-11-12 15:04:52 -08:00
ZappoMan
d2ab3e69f0 some cleanup 2014-11-12 14:59:03 -08:00
ZappoMan
6ff8abcbdd sepearate looping logic from AnimationHandle 2014-11-12 14:47:10 -08:00
ZappoMan
68bd6c23d9 sepearate looping logic from AnimationHandle 2014-11-12 14:47:02 -08:00