Bradley Austin Davis
fb2c84484e
Merge remote-tracking branch 'upstream/master' into plugins
2015-08-07 15:26:43 -07:00
Seth Alves
b1e69537f3
Merge pull request #5524 from howard-stearns/cleanup-jointstate
...
Clean Up JointState
2015-08-07 13:50:02 -07:00
Howard Stearns
145b730f80
Clean up instantiation.
2015-08-07 12:27:26 -07:00
Howard Stearns
42cc34cd64
JointState has our own copy of any ivars we want from FBXJoint, instead of keeping a reference to the fbx.
2015-08-06 16:54:09 -07:00
Bradley Austin Davis
7e60aee1bf
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/Head.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/avatar/MyAvatar.h
interface/src/avatar/SkeletonModel.cpp
interface/src/avatar/SkeletonModel.h
interface/src/devices/3DConnexionClient.cpp
interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
Atlante45
3dc8bd47ae
Fix warning and remove unused headers
2015-08-05 16:46:44 -07:00
Bradley Austin Davis
89cc2ccfa5
More merge comments
2015-08-05 13:53:19 -07:00
Bradley Austin Davis
4f759ee46a
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 16:26:16 -07:00
Bradley Austin Davis
3c76c0d4b6
Merge remote-tracking branch 'upstream/master' into core
2015-08-04 10:23:54 -07:00
Bradley Austin Davis
53ccbfc4fa
Merge branch 'core' into plugins
2015-08-03 22:25:50 -07:00
Sam Gondelman
d182199c71
adding the rest of the shaders to shaders-test
2015-08-03 12:08:14 -07:00
samcake
85077604dc
Merge pull request #5478 from jherico/marge
...
CORE BRANCH - More shader fixes
2015-08-03 10:25:33 -07:00
Brad Davis
53feaf2ab6
More shader fixes
2015-08-01 20:17:57 -07:00
Bradley Austin Davis
f19653f3e2
Integrate glew
2015-08-01 20:08:19 -07:00
Brad Davis
b84eef93c9
Core profile shader work and test code
2015-08-01 14:43:52 -07:00
Brad Davis
1712ab322f
Fixing includes in test code
2015-07-31 17:46:47 -07:00
Sam Gateau
ca4dbdb996
Merging with upstream and compiling on windows
2015-07-31 16:14:53 -07:00
Brad Davis
aea07fe671
Merge branch 'master' into gl4_1
...
Conflicts:
libraries/gpu/src/gpu/Config.slh
libraries/render-utils/src/deferred_light_limited.slv
libraries/render-utils/src/simple.slf
libraries/render-utils/src/simple_textured.slf
tests/render-utils/src/main.cpp
tools/scribe/src/main.cpp
2015-07-31 15:08:37 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Brad Davis
155f88e267
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
interface/src/devices/TV3DManager.h
libraries/gpu/src/gpu/GPUConfig.h
2015-07-31 10:28:06 -07:00
Howard Stearns
b685378ab0
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-31 10:08:30 -07:00
Sam Gateau
14f4c9c6c0
REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend
2015-07-30 15:07:36 -07:00
Brad Davis
f7a2513f26
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Menu.cpp
interface/src/Menu.h
interface/src/avatar/MyAvatar.h
tests/ui/src/main.cpp
2015-07-30 12:55:22 -07:00
Sam Gateau
d84e2d31ea
Merge with master
2015-07-30 11:20:00 -07:00
Howard Stearns
4e7d191fb1
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:53:38 -07:00
Howard Stearns
d73f133daa
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 15:45:00 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
Sam Gateau
17650dde74
Solving the coimpiling issue with Render-utils test
2015-07-29 11:49:22 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
Howard Stearns
12d449f69d
Update test case initialization post cauterization changes.
2015-07-29 09:55:46 -07:00
Howard Stearns
66621d31e8
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 09:26:36 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Brad Davis
bb29127eff
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 23:14:41 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Andrew Meadows
ef5e7e9ccc
remove PlaneShape dependency from GeometryUtils
...
also add unit tests for indRayRectangleIntersection()
2015-07-28 15:45:48 -07:00
SamGondelman
782a5c491e
removed hand lasers because they had been renamed so they weren't removed
2015-07-28 12:56:31 -07:00
Andrew Meadows
d03a7d1b70
fix physics-tests build errors
2015-07-28 12:24:17 -07:00
Andrew Meadows
2aa453b610
fix build errors for shared-tests
2015-07-28 12:05:45 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Niraj Venkat
34e400ac67
Changing var name to 'DebugAmbientOcclusion'
2015-07-27 17:14:09 -07:00
Howard Stearns
98fe6dbf3d
Rename tests/rig to tests/animation, per Tony.
2015-07-27 14:13:54 -07:00
Howard Stearns
51a12adc08
Less dependencies in tests.
2015-07-27 14:02:47 -07:00
Howard Stearns
146ddd2240
Cleanup false starts.
2015-07-27 13:42:18 -07:00
Howard Stearns
8196770ed3
Wiring, including avatar position/velocity/orientation data, and an enableRig setting so that we don't break stuff unless turned on.
2015-07-27 12:58:43 -07:00
Marcel Verhagen
32d0513962
The 3Dconnextion files from https://github.com/highfidelity/hifi/pull/5351
...
For now without a merge conflict.
Updated the menu name.
Still have to look at the fast zooming and yaw on windows, probably have to add a var to prevent the button changes to be pushed to fast. Not sure why the yaw thing does not always work, could be that the position is also send at the same time and the input mapper does not not process all those synchronical. Probably will have to do something with masking the postion when the rotation is set for yaw.
2015-07-27 19:04:49 +02:00
Howard Stearns
1d99057052
Debug printouts in tests.
2015-07-24 16:08:47 -07:00
Howard Stearns
cff7bb703e
Test evolution.
2015-07-24 14:08:30 -07:00
