Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
18799 commits 75 branches 59 tags 1.2 GiB
Commit graph

18799 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
f09b58c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-11-14 10:05:01 -08:00
Clément Brisset
7177104d87 Merge pull request #3793 from AndrewMeadows/bispinor 
fix warning about function terminating with no return call
 2014-11-14 09:58:27 -08:00
Sam Gateau
642f436fba first draft of factorizing the rendering traversal for both sides in stereo 2014-11-14 09:56:36 -08:00
Andrew Meadows
5ba213f8d1 fix for function override with no return 2014-11-14 09:33:11 -08:00
AndrewMeadows
edc599bc2d Merge pull request #3792 from ZappoMan/bugFixes 
fix a couple bugs
 2014-11-14 08:33:49 -08:00
ZappoMan
7b69642c67 fix bug in animation jitter on turn 2014-11-13 23:03:12 -08:00
ZappoMan
744f9bc508 better handle corrupt packets that would cause unreasonably deep recursion 2014-11-13 22:26:18 -08:00
ZappoMan
5da0d1e55a fix regexs for dangerously deep recurssion suppression 2014-11-13 20:53:31 -08:00
Brad Hefta-Gaub
db2b5fc28d Merge pull request #3791 from ctrlaltdavid/20128 
CR for Job #20128 - Make leapHands.js compensate for avatars without wrist joints
 2014-11-13 20:44:43 -08:00
Brad Hefta-Gaub
3441167838 Merge pull request #3790 from Atlante45/entities_userdata 
Entities userdata
 2014-11-13 20:43:57 -08:00
Brad Hefta-Gaub
27c37f3a4e Merge pull request #3784 from ctrlaltdavid/20157 
CR for Job #20157 - Enable "Get Overlay properties" from javascript
 2014-11-13 20:43:38 -08:00
ZappoMan
6a4f1c857f fix a couple bugs 2014-11-13 18:35:04 -08:00
Atlante45
f914f02a0b Move user data to end of enum 2014-11-13 17:44:22 -08:00
Chris Collins
c55f76d7ef Apply alpha to text from 0 - .9 
Apply alpha to text from 0 - .9
 2014-11-13 17:27:05 -08:00
Atlante45
9fc7451581 Move macros to the end 2014-11-13 17:06:57 -08:00
Atlante45
40576b3c03 moved append to the end 2014-11-13 17:02:45 -08:00
Atlante45
f8be98260c String specific macros 2014-11-13 16:32:15 -08:00
Philip Rosedale
4e11191856 Merge pull request #3789 from birarda/lobby 
use ResourceCache for Sound files so they are cached too
 2014-11-13 16:30:06 -08:00
Atlante45
aae02328ca Merge branch 'master' of https://github.com/highfidelity/hifi into entities_userdata 2014-11-13 16:20:29 -08:00
Stephen Birarda
7630aab963 only debug request sound if there is a network request 2014-11-13 16:18:19 -08:00
Atlante45
f47620231e Entities have user data 2014-11-13 16:16:20 -08:00
samcake
c3f764091e Merge pull request #3788 from ZappoMan/modelSceneRendering 
More work on model scene rendering
 2014-11-13 15:45:33 -08:00
Stephen Birarda
cfa2912877 use new SoundCache across scripts 2014-11-13 15:01:45 -08:00
Stephen Birarda
f27367a0c1 fix audio-mixer muting for injectors 2014-11-13 15:00:40 -08:00
Stephen Birarda
de5881818b update playSound to new sound interface 2014-11-13 14:54:48 -08:00
David Rowe
8076bfea72 Merge branch 'master' into 20157 
Conflicts:
	interface/src/ui/overlays/Text3DOverlay.cpp
 2014-11-13 14:53:57 -08:00
ZappoMan
49ef6f8be0 some cleanup 2014-11-13 14:53:37 -08:00
ZappoMan
3ff89be3fd actually only pick programs once 2014-11-13 14:51:47 -08:00
Stephen Birarda
8a03738c83 give a Sound cache to the assignment-client 2014-11-13 14:48:18 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
ZappoMan
d7d7db4494 Merge branch 'master' of https://github.com/highfidelity/hifi into modelSceneRendering 2014-11-13 14:47:15 -08:00
ZappoMan
7ba3c74bc0 more work on render model scenes 2014-11-13 14:47:02 -08:00
Stephen Birarda
a771f72ed2 Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-11-13 14:15:02 -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
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
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
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