Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 23:03:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36973 commits 76 branches 59 tags 1.2 GiB
Commit graph

1826 commits

Author SHA1 Message Date
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
Seth Alves
96f506a98d code review 2016-01-05 07:27:27 -08:00
Seth Alves
f5bc58f606 back out off-brand change 2016-01-03 08:00:31 -08:00
Seth Alves
40a25f859a cleanups 2016-01-03 08:00:23 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Anthony J. Thibault
8f71a5fda5 ModelEntityItem: Fix for missing pre-rotations for animated models. 
This should fix the issue with the Kaya and Claire models, while
also not breaking the windmill model in demo.
 2015-12-30 10:17:18 -08:00
ericrius1
8e7dfc07c0 Added logic to blacklist entities from raypicking 2015-12-24 11:59:47 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
ericrius1
fdb909ca31 merged 2015-12-22 09:40:42 -08:00
Seth Alves
c84fa5f821 cleanups 2015-12-21 14:45:18 -08:00
Seth Alves
76df582a6c Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-21 14:29:32 -08:00
ericrius1
1cdee11784 Merge branch 'master' into polylineOptimizations 2015-12-21 12:49:00 -08:00
samcake
aef748b894 Adding linear color in Particule system 2015-12-21 10:40:29 -08:00
Seth Alves
701f99d28e only send a queryAACube for entities to entity-server 2015-12-18 16:28:11 -08:00
Seth Alves
9b49d9d66b default parentJointIndex to -1 2015-12-18 15:10:51 -08:00
Seth Alves
13ad6bf2f7 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-18 14:52:02 -08:00
Andrew Meadows
aa3d1c6e4c Merge pull request #6680 from hyperlogic/tony/windmill-anim-fix 
ModelEntityItem: Fix for incorrect animations with preTranslations
 2015-12-18 14:16:35 -08:00
Seth Alves
81d3571171 fix getMaximumAACube and getMinimumAACube success return values 2015-12-18 12:04:47 -08:00
Seth Alves
688448fe41 more queryAABox experimenting 2015-12-17 16:18:41 -08:00
Seth Alves
473212e5b7 try to be more coherent about queryAABox meaning 2015-12-17 14:29:41 -08:00
ericrius1
92f96cbb2f Removed un-needed libraries from particle effect entity 2015-12-17 12:49:30 -08:00
ericrius1
5b52b5e5e7 Merge branch 'master' into polylineOptimizations 2015-12-17 11:41:34 -08:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Seth Alves
eb173815f5 Merge branch 'master' of github.com:highfidelity/hifi into dejitter-hold-action 2015-12-17 11:08:05 -08:00
Seth Alves
16b26bbbfd Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-17 10:16:19 -08:00
Anthony J. Thibault
2eecb61da5 Prefer erase over repeated pop_front calls 2015-12-16 19:08:31 -08:00
Seth Alves
b83579e6e5 include queryAABox in physics-induced sends 2015-12-16 17:25:49 -08:00
Anthony J. Thibault
3b1ba67a88 ModelEntityItem: Fix for incorrect animations with preTranslations 
ModelEntities that were playing animations on models with local pivot offsets were not working correctly.
Specifically, the windmill animation in the demo domain.

We now compose a matrix containing all of the FBX's preTranslation, preRotation and postTranformations.
 2015-12-16 17:08:22 -08:00
Anthony J. Thibault
1b08563079 ParticleEffectEntityItem: fix for invalid iterator increment 
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
 2015-12-16 16:56:49 -08:00
Seth Alves
9e5116bf4f Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting 2015-12-16 15:56:31 -08:00
Seth Alves
d3c57821c0 call a method on actions before each physics simulation step. use this to attempt to dejitter held objects 2015-12-16 14:00:04 -08:00
Seth Alves
10b82945a6 formatting 2015-12-16 10:16:01 -08:00
Seth Alves
45d19167c9 fix a couple of missing-parent bugs 2015-12-16 10:09:46 -08:00
ericrius1
61bad36d5c tweaks 2015-12-15 18:49:04 -08:00
Seth Alves
0003c607ea Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 18:46:21 -08:00
ericrius1
d9c93130e5 In a state where non uniform random vals are clear 2015-12-15 18:02:11 -08:00
Seth Alves
951db42146 only send queryAABox if something about the location changed 2015-12-15 16:17:49 -08:00
Seth Alves
0ac06bad5c more AACube plumbing 2015-12-15 15:31:02 -08:00
Seth Alves
2b800d711f queryAACube to and from scriptvalues 2015-12-15 15:18:43 -08:00
Seth Alves
0013d58365 include queryAACube when scripts make changes 2015-12-15 14:25:02 -08:00
ericrius1
dca83a054e Changed additiveBlending to emitterShouldTrail 2015-12-15 10:30:57 -08:00
ericrius1
c561a53f7c Going to change additive blending to world position prop 2015-12-15 09:56:28 -08:00
Anthony J. Thibault
617fda7832 ModelEntityItem: fix for incorrect joint mapping 
This could happen when switching the animation url between fbx files
with different joint mappings.  Only the first one would take effect.

This should fix the issue in the demo domain, with the contorted doll model.
 2015-12-14 17:07:53 -08:00
Seth Alves
165c41d843 add a way to remember which entities couldn't be properly placed in octree due to missing parents 2015-12-14 14:19:19 -08:00
ericrius1
8d691f2132 light ball 2015-12-14 11:44:42 -08:00
ericrius1
3d782f1307 fixed merge conflicts 2015-12-14 10:11:49 -08:00
Seth Alves
008065ba38 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-14 09:15:56 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Seth Alves
270d5fc8e1 remove commented-out code 2015-12-13 06:44:34 -08:00
Seth Alves
7f11d2a4fe whitespace 2015-12-12 14:45:02 -08:00