Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-07 07:12:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23305 commits 25 branches 0 tags 1.1 GiB
Commit graph

7722 commits

Author SHA1 Message Date
Atlante45
3563efb584 extra ; 2015-03-24 21:52:53 +01:00
Brad Davis
2d4aee7343 Merge pull request #4480 from samcake/temp1 
Fixing the intel bug & switching the shaders away from the QtProgramObject to the gpu::Shader
 2015-03-20 16:11:23 -07:00
Sam Gateau
07bcd115c2 trying to remove useless glsl code for Legacy path 2015-03-20 13:28:42 -07:00
ZappoMan
81bf7138a4 also attempt to clean up placement of PROP_ATTRIBUTION in the stream 2015-03-20 13:21:29 -07:00
Sam Gateau
68de91c80a cleaning code for review 2015-03-20 13:17:32 -07:00
Sam Gateau
5063159581 cleaning code for review 2015-03-20 12:00:16 -07:00
Sam Gateau
1babf53643 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-20 11:55:30 -07:00
Sam Gateau
fdbf4e5288 cleaning code for review 2015-03-20 11:55:00 -07:00
ZappoMan
ad833b76c8 fix PROP index mismatch 2015-03-20 11:43:01 -07:00
Atlante45
0a3d936427 Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-20 17:28:32 +01:00
Atlante45
63c51673de Move PROP_COLLISION_MODEL_URL to the right spot 2015-03-20 17:28:00 +01:00
Brad Hefta-Gaub
451aedbb3c Merge pull request #4476 from jherico/avatar 
Working on tuning the avatar updates to take into account available per-node bandwidth as well as distance
 2015-03-19 18:40:07 -07:00
Brad Davis
7079b5f978 type & squish again 2015-03-19 17:29:57 -07:00
Brad Davis
599fe09e75 type & squish 2015-03-19 17:24:58 -07:00
samcake
d2868bcafc fixing the shader for mac 2015-03-19 16:00:47 -07:00
Brad Davis
bf607e4c9c Fixing indentation and usage 2015-03-19 15:53:16 -07:00
Seth Alves
1db9a9ef46 use .isEmpty on urls rather than convert them to strings and compare to empty string 2015-03-19 15:48:48 -07:00
Sam Gateau
65727dd613 clean up code 2015-03-19 15:23:50 -07:00
Sam Gateau
619a323196 Using Scribe preprocessor @func@ instead of regular glsl function to solve the intel bug with the transform stack 2015-03-19 14:46:50 -07:00
Sam Gateau
20764e9917 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-19 09:57:34 -07:00
Brad Davis
2552afffe7 Merge branch 'master' into avatar 2015-03-19 09:47:36 -07:00
Atlante45
cbef6e546f Fix emun placement 2015-03-19 17:25:53 +01:00
Seth Alves
8eedab72b3 remove some unneeded asserts 2015-03-19 09:15:57 -07:00
Seth Alves
480eae7317 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-19 09:14:26 -07:00
Atlante45
d3ae7cf5cf Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-19 16:25:26 +01:00
Brad Davis
91906d619f Removing unmatched QReadWriteLock::unlock() call 2015-03-18 22:32:06 -07:00
Sam Gateau
f874a3ae82 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-18 17:26:31 -07:00
Sam Gateau
b33ba64e05 trying to tweek the transform equation to find the intel bug 2015-03-18 17:20:27 -07:00
Seth Alves
f800b29682 Merge pull request #4474 from AndrewMeadows/thermonuclear 
proper shape management for ConvexHull shapes
 2015-03-18 17:01:58 -07:00
samcake
c0a66a05f4 Merge pull request #4463 from ZappoMan/LODTweaks 
MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased
 2015-03-18 16:55:39 -07:00
Andrew Meadows
c032b29633 proper shape management for ConvexHull shapes 2015-03-18 16:29:57 -07:00
samcake
0f22d64802 compilation on MacOSX 2015-03-18 16:28:42 -07:00
Sam Gateau
414315b6e0 Since glProgramUniform is not supported on MAc we need a workaround... 2015-03-18 16:15:06 -07:00
Sam Gateau
b5eb4a7f5b Since glProgramUniform is not supported on MAc we need a workaround... 2015-03-18 16:12:47 -07:00
Sam Gateau
dc27bfb6ef Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-18 15:59:50 -07:00
Sam Gateau
0bd78be7f4 Transition model shaders to gpu:Shader 2015-03-18 15:57:01 -07:00
Seth Alves
e2a104c38a unjack AvatarData locks 2015-03-18 14:11:02 -07:00
Seth Alves
dd97b54e52 quiet physics log spam 2015-03-18 13:22:29 -07:00
Seth Alves
1cab14064d remove unneeded code, quiet some debug spew 2015-03-18 13:10:53 -07:00
Seth Alves
36e0a5afc5 cleanups 2015-03-18 13:04:27 -07:00
Seth Alves
b7a54e672d Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-18 13:01:07 -07:00
Seth Alves
9161cc8b83 attempt to handle collision models in the same way as render models 2015-03-18 13:00:09 -07:00
Brad Davis
160f666d89 Merge branch 'master' into avatar 2015-03-18 12:55:56 -07:00
Andrew Meadows
517b2648ca Merge pull request #4465 from sethalves/avatars-can-collide 
One convex hull shape for models that provide decomposition data.
 2015-03-18 12:52:52 -07:00
ZappoMan
8239a295cb Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks 2015-03-18 11:54:05 -07:00
Atlante45
8b5ade10b8 Initial add of the Attribution property 2015-03-18 18:57:05 +01:00
samcake
948ced81ce Merge pull request #4461 from Atlante45/fix_recordings 
Fix recordings
 2015-03-18 09:52:29 -07:00
Seth Alves
906f082a2a Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-18 09:11:35 -07:00
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Seth Alves
2dd75fef2c remove some unneeded Q_OBJECT macros, diff minimization 2015-03-17 19:12:26 -07:00