Andrew Meadows
d537b4118d
Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes
2014-03-04 11:40:59 -08:00
Andrzej Kapolka
7117c5043f
Merge pull request #2193 from ey6es/master
...
Use different unused variable warning suppressor for GCC.
2014-03-04 11:24:25 -08:00
Andrzej Kapolka
6ff629dcfd
Use different unused variable warning suppressor for GCC.
2014-03-04 11:23:44 -08:00
Andrew Meadows
ea0bc52e12
removing unused variables
2014-03-04 09:56:06 -08:00
Andrew Meadows
e22e022252
Fixing warnings and out-of-range index.
2014-03-04 09:55:32 -08:00
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
ZappoMan
12996454f9
Merge pull request #2184 from PhilipRosedale/master
...
Improved gun with sounds, mouselook firing, damages voxels
2014-03-04 09:00:56 -08:00
ZappoMan
1a5b0ee02e
Merge pull request #2170 from birarda/cmake-quotes
...
complete quoting of various cmake commands
2014-03-04 09:00:26 -08:00
Philip Rosedale
897c2b8267
Add sounds for gun, reticle, mouse look firing
2014-03-03 22:14:59 -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
Stephen Birarda
cade36356d
some more string quoting in cmake files
2014-03-03 16:38:39 -08:00
Stephen Birarda
e16a325006
optionally do not reference OPENGL_INCLUDE_DIR for win
2014-03-03 16:36:37 -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
Stephen Birarda
bb3a8677be
Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes
2014-03-03 16:31:25 -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
Stephen Birarda
628f91cd73
complete quoting of varous Cmake commands, closes #1999
2014-03-03 12:15:05 -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
