Brad Hefta-Gaub
|
80d3d848a2
|
Merge pull request #6243 from jherico/controllers
Fixing input plugin dependencies
|
2015-10-30 10:38:51 -07:00 |
|
Brad Davis
|
9607812116
|
Fixing input plugin dependencies
|
2015-10-30 10:18:51 -07:00 |
|
Brad Davis
|
49e7d42c2c
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-30 10:07:40 -07:00 |
|
Clément Brisset
|
a37c94bd3c
|
Merge pull request #6202 from birarda/asset-parenting
don't force parenting of AssetUpload/AssetRequest
|
2015-10-30 09:45:42 -07:00 |
|
Brad Hefta-Gaub
|
126f68114b
|
Merge pull request #6241 from huffman/fix-physics-substep-warning
Fix warning in ThreadSafeDynamicsWorld
|
2015-10-30 09:37:55 -07:00 |
|
Ryan Huffman
|
84869c512b
|
Fix mis-renamed method names
|
2015-10-30 09:30:22 -07:00 |
|
Andrew Meadows
|
cb8b8e194c
|
Merge pull request #6240 from ZappoMan/fixWarnings
fix some warnings and tweak cmake to have better name for disabled external dependency
|
2015-10-30 09:25:45 -07:00 |
|
Ryan Huffman
|
7a4787a79c
|
Rename stepSimulation to stepSimulationWithSubstepCallback to fix warning
|
2015-10-30 09:21:13 -07:00 |
|
Brad Hefta-Gaub
|
fb3bf16391
|
improvement to cmake to explicitly use local external dependency
|
2015-10-30 09:01:42 -07:00 |
|
Brad Hefta-Gaub
|
e12ddf86f6
|
add back optional externals
|
2015-10-30 08:33:29 -07:00 |
|
Brad Hefta-Gaub
|
43a4f1001d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings
|
2015-10-30 08:30:02 -07:00 |
|
Brad Hefta-Gaub
|
b464b2f1f7
|
Merge pull request #6227 from jherico/externals
Moving SDL2, Sixense, and Faceshift to external projects
|
2015-10-30 01:13:45 -07:00 |
|
Brad Davis
|
fcfab0fc51
|
Moving SDL2, Sixense and Faceshift to external projects
|
2015-10-30 00:57:51 -07:00 |
|
Brad Hefta-Gaub
|
a149a2dd60
|
fix some warnings
|
2015-10-30 00:19:14 -07:00 |
|
Brad Davis
|
5233577d24
|
Merge pull request #6237 from ZappoMan/comfortTweaks
add makeAxis support to JSON parsing
|
2015-10-29 22:46:34 -07:00 |
|
Brad Davis
|
d9c534f404
|
Merge pull request #6236 from thoys/js-vec3-fixes
Scripting - Fix Vec3 properties and added multiplyVbyV function
|
2015-10-29 22:45:25 -07:00 |
|
Brad Hefta-Gaub
|
70f3156328
|
make sure CompositeEndpoints properly report readability more axis based keyboard inputs
|
2015-10-29 22:37:12 -07:00 |
|
Brad Hefta-Gaub
|
8a03383adc
|
use makeAxis for some keyboard support
|
2015-10-29 22:19:33 -07:00 |
|
Howard Stearns
|
96900dab25
|
Merge pull request #6195 from CrackerHax/master
Added AvatarList features for creating userlists in AC scripts
|
2015-10-29 22:11:57 -07:00 |
|
Brad Hefta-Gaub
|
b56c49a182
|
add makeAxis support to JSON parsing
|
2015-10-29 17:33:30 -07:00 |
|
James B. Pollack
|
846310f9fb
|
Merge pull request #6208 from ericrius1/closePaintModel
Added to the whiteboard model, and some bug fixes
|
2015-10-29 17:05:20 -07:00 |
|
Thijs Wenker
|
35e03d662d
|
fix the constants of Vec3 , const glm::vec3& UNIT_***() weren't accessible in javascript. Solved it by making them properties that are CONSTANT. Also added function to multiply a vec3 by a vec3 called multiplyVbyV since overloading it over multiply gave me some problems
|
2015-10-30 00:58:32 +01:00 |
|
ericrius1
|
6bdf66534f
|
light tweak
|
2015-10-29 16:53:03 -07:00 |
|
Ryan Huffman
|
fef39b5dc8
|
Merge pull request #6235 from Atlante45/master
Check keyLight is defined before accessing it.
|
2015-10-29 16:49:49 -07:00 |
|
Atlante45
|
8b46ed7dff
|
Check keyLight is defined
|
2015-10-29 16:42:48 -07:00 |
|
Howard Stearns
|
6613a0e0a6
|
Merge pull request #6234 from hyperlogic/tony/new-grab-anim
New left and right grab animations.
|
2015-10-29 16:42:36 -07:00 |
|
ericrius1
|
b6b71e7e76
|
increased range and intensity of light
|
2015-10-29 16:40:50 -07:00 |
|
Anthony J. Thibault
|
047614b2eb
|
New left and right grab animations.
|
2015-10-29 16:18:39 -07:00 |
|
samcake
|
2bf6ce09c7
|
Merge pull request #6233 from ZappoMan/comfortTweaks
tweak comfort mode filters
|
2015-10-29 16:08:59 -07:00 |
|
Brad Hefta-Gaub
|
b070306c2c
|
tweak comfort mode filters
|
2015-10-29 15:53:17 -07:00 |
|
Clément Brisset
|
bf7911e517
|
Merge pull request #6232 from Atlante45/master
edit.js fix
|
2015-10-29 15:39:20 -07:00 |
|
Atlante45
|
c237072195
|
edit.js fix
|
2015-10-29 15:29:12 -07:00 |
|
Brad Hefta-Gaub
|
c962697b18
|
Merge pull request #6230 from samcake/controllers
Controllers : Comfort mode is working through the stanadrd mapping
|
2015-10-29 14:59:42 -07:00 |
|
samcake
|
c1e00ca08c
|
FIxing the mac build again ?
|
2015-10-29 14:30:51 -07:00 |
|
samcake
|
f72146c35d
|
FIxing the mac build
|
2015-10-29 14:17:52 -07:00 |
|
Brad Hefta-Gaub
|
ffa805affb
|
Merge pull request #6223 from AlessandroSigna/controllers
Vive Controller
|
2015-10-29 14:16:34 -07:00 |
|
ericrius1
|
020566b76a
|
no deleting
|
2015-10-29 14:14:15 -07:00 |
|
samcake
|
1b6a2ff56f
|
Merge pull request #6231 from Atlante45/master
edit.js fix
|
2015-10-29 14:13:29 -07:00 |
|
Atlante45
|
904326cd1c
|
edit.js fix
|
2015-10-29 14:11:27 -07:00 |
|
samcake
|
f7aa77253b
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-29 14:09:04 -07:00 |
|
samcake
|
9c860346df
|
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-10-29 14:05:34 -07:00 |
|
Brad Davis
|
036ae62dd3
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2015-10-29 14:00:52 -07:00 |
|
samcake
|
d73eafddd1
|
COmfort mode working with the COntroller system observing the menu state
|
2015-10-29 13:48:16 -07:00 |
|
Andrew Meadows
|
9bc44d678b
|
Merge pull request #6228 from ZappoMan/scriptCleanup
removed old metavoxel example, since the api is no longer available
|
2015-10-29 13:26:11 -07:00 |
|
Brad Hefta-Gaub
|
3c11cf2926
|
Merge pull request #6226 from kencooke/master
Workaround for audio having channels swapped under Qt 5.5.1
|
2015-10-29 13:25:41 -07:00 |
|
Andrew Meadows
|
fa96349155
|
Merge pull request #6229 from birarda/sleep-dt-loop
guard timeElapsed for simulateKinematicMotion to max 1s
|
2015-10-29 13:23:57 -07:00 |
|
AlessandroSigna
|
ffd2b39874
|
Fix vive controller - update to new input plugin register
|
2015-10-29 13:18:37 -07:00 |
|
samcake
|
b09a159090
|
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
|
2015-10-29 13:06:52 -07:00 |
|
samcake
|
77759fa8af
|
t reset --:wq
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
|
2015-10-29 13:06:16 -07:00 |
|
samcake
|
e902e5e97a
|
Introduce the concept of loading the default Mapping
|
2015-10-29 13:05:29 -07:00 |
|