Brad Davis
|
3db3676fae
|
Fixing compile failure
|
2015-07-10 15:26:22 -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 |
|
samcake
|
014802fd45
|
Merge pull request #5277 from venkatn93/gpuquery
GPU Query infrastructure
|
2015-07-10 11:59:08 -07:00 |
|
samcake
|
09ea9b751f
|
Merge pull request #5300 from hyperlogic/ajt/transform-unit-test
Added unit test for shared/transform.
|
2015-07-10 11:35:13 -07:00 |
|
Niraj Venkat
|
2e5fd04d9e
|
Fix to get build working on Linux
|
2015-07-10 11:27:34 -07:00 |
|
Andrew Meadows
|
1759f0553d
|
Merge pull request #5290 from BingShearer/CrashFixes
Crash fixes
|
2015-07-10 10:42:47 -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
|
33016e2797
|
Merge pull request #5293 from jherico/bart
More profiling ranges and updated performance testing scripts
|
2015-07-09 19:10:45 -07:00 |
|
Brad Hefta-Gaub
|
af20969eb9
|
Merge pull request #5298 from jherico/lisa
Restore audio scope
|
2015-07-09 19:03:29 -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 |
|
Anthony J. Thibault
|
474a643611
|
Added unit test for shared/transform.
The getInverseMat is currently failing, it shows the issue that was affecting the
mirror rendering.
|
2015-07-09 18:53:12 -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 |
|
Brad Davis
|
a92a7980d7
|
Restore audio scope
|
2015-07-09 17:49:25 -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 |
|
Niraj Venkat
|
007d662db1
|
Re-added for shouldRenderEntities
|
2015-07-09 17:40:14 -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 |
|
Seth Alves
|
d0d0b2a143
|
Merge pull request #5295 from birarda/master
potential fix for windows domain connect cycling
|
2015-07-09 17:04:06 -07:00 |
|
Niraj Venkat
|
bd91daf712
|
Removing debug code
|
2015-07-09 16:27:23 -07:00 |
|
Niraj Venkat
|
adf5b95835
|
Changing formatting
|
2015-07-09 16:25:29 -07:00 |
|
Niraj Venkat
|
52095fd38d
|
Fixing merge
|
2015-07-09 16:23:40 -07:00 |
|
Niraj Venkat
|
1dce5f80cc
|
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
|
2015-07-09 16:17:58 -07:00 |
|
Brad Davis
|
214405a0e5
|
Fixing typo
|
2015-07-09 16:06:27 -07:00 |
|
Stephen Birarda
|
efb89c281f
|
fix creation of QTimer parented by NodeList
|
2015-07-09 16:02:29 -07:00 |
|
Stephen Birarda
|
a4f1145f06
|
fix QTimer connection to nodeList
|
2015-07-09 16:01:41 -07:00 |
|
Stephen Birarda
|
408ecb9735
|
move domain server check in timer to node thread
|
2015-07-09 15:59:32 -07:00 |
|
Brad Davis
|
446f800aee
|
More profiling ranges and updated performance testing scripts
|
2015-07-09 15:43:30 -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 |
|
Seth Alves
|
fa06f50841
|
fix header comment
|
2015-07-09 15:34:03 -07:00 |
|
Sam Gateau
|
e14f10ed0f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
|
2015-07-09 15:29:17 -07:00 |
|
Bing Shearer
|
99c563602f
|
Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist.
|
2015-07-09 15:25:37 -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 |
|
Seth Alves
|
5312beeaf4
|
if an action changes its own arguments, cause reserialisation
|
2015-07-09 14:50:31 -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 |
|
Bing Shearer
|
85f6fdb8cf
|
Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample)
|
2015-07-09 14:20:10 -07:00 |
|
Bing Shearer
|
25708678f6
|
Fixed shutdown procedure for Datagrams so that there is no crash on exit
|
2015-07-09 14:18:53 -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 |
|
Seth Alves
|
050c472d6a
|
Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation
|
2015-07-09 13:39:37 -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 |
|