Philip Rosedale
220e79a6a9
Merge pull request #3363 from ey6es/metavoxels
...
Metavoxel fixes: added wireframe option, fixed shadow menu group, make sure edit colors are either 100% opaque or 100% transparent, fix deferred lighting/ambient occlusion when glow effect disabled, save metavoxels.dat regularly.
2014-09-05 15:33:20 -07:00
Andrzej Kapolka
c88afc6b81
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-05 15:07:02 -07:00
Philip Rosedale
fec0e73223
Merge pull request #3354 from chansensturm/audio-filter
...
New coordinate calculations for head penumbra filter
2014-09-05 15:00:24 -07:00
Andrzej Kapolka
e476119bd1
Timer should be a child of the server object.
2014-09-05 14:51:14 -07:00
Andrzej Kapolka
742989a0e4
Save metavoxel data regularly, as with voxel data.
2014-09-05 14:35:32 -07:00
Andrzej Kapolka
37b4fe5166
Fix for deferred lighting/ambient occlusion when glow effect is disabled.
2014-09-05 14:16:12 -07:00
Andrzej Kapolka
98c51f87d2
Make sure edit colors are either 100% opaque or 100% transparent.
2014-09-05 14:00:27 -07:00
Andrzej Kapolka
b278857091
Wireframe option, fix for shadow menu group.
2014-09-05 13:51:22 -07:00
Leonardo Murillo
c2db0c6a30
Merge pull request #3360 from huffman/fix-domain-server
...
Revert the revert and fix domain server
2014-09-05 12:39:07 -06:00
Ryan Huffman
b0a0760be2
Update ShutdownEventListener to not stop event handling
2014-09-05 11:26:22 -07:00
Ryan Huffman
38a14c3864
Reapply "Update assignment client to close on WM_CLOSE message on Windows"
...
This reverts commit a603453cf2
2014-09-05 11:19:36 -07:00
Leonardo Murillo
7b1ed496de
Merge pull request #3358 from highfidelity/revert-3311-fix-wm-close
...
Revert "Update assignment client to close on WM_CLOSE message on Windows...
2014-09-05 12:05:27 -06:00
Leonardo Murillo
a603453cf2
Revert "Update assignment client to close on WM_CLOSE message on Windows"
2014-09-05 11:36:56 -06:00
Brad Hefta-Gaub
c4baf86f9d
Merge pull request #3351 from Atlante45/rec_file_format_tweaks
...
New Recorder/ControlACs UI
2014-09-04 23:09:42 -07:00
Brad Hefta-Gaub
9648c0d64e
Merge pull request #3343 from AndrewMeadows/ragdoll
...
Ragdoll Part 12: first pass avatar skeleton collides with voxels
2014-09-04 23:09:08 -07:00
Craig Hansen-Sturm
fc0a206985
code review comments
2014-09-04 22:57:02 -07:00
Philip Rosedale
886add11db
Merge pull request #3342 from ey6es/metavoxels
...
Very basic beginnings of an implementation of the dual contour algorithm, including necessary data representation and tools.
2014-09-04 21:46:14 -07:00
Craig Hansen-Sturm
fe0b9825d0
new coordinate calculations for head penumbra filter
2014-09-04 18:10:29 -07:00
Andrzej Kapolka
c340445f33
Hopefully, a fix for the Windows build; looks like "near" is a keyword.
2014-09-04 17:42:33 -07:00
Andrzej Kapolka
b275af48ed
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-04 17:26:34 -07:00
Andrzej Kapolka
83d209dbdc
Remove unused variables.
2014-09-04 17:26:01 -07:00
Andrzej Kapolka
137d3738fc
Fix for preview render.
2014-09-04 17:23:09 -07:00
Andrzej Kapolka
21f3f2b90e
Switch to deferred lighting for metavoxels.
2014-09-04 17:17:44 -07:00
Clément Brisset
fb8b3020e5
Merge pull request #3353 from ZappoMan/virtualEntities
...
fix couple of Entities issues: possible static memory corruption, sphere colors
2014-09-04 16:23:38 -07:00
ZappoMan
931e5fa408
fix potential static memory corruption
2014-09-04 15:43:51 -07:00
Andrew Meadows
27621b316d
clarify how the size of the cube is computed
2014-09-04 15:41:24 -07:00
Andrew Meadows
7cde6811ca
remove unecessary AACube::operator<()
2014-09-04 15:21:19 -07:00
Andrew Meadows
faf31f268e
use QHash, not QVector, for Octree content query
2014-09-04 15:20:07 -07:00
ZappoMan
e4deb59892
fix sphere colors
2014-09-04 15:00:52 -07:00
Atlante45
d7e135c831
Changed 2 icons
2014-09-04 14:58:30 -07:00
Atlante45
d2ba1ea769
Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks
2014-09-04 14:36:14 -07:00
Clément Brisset
4940615a83
Merge pull request #3350 from huffman/19935
...
Code Review for Job #19935
2014-09-04 12:36:51 -07:00
Ryan Huffman
d54dc5f2aa
Merge branch 'master' of github.com:highfidelity/hifi into 19935
...
Conflicts:
interface/src/Menu.h
2014-09-04 12:05:17 -07:00
Philip Rosedale
e6ba730c3e
Merge pull request #3352 from ZappoMan/virtualEntities
...
tweaks to butterflies, animation, plus reformatting to match coding standard
2014-09-04 11:42:44 -07:00
ZappoMan
ac45a56bf9
tweaks to butterflies, animation, plus reformatting to match coding standard
2014-09-04 11:40:32 -07:00
Clément Brisset
cc6d70c5ab
Merge pull request #3336 from huffman/19995
...
Code Review for Job #19995
2014-09-04 11:37:35 -07:00
Atlante45
c0a7334010
Fixed flipped icons
2014-09-04 11:34:02 -07:00
Stephen Birarda
2678bd3d9e
Merge pull request #3348 from ZappoMan/virtualEntities
...
patch for possible static memory corruption on large edit entity messages
2014-09-04 10:48:59 -07:00
Brad Hefta-Gaub
0d69122ec1
Merge pull request #3344 from huffman/19944
...
Code Review for Job #19944
2014-09-04 10:25:53 -07:00
Brad Hefta-Gaub
02af53c8e8
Merge pull request #3349 from AndrewMeadows/inertia
...
fix for bad avatar bounding shape on resize
2014-09-04 10:25:27 -07:00
Andrew Meadows
1e19566e93
fix for bad avatar bounding shape on resize
2014-09-04 09:53:07 -07:00
ZappoMan
957991b67e
patch for possible static memory corruption on large edit entity messages
2014-09-04 09:52:26 -07:00
Brad Hefta-Gaub
100f9c9ac4
Merge pull request #3347 from birarda/domain-connect-debug
...
add debug to show that domain connection is being attempted
2014-09-04 09:30:29 -07:00
Stephen Birarda
e338c600c3
add debug to show that domain connection is being attempted
2014-09-04 09:29:29 -07:00
Atlante45
ef51782f92
New ControlACs UI
2014-09-03 20:32:18 -07:00
Atlante45
417393c22e
New Recorder UI
2014-09-03 20:31:57 -07:00
Atlante45
18fdb340c1
extended toolBars.js
2014-09-03 20:30:15 -07:00
Philip Rosedale
cdaf59c962
Merge pull request #3346 from ZappoMan/virtualEntities
...
More Entities work
2014-09-03 20:09:36 -07:00
ZappoMan
68d2be97f7
formatting fixes
2014-09-03 19:46:33 -07:00
ZappoMan
be7a03b97e
flock of butterflies as entities
2014-09-03 19:41:53 -07:00
