Brad Hefta-Gaub
8c15116190
fix auto-hide logic in depthReticle
2016-04-06 11:00:43 -07:00
Brad Hefta-Gaub
08a19c0471
Merge pull request #7554 from jherico/load_stutter2
...
Addressing stuttering in the frame while loading content - Part 2
2016-04-05 09:45:31 -07:00
Brad Hefta-Gaub
3fee1abd2d
Merge pull request #7574 from zzmp/guard/octree-del
...
Hold onto octree child after creation
2016-04-05 09:45:00 -07:00
Brad Hefta-Gaub
ff4f693267
Merge pull request #7553 from zzmp/fix/tex-invoke-method
...
Fix ImageReader threading issues
2016-04-04 18:29:24 -07:00
Zach Pomerantz
ac30aed948
Hold onto octree child after creation
2016-04-04 17:52:41 -07:00
Brad Davis
c168e2cc58
PR feedback
2016-04-04 16:53:30 -07:00
Seth Alves
69bb0ebd74
Revert "faster kinematic motion for entities"
2016-04-04 16:11:54 -07:00
Seth Alves
c48a67b933
Merge pull request #7544 from AndrewMeadows/faster-kinematics
...
faster kinematic motion for entities
2016-04-04 15:26:32 -07:00
Zach Pomerantz
aa0245b9c2
Debug when limit of checkins reached
2016-04-04 12:22:03 -07:00
Andrew Meadows
a08ab8e127
restore setFlag in simulateKinematicMotion()
2016-04-04 11:48:45 -07:00
Andrew Meadows
a53cb2e532
use _gravity rather than _acceleration
...
also tweaks and comments about supporting low gravity
2016-04-04 11:10:50 -07:00
Zach Pomerantz
6660f0959b
Merge pull request #7557 from hyperlogic/tony/reset-thread-priority
...
ModelCache: reset thread priority back to normal
2016-04-04 11:07:18 -07:00
Zach Pomerantz
2bd53935fc
Merge branch 'master' of github.com:highfidelity/hifi into fix/tex-invoke-method
2016-04-04 11:00:03 -07:00
Zach Pomerantz
d23d0f6432
Restore thread priority after tex parsing
2016-04-04 10:57:04 -07:00
Anthony J. Thibault
d1898eeac6
ModelCache: reset thread priority back to normal
...
Based on PR feedback on https://github.com/highfidelity/hifi/pull/7550
2016-04-04 10:31:36 -07:00
Brad Davis
d98abbc7df
First pass at threaded texture transfers
2016-04-04 10:23:01 -07:00
samcake
2dd1b14b32
Merge pull request #7551 from jherico/load_stutter
...
Working on addressing stuttering in the frame while loading content - Part 1
2016-04-04 10:04:51 -07:00
Seth Alves
278fe93f2b
Merge pull request #7546 from zzmp/fix/release-skyboxes
...
Release skybox textures when rendering stars
2016-04-04 09:23:54 -07:00
Brad Davis
667c27866e
Pushing texel format translation into header
2016-04-03 20:41:35 -07:00
Brad Davis
4f373937f9
Additional performance markers
2016-04-03 20:41:34 -07:00
Andrew Meadows
74058ac049
more correct moving test for ballistic kinematics
2016-04-03 19:15:16 -07:00
Andrew Meadows
7ea81f3937
add and fix comments
2016-04-03 19:15:01 -07:00
Brad Hefta-Gaub
ecaaa34576
Merge pull request #7547 from howard-stearns/lock-trees-on-import-export
...
Lock trees on import export
2016-04-03 14:23:54 -07:00
Brad Hefta-Gaub
4a78ad877e
Merge pull request #7550 from hyperlogic/tony/avatar-thrasher
...
Model: fixed two crash issues when changing avatars
2016-04-03 13:47:35 -07:00
Zach Pomerantz
79e5286335
Fix ImageReader threading issues
2016-04-03 12:38:18 -07:00
Zach Pomerantz
fc19b60f8a
Avoid setting null texs on uncaching models
2016-04-03 11:25:48 -07:00
Anthony Thibault
07cfa13a82
GeometryReader: We should delete the fbxGeometry if we've lost the resource.
2016-04-03 09:23:53 -07:00
Anthony Thibault
865a77ae20
Model: fixed two crash issues when changing avatars
...
* When the GeometryReader has the last ref to the GeometryResource ptr
It needs to hold on to the reference until invokeMethod is completed.
Otherwise, invokeMethod will call a method on a deleted object, leading
to memory corruption or crashes.
* When the Model URL is changed, the clusterMatrices are invalided and the
RenderItemsSets are cleared. However, there still might be renderItems in
the scene pending changes list that might refer to those RenderItems and their
clusterMatrices. We need to guard against this access to prevent reading from
memory that was previously freed.
Both of these issues were uncovered using the [avatar-thrasher](https://gist.github.com/hyperlogic/d82a61d141df43d576428501a82c5ee6 ) test script.
2016-04-02 21:48:22 -07:00
Anthony Thibault
d899d7d696
Merge pull request #7530 from hyperlogic/tony/culling-fixes
...
Culling fixes
2016-04-01 21:29:34 -07:00
Seth Alves
6025a66fa1
Merge pull request #7532 from Atlante45/feat/delayed-decrease
...
Delay congestion epochs first decrease
2016-04-01 18:07:43 -07:00
Andrew Meadows
0830c55bcf
getLocalEverything->getLocalTransformAndVelocities
2016-04-01 17:48:56 -07:00
Brad Hefta-Gaub
c4abec4fb2
Merge pull request #7541 from jherico/fix_simple_qml_message
...
Fix passing of simple string message types from QML to scripts
2016-04-01 15:20:39 -07:00
howard-stearns
cec4175e9d
whitespace
2016-04-01 15:00:51 -07:00
howard-stearns
b5cbd7720e
Lock entity tree on export, and clipboard on import.
2016-04-01 14:56:56 -07:00
Zach Pomerantz
eb2e254aa6
Release px resources when unused
2016-04-01 14:46:52 -07:00
Zach Pomerantz
0e9b783ca3
Release skybox texs when not rendering
2016-04-01 14:46:50 -07:00
Brad Hefta-Gaub
5f710782eb
Merge pull request #7528 from howard-stearns/fbx-reader-safety
...
Fbx reader safety
2016-04-01 13:34:17 -07:00
Brad Hefta-Gaub
0f9a6bb37b
Merge pull request #7543 from sethalves/fix-scriptname-case
...
try again on local-scripts
2016-04-01 13:33:45 -07:00
Andrew Meadows
20914df330
fix warning about signed/unsigned comparison
2016-04-01 13:31:14 -07:00
Andrew Meadows
de5fe705a3
optimize Bullet broadphase using collision groups
2016-04-01 13:14:03 -07:00
Andrew Meadows
25fbf926df
CollisionWorld only updates _active_ Aabbs
...
we manually set/clear active state of static objects
that need their Aabbs updated
also fixing a bug when starting kinematic motion
2016-04-01 13:14:03 -07:00
Andrew Meadows
e1602b57fa
faster isNaN checks
2016-04-01 13:14:03 -07:00
Andrew Meadows
442b52313f
faster kinematic motion calculations
2016-04-01 13:14:03 -07:00
Andrew Meadows
3f52d237ed
adding Bullet profiler instances for better stats
2016-04-01 13:14:03 -07:00
Brad Hefta-Gaub
a3734eba00
Merge pull request #7535 from birarda/suppress-more
...
add suppression for ring buffer and sequence number messages
2016-04-01 13:04:32 -07:00
Brad Hefta-Gaub
830c7a90e1
Merge pull request #7537 from zzmp/fix/fst
...
Keep textureBaseUrl for fst models
2016-04-01 12:28:23 -07:00
Seth Alves
56b84b3106
fix display of path of selected file in running-scripts window
2016-04-01 12:05:49 -07:00
Seth Alves
35affe26e3
trying again on script loading changes
2016-04-01 11:52:47 -07:00
Zach Pomerantz
489a2fd0b9
Persist tex base url across caching
2016-04-01 11:32:29 -07:00
Zach Pomerantz
2daf0c4da4
Init tex base url in Geometry ctor
2016-04-01 11:32:13 -07:00
