Andrew Meadows
ff171a5782
Bullet is now required dependency
2015-01-15 10:27:43 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
David Rowe
a5b3ae397a
Code review
2015-01-08 18:20:23 -08:00
David Rowe
07b30da2ac
Fix miscellaneous types and casts
2015-01-08 13:44:51 -08:00
ZappoMan
9630279459
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
...
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
Andrew Meadows
6f72d4ad81
easier to read Bullet to GLM conversions and back
2014-12-30 13:15:57 -08:00
Andrew Meadows
439cdbdac1
re-expose unit tests for legacy shapes
2014-12-29 11:15:09 -08:00
Andrew Meadows
71ab4a5780
fix unit ShapeManager unit tests
2014-12-29 11:07:57 -08:00
Andrew Meadows
9b7e50858a
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
Atlante45
327daacecd
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
2014-12-22 13:34:18 -08:00
Sam Gateau
4c670ac17a
merging with upstream master and origin temp0
2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b
Add the Model library
2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff
rename cmake macro to represent actual purpose
2014-12-18 16:51:20 -08:00
Atlante45
aa0998dc7d
Moved LimitedNodeList into DM
2014-12-18 10:32:34 -08:00
Andrew Meadows
ad7641c7e0
repairs to build when Bullet not found
2014-12-11 16:05:45 -08:00
Andrew Meadows
919214b7cb
split ShapeInfo into shared and physics parts
2014-12-02 10:44:40 -08:00
Andrew Meadows
8aba2a06e0
Splitting Bullet stuff out of ShapeInfo
2014-12-01 16:47:33 -08:00
Andrew Meadows
37093cbd00
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2014-11-24 11:24:39 -08:00
Andrzej Kapolka
0a976ad262
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-20 11:26:29 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
Andrew Meadows
7c53c7a495
fix build to work when cmake does not fiind Bullet
2014-11-11 12:24:29 -08:00
Andrew Meadows
fa48da6c98
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/entities/src/EntityItem.cpp
2014-11-11 11:14:12 -08:00
Andrzej Kapolka
a77525209d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-10 11:54:05 -08:00
Stephen Birarda
2ca673175a
rename StdDev to StDev, patch its leak
2014-11-07 17:15:54 -08:00
Andrzej Kapolka
4c60be4a31
Fix for hang on test exit.
2014-11-06 19:37:37 -08:00
Andrzej Kapolka
e08a0144c2
Cleanup on aisle three! Removed the color/normal/voxelized spanner bits, as
...
well as the throbbing/scripted guides and the notion of spanner masking.
2014-11-06 19:15:43 -08:00
Andrew Meadows
2734afcf9a
Adding BulletUtil.h with tests.
2014-11-04 16:43:50 -08:00
Andrew Meadows
4a1133fbc2
moved ShapeInfo tests to their own file
2014-11-03 15:25:04 -08:00
Andrew Meadows
aa0172cf8b
Unit tests for ShapeManager
2014-11-03 14:03:05 -08:00
Andrew Meadows
d26540b029
ShapeManager now under unit test
2014-10-31 17:13:17 -07:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00
Leonardo Murillo
a4965e7f60
No need for https when downloading assets
2014-10-23 13:59:08 -06:00
Andrzej Kapolka
bd4738d2c2
Reliable delta fix.
2014-10-21 15:48:53 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
Leonardo Murillo
0b7ff18970
Changes in non-Js code
2014-10-06 11:24:10 -06:00
ZappoMan
4b52fddffd
collions with voxels and avatars
2014-09-24 17:37:56 -07:00
ZappoMan
f43ba4a68b
first cut at getting entities to collide
2014-09-24 15:28:04 -07:00
Andrew Meadows
0539246089
merge upstream/master into andrew/ragdoll
2014-09-15 13:56:51 -07:00
ZappoMan
d10bd6857d
add use of missingSet in release build to silence warning
2014-09-13 08:02:38 -07:00
Andrew Meadows
f2882618be
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-09-12 17:50:26 -07:00
Andrew Meadows
c475d5db36
unit tests for ray-vs-AACubeShape and PlaneShape
2014-09-12 08:41:28 -07:00
Andrew Meadows
08e5dbadfd
added validation of RayIntersectionInfo::_hitShape
2014-09-11 09:44:41 -07:00
Andrew Meadows
0494ffcf38
implement Ray-vs-Capsule and Ray-vs-AACube
2014-09-10 17:01:51 -07:00
Andrew Meadows
4da1ca22ba
Add RayIntersectionInfo and use for shape-vs-ray
2014-09-09 17:35:06 -07:00
ZappoMan
b78b8ccbb0
first cut at replacing radius with dimensions
2014-09-09 13:33:05 -07:00
Andrew Meadows
526d998924
removed warnigs about ill-formed narrowing conversion
2014-09-05 17:21:15 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
Clément Brisset
72af7617fa
Merge pull request #3332 from AndrewMeadows/ragdoll
...
add AACubeShape to ShapeCollider
2014-09-03 14:34:32 -07:00
MarcelEdward
95cab15864
the command:
...
cmake . -GXcode
creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.
This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
2014-09-03 16:34:23 +02:00
