Seth Alves
848e5bcebf
this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit
2015-07-12 13:43:21 -07:00
Seth Alves
fb23eb0faf
Merge pull request #5301 from samcake/yellow
...
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
2015-07-12 11:36:03 -07:00
Seth Alves
87152a4de2
Merge pull request #5302 from AndrewMeadows/astatine
...
cleanup of ObjectActionSpring and AvatarActionHold
2015-07-12 11:17:09 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Brad Davis
c1b72db18d
Still trying to get jenkins builds to work
2015-07-10 16:00:51 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Brad Davis
200cbd7e8d
Merge pull request #5303 from ZappoMan/animationGlitch
...
fix motor proteins in cell science
2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162
fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change
2015-07-10 12:43:35 -07:00
Andrew Meadows
294c1ba367
always serialize ACTION_TYPE_SPRING
2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d
cleanup of ObjectActionSpring
2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b
handle case where action params are missing
2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5
add checks for NaN
2015-07-10 12:25:11 -07:00
samcake
014802fd45
Merge pull request #5277 from venkatn93/gpuquery
...
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
Niraj Venkat
2e5fd04d9e
Fix to get build working on Linux
2015-07-10 11:27:34 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Brad Hefta-Gaub
89231adc19
Merge pull request #5299 from jherico/homer
...
Performance optimizations in transform buffers and geometry cache
2015-07-09 19:16:15 -07:00
Brad Hefta-Gaub
74ef91550c
Merge pull request #5296 from venkatn93/master
...
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 18:54:06 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
Brad Davis
cf7f3336d0
Merge pull request #5297 from samcake/daft
...
Remove unecessary dependencies in DeferredLightingEffect
2015-07-09 17:51:26 -07:00
Andrew Meadows
270ea7af9e
Merge pull request #5292 from sethalves/palm-rotation
...
action changes to allow "hold" action to track palm rotation
2015-07-09 17:44:28 -07:00
Sam Gateau
11f2d74030
Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect
2015-07-09 17:33:25 -07:00
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -07:00
Seth Alves
bf6fce4e45
remove unneeded const
2015-07-09 17:05:15 -07:00
Niraj Venkat
bd91daf712
Removing debug code
2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 16:17:58 -07:00
Philip Rosedale
cac239ad88
Merge pull request #5291 from ZappoMan/waitToSendAllEdits
...
Allow Assignment Client scripts to do edits in their shutdown handler
2015-07-09 15:42:31 -07:00
Brad Hefta-Gaub
f0a1bc15a9
Merge pull request #5286 from samcake/daft
...
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
2015-07-09 15:23:45 -07:00
Seth Alves
2dc4922da3
bring over code from entity-level-locking branch
2015-07-09 15:23:05 -07:00
Sam Gateau
8c178d03df
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 15:16:52 -07:00
Brad Hefta-Gaub
81c74dda1f
Merge pull request #5289 from jherico/marge
...
Improve batched font rendering smoothing
2015-07-09 15:09:07 -07:00
samcake
1f13106f51
FIxed the issue on mac due to the abs function not correctly executing
2015-07-09 15:05:03 -07:00
ZappoMan
a8a4c99529
on script shutdown, wait to process all pending edit messages before ending the script engine
2015-07-09 15:01:16 -07:00
Brad Davis
06563264e2
Improve batched font rendering smoothing
2015-07-09 14:34:33 -07:00
Seth Alves
a01fb6f1dc
if an action changes its own arguments, cause reserialisation
2015-07-09 14:32:34 -07:00
Seth Alves
85f206d49d
if an action is updating its own arguments, cause updates to go out over network
2015-07-09 14:13:01 -07:00
Philip Rosedale
c4911dbbd4
Merge pull request #5288 from AndrewMeadows/arsenic
...
fix ObjectActionOffset logic
2015-07-09 12:22:23 -07:00
Brad Hefta-Gaub
489a8b4b3d
Merge pull request #5285 from jherico/homer
...
Move log file writing to a separate thread
2015-07-09 12:22:13 -07:00
Andrew Meadows
55207a8fb1
enforce coding standards
2015-07-09 11:59:28 -07:00
Andrew Meadows
ccf14b2e50
fix syntax error typo
2015-07-09 11:43:57 -07:00
Andrew Meadows
612e9649d8
fix update logic of ObjectActionOffset
2015-07-09 11:35:54 -07:00
Andrew Meadows
46bca30698
MotionState reports zero velocity for slow objects
...
This reduces the number of updates for an Entity that is effectively
at rest due to a balance between some spring action and gravity, but
nevertheless has a slight non-zero velocity at the end of each
simulation step.
2015-07-09 11:34:27 -07:00
Sam Gateau
2968286779
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 11:19:45 -07:00
Philip Rosedale
542a5f100a
Merge pull request #5280 from BingShearer/airhockey
...
Air Hockey UI Fix
2015-07-09 10:04:21 -07:00
Sam Gateau
110b009aa4
Less magic in this world
2015-07-09 09:55:25 -07:00
Sam Gateau
8f4a108441
Dead code and disable debug info
2015-07-09 09:37:35 -07:00
Sam Gateau
fb37af3e04
Removing dead code
2015-07-09 09:25:07 -07:00
Sam Gateau
e901d5cad0
Uncommented a block left behind...
2015-07-09 09:21:53 -07:00
Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Sam Gateau
6b229d8d2d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 03:45:55 -07:00
