Seth Alves
fe0a656d54
Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints
2015-12-30 12:45:32 -08:00
Andrew Meadows
ec27c75332
Merge pull request #6660 from hyperlogic/tony/anim-expressions
...
AnimExpression: boolean expression parser and evaluator
2015-12-30 08:36:44 -08:00
Zach Pomerantz
687eef37da
Move final blit into RenderDeferredTask
...
- Also changes color buffer clearing, such that
anything run through Blit will now clear BUFFER_COLOR0 to 0,0,1,0.
- Blit will always be added to RenderDeferredTask, but
will only run if renderArgs._blitFramebuffer is set.
2015-12-23 18:21:08 -08:00
Seth Alves
83f60d6e97
make entity properties for model-entity joint-states
2015-12-23 15:43:50 -08:00
Seth Alves
84bcfb7d71
hook up a way for scripts to set model-entity joint state
2015-12-22 17:43:01 -08:00
samcake
f9070ee989
Cleanup cruft in the shaders, glowIntensity and alphaThreshold not needed anymore
2015-12-22 12:41:31 -08:00
samcake
d8a71db929
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-17 10:11:03 -08:00
samcake
7bc815448e
The material colors for diffuse and emissive are now gamma corrected by default
2015-12-16 18:14:43 -08:00
Atlante45
a541fdd2df
Move OctreeSendThread to the OctreeServer
2015-12-16 14:27:26 -08:00
Atlante45
562d9ac2de
Forward QThread's finished signal in GenericThread
2015-12-16 14:27:26 -08:00
Anthony J. Thibault
2b0ed55077
Merge branch 'master' into tony/anim-expressions
2015-12-15 10:35:19 -08:00
Atlante45
d3224bfde3
More warning fixes
2015-12-11 16:03:44 -08:00
Atlante45
ce51350b65
Fix warnings on windows 64bit
2015-12-11 15:42:15 -08:00
Bradley Austin Davis
ae1345bb13
Adding nsight instrumenting to the QML render thread
2015-12-11 11:00:33 -08:00
samcake
40bf721ac5
Fixing merging problem
2015-12-10 17:16:06 -08:00
samcake
3728a9c6f0
Merging with Master
2015-12-10 16:55:30 -08:00
Howard Stearns
f6cd04680d
Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix
...
Fix for sixense debug draw after migration to plugin.
2015-12-10 16:14:43 -08:00
Anthony J. Thibault
1af780a664
Fix for sixense debug draw after move to plugin.
...
static variables used to hold a Singleton cannot be shared across dll boundaries by default.
This uses the globalInstance template to store the instance as a property on the QApplication.
2015-12-10 15:05:27 -08:00
samcake
5805cc8f2b
Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry
2015-12-10 14:59:04 -08:00
Atlante45
03ee07c8b7
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-10 13:37:20 -08:00
Seth Alves
8ca6c7acc3
Merge pull request #6611 from Atlante45/attachments
...
Fix Attachments jitter
2015-12-10 11:46:19 -08:00
Atlante45
6f29d9e7b8
Use strongly typed enum instead of nested alias
2015-12-10 11:10:09 -08:00
Atlante45
1d513cfbba
Merge branch 'master' of https://github.com/highfidelity/hifi into particle
2015-12-09 15:09:19 -08:00
howard-stearns
32e4967ee0
cleanup
2015-12-08 16:38:05 -08:00
howard-stearns
7afc803fb5
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-08 15:30:48 -08:00
howard-stearns
9512c3f73d
Debugging.
...
Please enter the commit message for your changes. Lines starting
2015-12-07 16:58:59 -08:00
howard-stearns
55cfd1c8b4
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 15:49:47 -08:00
Seth Alves
982e986f1a
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-07 14:31:18 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Howard Stearns
df413c0b14
Temporary debugging aids.
2015-12-07 09:31:06 -08:00
Seth Alves
96e9580473
change some more parameters back to being pass-by-reference, where it's safe
2015-12-07 05:30:19 -08:00
Seth Alves
fff4e3e831
make SpatiallyNestable setters take values by reference
2015-12-06 12:01:30 -08:00
Seth Alves
a948ae5f19
children of avatar joints might be right, now
2015-12-06 10:48:00 -08:00
Seth Alves
edc312199d
rename a method to match convention in https://docs.google.com/document/d/1LFCmkK26JMVs8Ci33L4Yrle6lL7UU7oxthsWfddzZXQ/edit#
2015-12-06 06:16:47 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Seth Alves
ea65ef964f
fix an AC race/crash
2015-12-04 11:13:36 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Brad Hefta-Gaub
f472b515c3
remove wantsColor support since its always true and required for entities
2015-12-03 21:03:32 -08:00
Brad Hefta-Gaub
5a75a17174
Revert "Cruft removal"
2015-12-03 17:40:41 -08:00
Clément Brisset
fa52b97f61
Merge pull request #6538 from ZappoMan/cruftRemoval
...
Cruft removal
2015-12-03 17:03:04 -08:00
Atlante45
bd23a4137e
Move toGlm to GLMHelpers
2015-12-03 15:01:17 -08:00
Seth Alves
e5b1cfa920
fix windows build
2015-12-03 11:15:04 -08:00
Brad Hefta-Gaub
849a8707d2
remove wantsColor support since its always true and required for entities
2015-12-03 11:11:15 -08:00
Seth Alves
4e74c98ae7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-03 11:00:13 -08:00
Seth Alves
6f79b381f9
working toward making children of avatar joints work
2015-12-03 11:00:06 -08:00
Anthony J. Thibault
710ce7e639
Merge branch 'master' into tony/anim-expressions
2015-12-03 09:56:28 -08:00
Seth Alves
2d804555de
minor cleanups
2015-12-03 08:59:15 -08:00
Anthony J. Thibault
b56cf58e33
Fix for mirrored transforms in FBX models
...
extractScale will now return negative scale for left-handed matrices.
2015-12-02 16:55:04 -08:00
Anthony J. Thibault
9c0b4bc2a2
Fix for model entities with non-uniform scaled mesh
...
Logic which extracted rotations from a non-uniformly scaled matrices was sometimes incorrect.
This should fix the roads in Qbit as well as the blocks in toybox.
2015-12-02 14:09:47 -08:00
Atlante45
083205916f
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-30 18:25:53 -08:00
