Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 16:02:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
23329 commits 69 branches 56 tags 1.2 GiB
Commit graph

23329 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
faa47da57e update version of TBB external project 2015-03-24 11:49:33 -07:00
Philip Rosedale
288bb5be38 Merge pull request #4493 from ZappoMan/avatarClipBugs 
more fixes to avatar parts not rendering
 2015-03-24 09:29:03 -07:00
Philip Rosedale
26fbabc4fd Merge pull request #4492 from ZappoMan/LODUITweaks 
Tweaks to the LOD UI
 2015-03-24 09:28:33 -07:00
ZappoMan
a9e4d25f97 more fixes to avatar parts not rendering 2015-03-24 08:32:27 -07:00
ZappoMan
168e8e8b80 more fixes to avatar parts not rendering 2015-03-24 08:31:45 -07:00
ZappoMan
0c2b95aa1d Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-24 08:24:32 -07:00
Seth Alves
dfd9b9958b Merge pull request #4482 from AndrewMeadows/bispinor 
CharacterController can walk up ledges #2
 2015-03-23 18:25:58 -07:00
ZappoMan
69f261ae94 tweaks to the LOD Tools UI 2015-03-23 16:44:19 -07:00
ZappoMan
fa122a227b tweaks to the LOD Tools UI 2015-03-23 16:44:07 -07:00
Brad Hefta-Gaub
92a639d2ee Merge pull request #4486 from ctrlaltdavid/sixense-build-instructions 
Building with Sixense build requires four of the SDK libraries
 2015-03-23 11:17:33 -07:00
Brad Hefta-Gaub
25bfc29081 Merge pull request #4489 from Atlante45/light_types 
Light types
 2015-03-23 11:16:48 -07:00
samcake
f54d5612a6 Merge pull request #4490 from ZappoMan/avatarClipBugs 
Bug Fix - hack to get avatar parts rendering, fix to crash in updateJointState
 2015-03-23 11:15:37 -07:00
ZappoMan
9fb53e3d72 CR feedback 2015-03-23 11:13:42 -07:00
ZappoMan
3e8508f149 CR feedback 2015-03-23 11:13:35 -07:00
ZappoMan
b705d76336 total hack to ignore frustum culling in case of avatar mesh parts with no transform 2015-03-23 10:43:21 -07:00
Atlante45
c26f17e16b Update from light properties 2015-03-23 18:36:40 +01:00
ZappoMan
fe8ad9517f added debugging for model mesh boxes 2015-03-23 10:08:08 -07:00
Atlante45
ea0f3f05e7 Tune sound down 2015-03-23 17:55:23 +01:00
Atlante45
fdfdba5d2d Couple tweaks 2015-03-23 17:46:57 +01:00
Atlante45
963be820d0 Remove comments 2015-03-23 17:28:11 +01:00
Atlante45
40ed0146e2 Better handling of erased lights 2015-03-23 17:26:43 +01:00
Atlante45
30ea2eb722 Nicer way to update light Properties 2015-03-23 17:20:21 +01:00
Atlante45
efd177d80d Fix property save 2015-03-23 17:06:34 +01:00
Atlante45
66f954142a Fix light multiple creations 2015-03-23 17:06:12 +01:00
Atlante45
5fadcbe7d9 Prints cleanup 2015-03-23 17:05:46 +01:00
Atlante45
6b4845abf3 Some improvements to lightController 2015-03-23 16:47:24 +01:00
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Atlante45
34248ea8fd Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-23 13:04:34 +01:00
David Rowe
7dbe92f56f Building with Sixense build requires four of the SDK libraries 2015-03-21 14:22:09 -07: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
Andrew Meadows
0d7d3adae6 Merge pull request #4485 from Atlante45/attribution_property 
Update Edit.js HTML to display attribution property
 2015-03-20 15:21:27 -07:00
Atlante45
fb4f8ac7a4 Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-20 22:49:00 +01:00
Andrew Meadows
f372b95e7e Merge pull request #4484 from ZappoMan/fixUpProps 
fix PROP index mismatch
 2015-03-20 14:30:20 -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
Atlante45
34ab470624 lightController first draft 2015-03-20 21:21:18 +01: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
e4e0e2fd6b Update Edit.js HTML to display attribution property 2015-03-20 18:04:05 +01: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
Andrew Meadows
e7423caf2b merge upstream/master into andrew/bispinor 2015-03-20 08:43:36 -07:00
Andrew Meadows
ab9d8eb345 reorder arguments to StepDownConvexResultCallback ctor 2015-03-20 08:42:35 -07: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