Philip Rosedale
c81053fc83
Merge pull request #5318 from samcake/punk
...
Fixing the ImageOverlay Bug
2015-07-13 22:25:46 -07:00
Clément Brisset
a432752c39
Merge pull request #5316 from ctrlaltdavid/20604
...
QA for #20604 - Add an "is looking at me" indicator above avatars' heads
2015-07-13 16:40:11 -07:00
Sam Gateau
f08c608195
Remove dead code
2015-07-13 16:33:04 -07:00
Sam Gateau
5555ccd225
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-13 16:19:09 -07:00
Sam Gateau
4743bbad80
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
2015-07-13 16:18:39 -07:00
Clément Brisset
c99382ee74
Merge pull request #5287 from ctrlaltdavid/20607
...
CR for Job #20607 - Interface upgrade message has bad formatting
2015-07-13 16:07:17 -07:00
Clément Brisset
24eb4c8263
Merge pull request #5309 from sethalves/quiet-compiler
...
quiet compiler
2015-07-13 15:55:35 -07:00
David Rowe
59f456a2f2
Add an "is looking at me" indicator above avatars' heads
...
Menu item: Developer > Avatar > Show Who's Looking at Me
2015-07-13 14:16:39 -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
c17c9f1818
quiet compiler
2015-07-12 10:29:43 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Sam Gateau
98f10e72ec
fix the wrong function name that happened missing a merge
2015-07-10 15:20:49 -07:00
Andrew Meadows
9cb7e86877
cleanup of AvatarActionHold deserialization
2015-07-10 12:34:12 -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
Andrew Meadows
1759f0553d
Merge pull request #5290 from BingShearer/CrashFixes
...
Crash fixes
2015-07-10 10:42:47 -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
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
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -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
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
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
Seth Alves
2dc4922da3
bring over code from entity-level-locking branch
2015-07-09 15:23:05 -07:00
Seth Alves
5312beeaf4
if an action changes its own arguments, cause reserialisation
2015-07-09 14:50:31 -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
050c472d6a
Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation
2015-07-09 13:39:37 -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
Seth Alves
d197bf2a85
use palm rotation data in hold action
2015-07-09 12:18:32 -07:00
Seth Alves
08d63b7fd8
first attempt at palm rotation
2015-07-09 11:03:02 -07:00
Brad Davis
2fff560ff9
Fixing log file viewer
2015-07-09 09:54:35 -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
Brad Davis
63dfd570f1
Adding priority support to GenericThread
2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81
Move file log persistence to a separate thread
2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Brad Davis
b173ac397c
Merge pull request #5278 from samcake/yellow
...
Adding more NSight instrumentation
2015-07-08 20:28:18 -07:00
Brad Davis
625cc86f83
Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
...
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -07:00
ZappoMan
7790e35d24
added bytes consumed result to decode, and exit early after bytes consumed
2015-07-08 18:19:12 -07:00
