ZappoMan
ef8feec91a
fix referentials corruption and removed some debugging
2014-08-26 10:42:46 -07:00
ZappoMan
4e38cb7c68
more debugging of referentials
2014-08-25 15:12:29 -07:00
ZappoMan
d6873f7b6c
added some debugging for referentials
2014-08-25 14:48:08 -07:00
ZappoMan
1764839223
get basics of referentials working
2014-08-25 14:07:01 -07:00
ZappoMan
58759d344f
cleanup in prep for PR
2014-08-25 10:56:43 -07:00
ZappoMan
0207649d0c
debug cleanup
2014-08-22 10:54:05 -07:00
ZappoMan
17426a1c71
removed tons of debugging
2014-08-20 17:47:16 -07:00
ZappoMan
ef86d86234
split out entity rendering into subclasses, improved rendering of models
2014-08-20 15:49:50 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
Clément Brisset
a6f0c9bb01
Merge pull request #3288 from nivardus/19616
...
Code Review for Job #19616
2014-08-18 14:44:29 -07:00
Clément Brisset
ddc67a8edb
Merge pull request #3285 from AndrewMeadows/ragdoll
...
Cleanup of Ragdoll API
2014-08-18 12:36:27 -07:00
Andrew Meadows
77047b0130
no NULL check on delete SkeletonModel::_ragdoll
2014-08-18 11:25:51 -07:00
AndrewMeadows
4b7208ac53
Merge pull request #3280 from huffman/19907
...
Code Review for Job #19907
2014-08-18 10:20:01 -07:00
Andrzej Kapolka
a2ec9898ad
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-15 16:34:25 -07:00
Andrzej Kapolka
668f6d3cfd
Support for shadows on heightmaps.
2014-08-15 16:13:47 -07:00
Atlante45
6592a6dca2
Fix for custom URL schemes
2014-08-15 10:28:22 -07:00
Philip Rosedale
28abc6ab2a
Merge pull request #3290 from ey6es/metavoxels
...
Big change in the way shared borders are handled in order to fix seams between blocks. Fixes for height/ray queries. Minimal rectangles for deltas, switch between PNG and deflated JPG encodings.
2014-08-15 07:57:46 -07:00
Bennett Goble
ca42aecd41
Merge branch 'master' into 19616
2014-08-14 20:52:55 -04:00
Andrzej Kapolka
05d6b628fa
Alllmost ready with the big edge sharing rejiggery.
2014-08-14 17:10:45 -07:00
Clément Brisset
c01e8339b1
Merge pull request #3287 from birarda/oculus-dk2
...
require presence of LibOVR for relative position from OculusManager
2014-08-14 15:59:23 -07:00
Stephen Birarda
e3bab8bdc8
require presence of LibOVR for relative position from OculusManager
2014-08-14 15:47:03 -07:00
Bennett Goble
e21392f553
Merge branch 'master' into 19616
2014-08-14 18:37:11 -04:00
Andrew Meadows
60d411ead5
cleanup Ragdoll API (less "ragdoll" qualifiers)
2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9
split SkeletonModel and Ragdoll classes apart
2014-08-14 14:29:03 -07:00
Andrew Meadows
ca4a23e532
use "visible joint positions" for MyAvatar only
2014-08-14 09:21:15 -07:00
Andrew Meadows
7852321152
merge upstream/master into andrew/ragdoll
2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5
less variability in verlet simulation loop count
2014-08-13 14:51:16 -07:00
Andrzej Kapolka
8c42a3a848
Ray query fix.
2014-08-13 11:30:05 -07:00
Andrzej Kapolka
56c6c3c972
Working on the height/ray queries.
2014-08-13 11:05:48 -07:00
Andrzej Kapolka
d00efe7f6d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-13 10:07:24 -07:00
Andrzej Kapolka
9c2d4776f9
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-08-12 18:21:23 -07:00
Andrzej Kapolka
21d6c3c48a
More work on edge rejiggery.
2014-08-12 18:21:04 -07:00
Stephen Birarda
4dce4c4919
link to ws2_32.lib if LibOVR is being linked to
2014-08-12 15:23:12 -07:00
Stephen Birarda
4bf7bbe0df
if enable VR mode is re-checked then attempt to re-connect to Oculus
2014-08-12 15:20:04 -07:00
Stephen Birarda
00087e81d8
remove a line of debug that shouldn't have made its way in
2014-08-12 14:44:49 -07:00
Stephen Birarda
a8e17e19a4
resolve conflicts on merge with upstream master
2014-08-12 14:43:30 -07:00
Stephen Birarda
1b5c229dd6
Merge pull request #3273 from PhilipRosedale/master
...
Fix bug with first person camera being laggy when flying
2014-08-12 14:42:07 -07:00
Philip Rosedale
9933c011d7
Remove filtered eye position from head
2014-08-12 14:31:40 -07:00
Leonardo Murillo
e12cf9015f
Merge pull request #3271 from birarda/take-out-the-trash
...
allow CL specific that an optional external be required
2014-08-12 14:30:17 -07:00
Philip Rosedale
a68af15b82
DDE Face tracker tweaks to start adding long term averaging
2014-08-12 14:26:14 -07:00
Stephen Birarda
75aedae300
integration of positional tracking with DK2
2014-08-12 14:12:13 -07:00
Andrzej Kapolka
ee01d85b5e
Attempting to remove some number magic.
2014-08-12 12:01:07 -07:00
Andrzej Kapolka
2c0f8ff57e
Working on rejiggering the heightfield tiles.
2014-08-12 10:56:15 -07:00
ZappoMan
76308738e0
added pruning support, some cleanup
2014-08-12 07:16:32 -07:00
Thijs Wenker
4ff7ff61e8
OSX compatibility with SDK 0.4.1
2014-08-12 13:25:22 +02:00
Thijs Wenker
87abc6b66a
Merge branch 'master' of https://github.com/worklist/hifi
2014-08-12 13:17:32 +02:00
Philip Rosedale
0e72c6a0b6
Merge pull request #3269 from ey6es/metavoxels
...
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
2014-08-12 00:40:14 -07:00
Ryan Huffman
cb76e3ead0
Merge branch 'master' of github.com:highfidelity/hifi into 19907
2014-08-11 18:44:31 -07:00
Ryan Huffman
4852fcc034
Add red border to main window when not connected to domain
2014-08-11 18:43:49 -07:00
Ryan Huffman
0296d0deeb
Add domain connection status to window title
2014-08-11 18:43:26 -07:00
