Andrew Meadows
11de33b98b
merge upstream/master into andrew/inertia
2015-01-05 15:02:53 -08:00
Andrew Meadows
75a8faec86
purge support for voxels from PhysicsEngine
2015-01-05 15:02:18 -08:00
Andrew Meadows
244a8503ef
include damping in remote extrapolation model
2015-01-05 14:48:16 -08:00
Sam Gateau
f03b253260
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5
Merge pull request #4025 from ZappoMan/voxelEctomy
...
Voxel ectomy
2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0
clean code
2015-01-05 13:17:12 -08:00
Brad Hefta-Gaub
125dc5010e
Merge pull request #4039 from AndrewMeadows/inertia
...
Bullet physics part 2
2015-01-05 13:10:55 -08:00
Sam Gateau
7529b3d1b0
clean code
2015-01-05 13:10:32 -08:00
Andrew Meadows
0b9c9daed9
Merge pull request #4034 from ZappoMan/multiThreadedPerformanceTimer
...
Multi threaded performance timer
2015-01-05 13:01:59 -08:00
dev
e3d474db3d
FIx shaders for mac
2015-01-05 12:27:16 -08:00
Andrew Meadows
6fb4e1f622
oops, need to update angularVelocity after damping
2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7
do not zero small velocities for non-bullet case
2015-01-05 12:01:09 -08:00
Sam Gateau
b8e44a3e7a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e
Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes
2015-01-05 11:27:29 -08:00
Andrew Meadows
3b7770f405
change meaning of damping to agree with bullet
...
0 = no damping
1 = 100% damping
The new formula is: velocity *= (1 - damping)^dt
2015-01-05 11:23:01 -08:00
Andrew Meadows
d032eab0de
merge upstream/master into andrew/inertia
2015-01-05 09:19:37 -08:00
Andrew Meadows
30200ef7eb
add damping to ObjectMotionState
2015-01-05 09:17:46 -08:00
Philip Rosedale
a01ab38f1b
Merge pull request #4029 from Atlante45/new_glm_fix
...
Fix compile error with new glm version
2015-01-04 11:26:37 -08:00
ZappoMan
4cc641320b
fix PerformanceTimer to handle timer stacks on multiple threads
2015-01-02 15:04:48 -08:00
ZappoMan
139f96c8b0
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977
Merge pull request #4032 from Atlante45/uninitialized_entity_members
...
Initialize entities' _locked and _script
2015-01-02 14:01:55 -08:00
Atlante45
022beff569
Initialize entities' _locked and _script
2015-01-02 12:37:00 -08:00
Sam Gateau
46ab4833be
applying the shadowing improvment to the cascaceded path shader and cleaning the code
2015-01-02 12:12:41 -08:00
Sam Gateau
24d39f4453
refining the shadowing
2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237
Improving the shadow effect with lightmaps
2015-01-02 10:31:34 -08:00
Andrew Meadows
0d3e78fdb8
modify extrapolation behavior when bullet enabled
...
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
2014-12-31 16:32:09 -08:00
Atlante45
b1f0ec8dfb
Fix compile error with new glm version
2014-12-31 15:49:56 -08:00
Sam Gateau
02949dbc5a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-12-31 10:59:42 -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
Philip Rosedale
bd88e0f38d
Merge pull request #4026 from ZappoMan/entityScriptsAndEvents
...
evaluate entity scripts in a sandbox before constructing
2014-12-31 10:44:55 -08:00
Brad Hefta-Gaub
eaa6d4455d
Merge pull request #4024 from samcake/temp1
...
Moving deferred lighting shaders from the resource folder to embedded source in the executable
2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa
Merge pull request #4007 from AndrewMeadows/inertia
...
Bullet physics part 1
2014-12-31 10:33:00 -08:00
ZappoMan
eb28efa648
evaluate entity scripts in a sandbox before constructing
2014-12-31 09:58:18 -08:00
Sam Gateau
e1a295fb37
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f
Merge pull request #4023 from PhilipRosedale/master
...
Torso twists to follow head, fix bug with head rotations
2014-12-31 08:01:39 -08:00
ZappoMan
67595ea571
more voxelEctomy
2014-12-30 20:35:21 -08:00
ZappoMan
5cef7d0e9d
more voxelEctomy
2014-12-30 20:24:27 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
ZappoMan
278ed96f14
more work on voxelEctomy
2014-12-30 18:54:53 -08:00
ZappoMan
49d8f2b2f5
more work on voxelEctomy
2014-12-30 18:52:33 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775
cleaning the code
2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416
moving the deferrered shaders from the resource folder to built-in the executable
2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16
moving the deferrered shaders from the resource folder to built-in the executable
2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a
only twist own body, remove unused head functions
2014-12-30 17:02:53 -08:00
samcake
20d66d201e
Merge pull request #4020 from ZappoMan/gpuStreamizing
...
Improvements to GeometryCache::renderQuad()
2014-12-30 16:49:16 -08:00
ZappoMan
86a9d5719b
fix one more case of animaiton stutter
2014-12-30 15:12:23 -08:00
Clément Brisset
860098585c
Merge pull request #4018 from samcake/temp0
...
Moving the shaders used in Model.cpp from resources folder into the built-in executable
2014-12-30 13:36:13 -08:00
