Atlante45
298ac650d8
Isolate sixense dynamic linking for OSX
2015-11-06 16:33:07 -08:00
Clément Brisset
143e92ee1b
Merge pull request #6300 from jherico/lisa
...
Breaking up InputDevices and InputPlugins, cleanup of some shared_ptr madness
2015-11-06 16:15:53 -08:00
Brad Davis
bf70ae4724
PR feedback
2015-11-06 15:59:13 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
Andrew Meadows
e410030dd9
Merge pull request #6320 from hyperlogic/tony/blender-avatar-ik-fix
...
IK fix for avatars exported from Blender
2015-11-06 15:00:25 -08:00
James B. Pollack
8eea7ff67c
Merge pull request #6329 from sethalves/fix-grab-release
...
send to server upon grab release
2015-11-06 14:33:08 -08:00
Brad Davis
1dc392bb36
Merge pull request #6330 from Atlante45/master
...
// FIXME incredibly evil....
2015-11-06 11:43:33 -08:00
samcake
640845c944
Merge pull request #6328 from jherico/rec2
...
Add recording classes
2015-11-06 11:39:14 -08:00
Brad Davis
0bf29a441f
Add recording classes
2015-11-06 11:14:46 -08:00
Atlante45
e630f3072e
Bit of cleanup
2015-11-06 11:14:10 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
Stephen Birarda
ed960b02ec
Merge pull request #6291 from zzmp/fix/script-engine-run-bail
...
Bail early from ScriptEngine::run if stopped
2015-11-06 10:05:02 -08:00
samcake
63106f6991
Merge pull request #6322 from Atlante45/record
...
Recording fixes from Clement.
2015-11-06 09:28:58 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
Atlante45
dbe25651cf
constify audio client loop
2015-11-05 16:57:51 -08:00
Atlante45
6c35ae48b0
Don't allocate big samples array in tight loop
2015-11-05 16:52:38 -08:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
Atlante45
07b3597ae3
Fix recording scripts
2015-11-05 14:01:37 -08:00
Anthony J. Thibault
20d95080f1
IK fix for avatars exported from Blender
...
This should fix the issue with the hips moving erratically when arm IK
is enabled. The main issue is that the IK system assumed that the "Hips"
joint was the root of the skeleton. For Blender avatar this is not the case
as it inserts an "Armature" node at the root instead.
2015-11-05 12:03:45 -08:00
Howard Stearns
aef8b7639d
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-05 11:58:08 -08:00
Anthony J. Thibault
50e8f49f52
SpacemouseManager Moved stub init into cpp file.
...
This should fix the windows build. For some reason
the linker was having a problem resolving this.
2015-11-05 10:56:24 -08:00
Anthony J. Thibault
2318e48fa8
AvatarRig: fix for crash when index was -1
2015-11-05 09:43:41 -08:00
Anthony J. Thibault
8d16f60b15
Removed hardcoded define HAVE_3DCONNEXIONCLIENT
...
This should be set from cmake, right?
2015-11-05 09:02:39 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
Brad Davis
69d29bbbbb
Creating recording library
2015-11-04 16:18:55 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
samcake
f4cc8c4c2e
Merge pull request #6306 from jherico/barney
...
Fix ability to enable mappings parsed from JSON in JS
2015-11-04 11:47:04 -08:00
Brad Davis
18d2b184dc
Fix ability to enable mappings parsed from JSON in JS
2015-11-04 11:39:34 -08:00
U-GAPOS\andrew
f260c6b12b
fix bad time measurment in AtRestDetector
2015-11-04 10:47:39 -08:00
EdgarPironti
ade0862948
Spacemouse fixes
2015-11-04 00:49:40 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Howard Stearns
4a54f2052e
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 17:42:38 -08:00
Andrew Meadows
4215ce5d25
Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds
...
Don't play other avatar's collision sounds.
2015-11-03 13:40:27 -08:00
EdgarPironti
d99838de9c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 12:25:19 -08:00
Zach Pomerantz
6bf9a4518a
Bail early from ScriptEngine::run if stopped
...
evaluate() bails anyway, so this will avoid the cost of init().
If run() is invoked from runInThread(), this may avoid a race
where _isRunning is set after it is checked because the check
occured during init().
2015-11-03 11:24:04 -08:00
Thijs Wenker
73d7fd4648
Fix: Vec3.UP was pointed to Vectors::UNIT_X
...
This fixes the scripting property Vec3.UP to point to Vectors::UP which is equal to {X: 0, Y: 1, Z: 0}.
2015-11-03 19:19:12 +01:00
Howard Stearns
70b1165393
Merge branch 'master' of https://github.com/highfidelity/hifi into away
2015-11-03 10:01:36 -08:00
EdgarPironti
5d695da630
Do not merge - Spacemouse
2015-11-02 23:31:10 -08:00
Brad Hefta-Gaub
79f7284c32
Merge pull request #6285 from jherico/lisa
...
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 22:18:16 -08:00
Brad Davis
764ecba2a8
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 21:55:35 -08:00
Howard Stearns
94ae1ef638
Fix accumulateTime
2015-11-02 20:37:57 -08:00
James B. Pollack
192e4c8185
Merge pull request #6274 from ZappoMan/rightClickMenu
...
add example of overriding default rightClick behavior
2015-11-02 18:58:12 -08:00
Brad Davis
699a13b2a7
Merge pull request #6275 from ZappoMan/mappingTweaks
...
Mapping tweaks to match Controllers spec
2015-11-02 16:06:08 -08:00
Brad Hefta-Gaub
02288e84e8
CR feedback
2015-11-02 15:35:30 -08:00
samcake
3d2739c7b4
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-02 15:34:57 -08:00
Brad Hefta-Gaub
f532607cca
add touch and other gestures to standard
2015-11-02 15:06:38 -08:00
samcake
0211e00c86
Cleaning the feature not conditional do the true design
2015-11-02 15:01:59 -08:00
