Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 06:54:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
23305 commits 71 branches 56 tags 1.2 GiB
Commit graph

23305 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
19886bd33c Better handling of callback 2015-03-25 16:38:27 +01:00
Atlante45
afb96709f1 Only update userData when light entity is identified 2015-03-25 15:44:37 +01:00
Atlante45
92d3944044 Use preOp function for all common checks/updates 2015-03-25 15:04:06 +01:00
Atlante45
3563efb584 extra ; 2015-03-24 21:52:53 +01:00
Atlante45
c26f17e16b Update from light properties 2015-03-23 18:36:40 +01: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
Atlante45
34248ea8fd Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-23 13:04:34 +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
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
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