Andrew Meadows
343998a4a8
Adding virtual destructor to Shape class
2014-03-04 09:55:08 -08:00
Andrew Meadows
3d426a24f1
Fixing build warnings
2014-03-04 09:54:34 -08:00
Andrew Meadows
d0ac8eec74
removing unused variable
2014-03-04 09:54:12 -08:00
Andrew Meadows
7ba5bc71ea
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
...
Conflicts:
interface/src/renderer/FBXReader.cpp
interface/src/renderer/Model.cpp
interface/src/renderer/Model.h
2014-03-04 09:01:24 -08:00
Andrew Meadows
4ef2067421
Use capsules for some joints and render them.
2014-03-03 17:49:24 -08:00
Andrew Meadows
1a8c10e132
Correcting a comment.
2014-03-03 17:35:52 -08:00
Andrew Meadows
f23dda7317
Less math for the same effect.
2014-03-03 17:34:16 -08:00
Philip Rosedale
d38df21960
Merge pull request #2181 from ZappoMan/bugfixes
...
particle deadlock and crash fixes a different way
2014-03-03 17:31:29 -08:00
Philip Rosedale
7ce427b35c
Merge pull request #2179 from ey6es/master
...
Better frame rates on loading by reading cached data from disk in worker thread, render billboards if we haven't loaded the models yet, use voxel LOD parameter to control avatar LODs, too.
2014-03-03 17:21:46 -08:00
ZappoMan
d01090afbc
reversing some changes
2014-03-03 17:13:06 -08:00
ZappoMan
493648b56e
reversing some changes
2014-03-03 17:06:46 -08:00
Andrzej Kapolka
64c4e58160
Tie the avatar LOD distance multiplier to the LOD parameter calculated for
...
voxels.
2014-03-03 16:34:28 -08:00
Andrzej Kapolka
f5eaa330d8
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-03 15:48:38 -08:00
Philip Rosedale
5c0ec0ff6b
Merge pull request #2175 from ZappoMan/bugfixes
...
Fixes to particle deadlock, and some other crashes
2014-03-03 15:42:09 -08:00
Andrzej Kapolka
75c9e44545
Render the billboard if we don't have both models. Closes #2178 .
2014-03-03 15:33:37 -08:00
Andrzej Kapolka
e9908aff7c
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-03 15:17:28 -08:00
Andrzej Kapolka
7ecfeeaba3
Do the actual reading of the reply on the worker thread. Otherwise, when we
...
read from the cache, we're reading synchronously from a file. Closes #2171 .
2014-03-03 15:16:13 -08:00
Philip Rosedale
dd41459b65
Merge pull request #2176 from ey6es/master
...
Don't simulate avatars when they're being rendered as billboards, fix QThreadStorage warning.
2014-03-03 14:58:16 -08:00
Andrzej Kapolka
9759cd70c0
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-03 14:20:21 -08:00
ZappoMan
f67891d7b5
Merge pull request #2174 from birarda/node-interest
...
keep known nodes alive when we receive an unprocessed packet from them
2014-03-03 14:03:19 -08:00
ZappoMan
3684359c5f
removed some debug
2014-03-03 13:57:05 -08:00
ZappoMan
98bf85173a
more octree locking cleanup
2014-03-03 13:54:07 -08:00
Andrzej Kapolka
85083d74bc
Fix for annoying "QThreadStorage" warning.
2014-03-03 13:39:01 -08:00
Andrzej Kapolka
252186450b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-03 12:53:45 -08:00
Stephen Birarda
1b7d24a79c
keep known nodes alive when we receive a packet from them
2014-03-03 12:49:46 -08:00
ZappoMan
573277b1fc
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
2014-03-03 12:49:46 -08:00
ZappoMan
fd47602945
various particle crash and deadlock fixes
2014-03-03 12:49:34 -08:00
Stephen Birarda
5c1ba4264a
Merge pull request #2173 from birarda/null-checks
...
fix a flipped NULL pointer check
2014-03-03 12:47:49 -08:00
Stephen Birarda
500f678595
fix a flipped null check
2014-03-03 12:47:26 -08:00
Andrew Meadows
1c0826d696
Add JointShapeInfo for joint shape calculations
2014-03-03 12:31:09 -08:00
Philip Rosedale
854a5dfe2f
Merge pull request #2169 from ZappoMan/bugfixes
...
Menu scripting bug fixes
2014-03-03 12:24:12 -08:00
ZappoMan
0285fe51e8
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
2014-03-03 12:14:11 -08:00
Andrzej Kapolka
89b207d8cb
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-03 12:14:08 -08:00
ZappoMan
cf71ad6f13
Merge pull request #2168 from PhilipRosedale/master
...
added rectangular range limits
2014-03-03 12:13:04 -08:00
Andrzej Kapolka
acd25a75d1
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-03 12:10:21 -08:00
ZappoMan
e4065f0440
Merge pull request #2167 from birarda/null-checks
...
remove some unnecessary null pointer checks
2014-03-03 12:09:42 -08:00
Andrzej Kapolka
0361f46832
Don't simulate avatars' models when they're being rendered as billboards.
...
Closes #2165 .
2014-03-03 12:09:38 -08:00
ZappoMan
8e553c7497
fix potential crash in setIsOptionChecked() added support for positioning separators
2014-03-03 12:03:56 -08:00
ZappoMan
1eeb2a5594
fix bug in editVoxels.js that wasn't deleting menus
2014-03-03 12:03:23 -08:00
Philip Rosedale
b845845af1
added rectangular range limits
2014-03-03 11:42:24 -08:00
Stephen Birarda
60eb588e96
remove some unecessary null pointer checks
2014-03-03 11:36:01 -08:00
Philip Rosedale
a2a90aa547
Merge pull request #2158 from ZappoMan/cruft_removal
...
Cruft removal, Bug fixes, and Audio.startDrumSound() in JS
2014-03-03 07:15:40 -08:00
ZappoMan
9d5e33d75d
removed unused highlight voxel
2014-03-03 04:09:33 -08:00
ZappoMan
37472c201c
added voxelDrumming as JS
2014-03-03 04:06:47 -08:00
ZappoMan
85b40f2d13
fix crash in Menu.isOptionChecked() if menu item doesn't exist
2014-03-03 04:05:44 -08:00
ZappoMan
372561195a
remove voxel drumming from C++
2014-03-03 04:00:06 -08:00
ZappoMan
59eefa314c
add support for Audio.startDrumSound() to allow drum sound procedural audio in JS
2014-03-03 03:17:16 -08:00
ZappoMan
011bc4f6cb
slightly less code to get it done
2014-03-03 01:11:03 -08:00
ZappoMan
d8d61c7361
move hydra finger painting from c++ to js
2014-03-03 01:06:48 -08:00
ZappoMan
2c7d9d7a06
removed unneeded class declaration
2014-03-03 00:35:46 -08:00
