Stephen Birarda
c670c9a0d5
fix for AnimNodeLoader use of Resource loaded
2015-09-08 15:31:37 -07:00
Stephen Birarda
e1a31f4dbe
put back TextureCache headers
2015-09-08 15:23:26 -07:00
Stephen Birarda
a3959109f1
resolve conflicts on merge with upstream/master
2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9
Merge pull request #5735 from hyperlogic/tony/no-particle-fix
...
Fix for RenderableParticleffectEntityItem assert.
2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f
Merge pull request #5732 from jherico/selma
...
Procedural skyboxes
2015-09-08 15:12:59 -07:00
Stephen Birarda
e1c395f5ea
resolve conflicts on merge with upstream/master
2015-09-08 14:56:23 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
Stephen Birarda
e0a8469354
fix for sequence point warning
2015-09-08 13:42:52 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
David Rowe
99c1e06201
Code tidying
2015-09-08 13:25:15 -07:00
Anthony J. Thibault
c728cd4c4c
Fix for RenderableParticleffectEntityItem assert.
...
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0]. In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here. So, let's be safe and early
return when the number of particles is 0.
2015-09-08 12:03:41 -07:00
Stephen Birarda
9a8bd607b5
Merge pull request #5729 from rudi-c/build_docs_and_fixes
...
Build docs and dependency fixes
2015-09-08 11:29:15 -07:00
David Rowe
cdd5e68815
Add colorStart and colorFinish entity particle properties
2015-09-08 11:28:53 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Stephen Birarda
c49088846f
add an alias for AvatarDataSequenceNumber
2015-09-08 08:26:14 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
James B. Pollack
670c5ee484
Merge pull request #5723 from jherico/lisa
...
Toggle mute while holding the hydras
2015-09-06 21:45:47 -07:00
Rudi Chen
b703ce01fb
Make sure libdl is linked after libcrypto.
...
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
2015-09-06 21:42:02 -04:00
David Rowe
16346dd717
Fix some build warnings
2015-09-06 16:20:46 -07:00
David Rowe
47b27a3280
Add alphaStart and alphaFinish entity particle properties
2015-09-05 16:30:01 -07:00
David Rowe
042384b5b0
Tidy and finish alpha and alphaSpread
2015-09-05 14:51:48 -07:00
David Rowe
1b3d125cb3
Add alphaSpread entity particle property
2015-09-05 14:39:10 -07:00
Brad Hefta-Gaub
1df3a8f814
Merge pull request #5727 from jherico/marge
...
Procedural rendering for box & sphere entities
2015-09-05 12:43:21 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
8b296f53e6
Short-circuit radius values and interpolation when can
2015-09-05 11:13:48 -07:00
David Rowe
8d85309925
Use cubic interpolation instead of cosine
2015-09-05 10:50:05 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
Anthony Thibault
083c5b6738
Merge pull request #5721 from howard-stearns/default-avatar-for-animations
...
avatar animation defaults
2015-09-04 17:06:53 -07:00
Brad Davis
644e81e20b
Toggle mute while holding the hydras
2015-09-04 16:19:58 -07:00
David Rowe
c9cf426dba
Fix EntityPropertyList merge
2015-09-04 15:31:21 -07:00
Howard Stearns
086afc47b1
Avatar animations on by default. (Using the now old animation machinery.)
...
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
2015-09-04 14:24:37 -07:00
Brad Hefta-Gaub
21afafd4e6
fix hold action with zero offsetLength
2015-09-04 14:07:12 -07:00
David Rowe
18bc7befee
Merge branch 'master' into 20669
...
Conflicts:
libraries/networking/src/udt/PacketHeaders.cpp
libraries/networking/src/udt/PacketHeaders.h
2015-09-04 13:49:46 -07:00
David Rowe
c910da7179
Add radiusStart and radiusFinish entity particle properties
2015-09-04 12:27:18 -07:00
Stephen Birarda
875d10575f
add filename rename somehow missed in previous commit
2015-09-04 12:43:43 -06:00
Stephen Birarda
3875a7d881
fix bad copy on merge to FileResourceRequest
2015-09-04 12:39:35 -06:00
Stephen Birarda
ed19987b7d
resolve conflicts on merge with upstream/master
2015-09-04 12:31:46 -06:00
Anthony J. Thibault
5882ec02d0
Merge branch 'master' into ajt/new-anim-system
2015-09-04 11:05:29 -07:00
Anthony J. Thibault
3f258c89b4
Fix transition from AG+Rig to AG only.
2015-09-04 11:03:59 -07:00
Andrew Meadows
5d40517edd
Merge pull request #5706 from sethalves/polyvox-again
...
Polyvox improvements
2015-09-04 10:32:36 -07:00
Seth Alves
1b92ae95d7
put glm:: before vec3
2015-09-04 09:41:53 -07:00
Seth Alves
8c3bea6d0d
Merge pull request #5713 from AndrewMeadows/flerovium
...
fix collision shape of avatars
2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Seth Alves
72322c0270
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-04 09:12:32 -07:00
Brad Hefta-Gaub
762bed8223
Merge pull request #5715 from jherico/apu
...
Fix mirror to display on Oculus
2015-09-04 09:06:40 -07:00
