Stephen Birarda
60bdd206eb
Merge branch 'master' of https://github.com/highfidelity/hifi into android
2015-01-19 12:35:22 -08:00
Stephen Birarda
10be0ee984
resolve conflicts on merge with upstream master
2015-01-19 10:26:56 -08:00
Andrew Meadows
840acecbe6
merge upstream/master into andrew/bispinor
...
Conflicts:
libraries/physics/src/EntityMotionState.cpp
2015-01-16 15:22:06 -08:00
Andrew Meadows
d5efc375d9
Merge pull request #4128 from ZappoMan/master
...
fix double targets and freezing bullets
2015-01-16 14:37:22 -08:00
Andrew Meadows
d5119b3532
merge upstream/master into andrew/bispinor
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
2015-01-16 14:36:27 -08:00
ZappoMan
9a60896a40
fix double targets and freezing bullets
2015-01-16 14:24:50 -08:00
Philip Rosedale
1ff90bec5d
Merge pull request #4124 from AndrewMeadows/inertia
...
support for simple kinematic motion
2015-01-16 13:33:44 -08:00
Andrew Meadows
7c9419aa4e
fix non-bullet build
2015-01-16 10:34:52 -08:00
Sam Gateau
afb6175d60
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-16 10:32:56 -08:00
Sam Gateau
6b55b4ff82
No more Magic numbers and fixing the code path for linux
2015-01-16 10:26:51 -08:00
Andrew Meadows
2427fa68cd
remove unnecessary Bullet #include
2015-01-16 10:06:39 -08:00
Sam Gateau
8634d86167
Adding ambient sphere in the lighting equation and menu to control te presets
2015-01-16 09:43:21 -08:00
Sam Gateau
0e38ea8854
Adding ambient sphere in the lighting equation and menu to control te presets
2015-01-16 09:41:43 -08:00
Sam Gateau
d1fb071208
Adding ambient sphere in the lighting equation and menu to control te presets
2015-01-16 09:38:53 -08:00
Andrew Meadows
4392af3b3a
Remove pre-Bullet server-side EntityItem motion
2015-01-16 09:26:43 -08:00
Andrew Meadows
3fed38793e
merge andrew/origin/inertia to andrew/local/inertia
2015-01-15 17:55:51 -08:00
Andrew Meadows
4c1cd991f4
remove pessimistic send of object updates
...
we have not yet seen the headache of packetloss and unreliable messages
2015-01-15 17:53:37 -08:00
Andrew Meadows
250fd98fee
support for simple kinematic motion
2015-01-15 17:51:01 -08:00
Sam Gateau
0fdc9c1855
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-15 15:27:52 -08:00
Sam Gateau
7ae9635ce7
Refactoring the code from directional into DeferredLighting.slh
2015-01-15 15:27:18 -08:00
Stephen Birarda
6f5d9d54ec
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-01-15 14:15:38 -08:00
Stephen Birarda
b2c5847d9b
Merge pull request #4117 from Atlante45/dm_update
...
Drop DM ref before creating new object
2015-01-15 14:15:01 -08:00
Atlante45
786c0a5462
Drop DM ref before creating new object
2015-01-15 14:00:45 -08:00
Stephen Birarda
250a3de9fe
make node mutex in LimitedNodeList recursive for double read lock
2015-01-15 13:34:33 -08:00
Stephen Birarda
e538669343
resolve conflicts on merge with upstream
2015-01-15 13:12:05 -08:00
Sam Gateau
d759f4c255
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-15 11:54:55 -08:00
Sam Gateau
067483fce2
Adding a prototype of ambient lighting with spherical harmonics
2015-01-15 11:54:01 -08:00
Andrew Meadows
51cc9d6d9a
alt method for repressing unused var warnings
2015-01-15 10:46:09 -08:00
Andrew Meadows
9eb4d66327
remove warnings
2015-01-15 10:36:17 -08:00
Andrew Meadows
ff171a5782
Bullet is now required dependency
2015-01-15 10:27:43 -08:00
Brad Hefta-Gaub
89967fbe7a
Merge pull request #4104 from AndrewMeadows/inertia
...
store density in EntityItem instead of mass
2015-01-14 17:17:45 -08:00
Brad Hefta-Gaub
9d45bed0e2
Merge pull request #4103 from Atlante45/applications_diet_cpp11
...
DependencyManager update
2015-01-14 17:17:07 -08:00
Philip Rosedale
1188be52e4
Merge pull request #4106 from ZappoMan/rayPickWork
...
fix ray pick of ellipsoids away from origin
2015-01-14 17:10:30 -08:00
Stephen Birarda
b8b5b2b6ec
don't check the root object for path
2015-01-14 16:56:49 -08:00
ZappoMan
ff60833129
fix ray pick of ellipsoids away from origin
2015-01-14 16:55:24 -08:00
Stephen Birarda
f745dfdb91
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-01-14 16:54:51 -08:00
Atlante45
b922b028e9
Fixes body not rotating for other avatars
2015-01-14 16:47:20 -08:00
Sam Gateau
614e1aa6ae
Cleaning the Model rendering path from any use of glMaterial
2015-01-14 16:44:44 -08:00
Andrew Meadows
ccc50dd94f
use density instead of mass
2015-01-14 15:47:44 -08:00
Andrew Meadows
03b8badd81
EntityItem stores density rather than mass.
2015-01-14 15:00:57 -08:00
Andrew Meadows
8236837dd0
add ShapeInfo::computeVolume()
2015-01-14 15:00:31 -08:00
Sam Gateau
7be1f41659
using the Material class
2015-01-14 10:22:27 -08:00
Atlante45
f77fab2fe0
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
2015-01-13 20:38:52 -08:00
Atlante45
38729c5790
Made dependencies inherit from Dependency
2015-01-13 20:38:01 -08:00
Atlante45
27cc3d297e
DependencyManager update
...
- Now need a call to DependencyManager::set(...) that support
variable arguments number and type
- Now support destroy operation via DependencyManager::destroy()
- Now support inheritance. All inheritance relationship need to
be specified via DependencyManager::registerInheritance<Base,
Derived>() before any call to the DepedencyManager involving Base.
- Dependencies should now inherit from the class Dependency as
well as using SINGLETON_DEPENDENCY
2015-01-13 20:27:38 -08:00
Sam Gateau
1bbdb43d8c
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-13 18:24:59 -08:00
dev
d7ad5a35d6
fixes for glsl mac
2015-01-13 18:24:32 -08:00
Andrew Meadows
dd2421ffcd
Merge pull request #4100 from ZappoMan/backupBugFix
...
Add support for multiple backup rules
2015-01-13 17:59:44 -08:00
Brad Hefta-Gaub
b3b43b4c14
Merge pull request #4093 from samcake/temp0
...
Factorize the shader code for deferred lighting
2015-01-13 17:11:17 -08:00
Brad Hefta-Gaub
284ee32b7b
Merge pull request #4089 from AndrewMeadows/inertia
...
fix glitchy entity motion in Bullet simulation
2015-01-13 17:10:35 -08:00
