Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 08:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23282 commits 25 branches 0 tags 1.1 GiB
Commit graph

23282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
07bcd115c2 trying to remove useless glsl code for Legacy path 2015-03-20 13:28:42 -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
Brad Hefta-Gaub
bfe3f2cf30 Merge pull request #4483 from Atlante45/attribution_property 
Initial add of the Attribution property
 2015-03-20 09:50:54 -07:00
Atlante45
0a3d936427 Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-20 17:28:32 +01:00
Brad Hefta-Gaub
3d6d79ae3a Merge pull request #4478 from sethalves/maximum-capacity 
Maximum capacity redux
 2015-03-20 09:28:22 -07:00
Atlante45
63c51673de Move PROP_COLLISION_MODEL_URL to the right spot 2015-03-20 17:28:00 +01:00
Brad Hefta-Gaub
96bfb96936 Merge pull request #4468 from ctrlaltdavid/20399 
CR for 20399 - Fix near field clipping on avatars with large heads
 2015-03-19 20:02:17 -07: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
Andrew Meadows
968bf7419c Merge pull request #4479 from jherico/cmake-folders 
Organize projects into folders for IDEs that support it
 2015-03-19 17:45:54 -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
Andrew Meadows
a7dbd6779f Merge pull request #4467 from huffman/avatar-thrust 
Fix thrust not being applied w/ Physics + Avatar
 2015-03-19 16:40:10 -07:00
Brad Hefta-Gaub
46fb9cd615 Merge pull request #4471 from sethalves/avatars-can-collide 
Avatars can collide redux
 2015-03-19 16:31:26 -07:00
Sam Gateau
885bff1225 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-19 16:30:44 -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
Seth Alves
efb7fd6636 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-19 15:47:04 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Seth Alves
0dc61ce3b8 Merge pull request #4477 from ZappoMan/dragDropLinkAvatars 
MVP Task: Support for Drag/Drop link avatars
 2015-03-19 15:29:55 -07:00
Sam Gateau
65727dd613 clean up code 2015-03-19 15:23:50 -07:00
ZappoMan
5f825211df Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars 2015-03-19 15:12:06 -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
Seth Alves
baa8e9c86f remove uneeded #includes 2015-03-19 13:05:30 -07:00
Seth Alves
817a6130ef return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list 2015-03-19 13:01:57 -07:00
ZappoMan
24132968fe oops 2015-03-19 12:41:44 -07:00
ZappoMan
26670f9e41 remove unneeded debug 2015-03-19 12:15:12 -07:00
ZappoMan
c5314aceac more DRYing up of code 2015-03-19 11:57:57 -07:00
ZappoMan
5814a14152 removed dead code 2015-03-19 11:42:00 -07:00
ZappoMan
e6cefa946c more DRYing of code 2015-03-19 11:41:03 -07:00
ZappoMan
3c41ecd091 cleanup accepted files implementation 2015-03-19 11:29:41 -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
72957670ba Some commentary 2015-03-19 09:55:03 -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
ZappoMan
8e0141b8e9 first cut at fst drag/drop support 2015-03-19 08:48:13 -07:00
Atlante45
d3ae7cf5cf Merge branch 'master' of https://github.com/highfidelity/hifi into attribution_property 2015-03-19 16:25:26 +01:00
Seth Alves
ed63e339bc Merge pull request #4475 from jherico/deadlock 
Removing unmatched QReadWriteLock::unlock() call
 2015-03-19 06:54:41 -07:00
Brad Davis
7d73a0317d Merge pull request #4473 from sethalves/maximum-capacity 
Maximum capacity
 2015-03-18 22:43:17 -07: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