Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Seth Alves
20f173a474
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 19:36:09 -07:00
Brad Hefta-Gaub
a3e1987078
Merge pull request #5176 from huffman/fix-raypicking-crash
...
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Seth Alves
f284e9d070
quiet compiler
2015-06-22 07:18:30 -07:00
Ryan Huffman
1371f775ee
Add mutex lock around access to Model::_calculatedMeshPartOffset
2015-06-19 16:51:13 -07:00
Ryan Huffman
a7f291154b
Add lock around recalculateMeshPartOffsets call
2015-06-19 16:28:58 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Ryan Huffman
1734d5e584
Fix recalculateMeshBoxes being called outside of mutex
2015-06-19 15:05:55 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Ryan Huffman
35f9d49c06
Fix DrawOverlay3D::getOpaquePipeline invalid signature
2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Sam Gateau
873955b17e
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851
Merge pull request #5168 from samcake/daft
...
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
Atlante45
9c7f24eeb6
Add culled option for simple programs
2015-06-19 16:50:38 +02:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Sam Gateau
fb42613344
Fixing transparency that i just broke
2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1
Merge pull request #5145 from Atlante45/text
...
Bring back display names
2015-06-18 11:25:45 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
ZappoMan
383a2c3d63
another attempt
2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc
first cut and removing openGl dependency in shared
2015-06-18 09:30:34 -07:00
Atlante45
26e8c490c3
constexpr not handled on windows
2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7
Make array size a constexpr
2015-06-18 15:23:53 +02:00
Atlante45
30fbd37645
Transmit normal to text rendering shader
2015-06-18 15:23:52 +02:00
Atlante45
8a3a7e5b7f
Reorder triangle strip
2015-06-18 15:23:50 +02:00
Atlante45
70a020c7e3
BevelRect use triangle strips
2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032
Cleanup TextRenderer3D methods args
2015-06-18 15:23:49 +02:00
Atlante45
ca98b378df
Adjust sdf frag shader alpha correctly
2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32
Fix bevel quads
2015-06-18 15:22:48 +02:00
samcake
89fe1c47be
preping for debug the jobs
2015-06-18 13:02:06 +02:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
ZappoMan
58ee5217e3
fix some warnings
2015-06-17 14:08:02 -07:00
Brad Davis
5ded9e7eb9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 10:50:01 -07:00
ZappoMan
e9bf553254
CR feedback
2015-06-17 09:59:38 -07:00
ZappoMan
af5a910f58
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix
2015-06-17 09:36:16 -07:00
ZappoMan
8162c37013
cleanup
2015-06-17 09:33:15 -07:00
ZappoMan
0e18c75b0b
cleanup
2015-06-17 09:23:12 -07:00
ZappoMan
ea98581d22
reorganize files to cleanup headers
2015-06-17 09:18:00 -07:00
