Seth Alves
4c1f815870
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc
Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum
...
resurrection of threadsafe ViewFrustum
2016-05-10 09:06:38 -07:00
Andrew Meadows
59c6a6dfea
Merge pull request #7825 from sethalves/linux-qol
...
Linux qol
2016-05-09 15:34:10 -07:00
Brad Hefta-Gaub
2c0204b0d6
Merge pull request #7821 from Atlante45/fix/collision-sound
...
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Seth Alves
0ab0409979
revert accidental change
2016-05-07 17:48:37 -07:00
Seth Alves
91ff851bf8
fix call to queueEditEntityMessage
2016-05-07 16:59:54 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Seth Alves
073d845bb5
show with debug icons when someone else is the simulation owner
2016-05-05 18:33:01 -07:00
Andrew Meadows
bcf2cc8074
use references not pointers for ViewFrustums
...
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
2016-05-05 18:28:27 -07:00
Seth Alves
cb523a3a71
disable webSurface differently
2016-05-05 16:01:05 -07:00
Seth Alves
b5a3baf322
Merge branch 'master' of github.com:highfidelity/hifi into linux-qol
2016-05-05 15:55:37 -07:00
Atlante45
07adef9465
Fix entities collision sounds
2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
49d02b802a
Merge pull request #7719 from zzmp/feat/resource-prefetch
...
Add prefetching to exposed caches
2016-05-02 18:04:26 -07:00
Zach Pomerantz
13945aa4d9
Annotate all virtual fns with override
2016-04-30 13:48:59 -07:00
Zach Pomerantz
bc8a171fde
Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch
2016-04-27 11:55:24 -07:00
Andrew Meadows
b5ad989811
more optimized uses of EntityItem::getDimensions()
2016-04-27 11:04:22 -07:00
Brad Hefta-Gaub
b597f7001b
fix auto resize
2016-04-26 15:13:11 -07:00
Seth Alves
c9df446879
web-entities don't yet work right on Linux
2016-04-24 08:15:10 -07:00
Seth Alves
e2025b0d1f
lock entity-tree before accessing entities
2016-04-21 15:27:15 -07:00
Zach Pomerantz
c096b0dfa1
Add TextureType to NetworkTexture for reflection
2016-04-20 20:18:22 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
samcake
cadb53b703
Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more
2016-04-18 18:24:27 -07:00
Brad Hefta-Gaub
55010cebb7
remove unhelpful comment
2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
c26115cf2e
one small tweak
2016-04-18 11:40:17 -07:00
Brad Hefta-Gaub
f6c75d0530
cleanup
2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
d1f6b371c9
cleanup
2016-04-18 10:27:12 -07:00
Brad Hefta-Gaub
a4f562672a
cleanup
2016-04-18 10:08:33 -07:00
Brad Hefta-Gaub
9db0fe0d11
switch to using QSharedPointer for _entitiesScriptEngine
2016-04-18 09:46:04 -07:00
Brad Hefta-Gaub
87078b1ea2
first cut at resetting entities script engine on domain change
2016-04-16 11:09:23 -07:00
Brad Hefta-Gaub
91334d6a39
Merge pull request #7664 from ZappoMan/reduceJointProperties
...
only export joint values if they've been explicitly set by scripts
2016-04-14 15:30:04 -07:00
Brad Hefta-Gaub
b48503a82d
only export joint values if they've been explicitly set by scripts
2016-04-13 19:52:50 -07:00
Zach Pomerantz
7a15339631
Use AnimationCache for models
2016-04-13 15:44:47 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
Brad Davis
8e1e11a6f8
Merge pull request #7615 from zzmp/fix/amd-particles
...
Add explicit layout to textured particle shader
2016-04-08 13:19:41 -07:00
Brad Hefta-Gaub
7ba08dd137
Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix
...
Reading animation properties without an entityTree lock is considered harmful
2016-04-08 10:37:17 -07:00
Zach Pomerantz
4e3ab73941
layout std140 in particle shader
2016-04-07 17:27:51 -07:00
Anthony J. Thibault
8f530ceaf9
Reading animation properties without an entityTree lock is considered harmful
...
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
2016-04-07 13:42:40 -07:00
Zach Pomerantz
1e710712cc
Check entities scripting thread before signaling it
2016-04-06 11:19:07 -07:00
Anthony J. Thibault
6a7a572b53
Model: Toggling Physics > Draw Collision Hulls works again
...
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
2016-04-05 11:06:24 -07:00
Zach Pomerantz
0e9b783ca3
Release skybox texs when not rendering
2016-04-01 14:46:50 -07:00
Zach Pomerantz
e4cba14333
Avoid recreating model items when adding to scene
2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983
Use default texs for empty json
2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3
Rearrange model entity render to reduce flicker
2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f
Fixup model on tex load
2016-03-31 10:46:51 -07:00
Brad Hefta-Gaub
03f9a2b46f
more optimization in find best zone
2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
28978c8adb
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
2016-03-30 17:49:30 -07:00
Zach Pomerantz
01db2be6b8
Avoid JSON parsing texs every render cycle
2016-03-30 14:48:57 -07:00
Zach Pomerantz
e4f12c81e0
Get remap textures through getter
2016-03-30 14:11:36 -07:00
