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
ericrius1
f57f3c1138
Disabled writing to depth buffer for particles and no longer sorting the,
2015-11-02 15:25:42 -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
samcake
c2687b4998
Cleaning the feature not conditional do the true design
2015-11-02 14:17:07 -08:00
Anthony J. Thibault
2236573a9d
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 12:18:11 -08:00
Brad Hefta-Gaub
b94258f953
add example of overriding default rightClick behavior
2015-11-02 11:55:50 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Seth Alves
c381da24a7
get interface building on my linux box
2015-11-02 10:42:06 -08:00
samcake
543f322ffe
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-02 09:48:32 -08:00
Brad Hefta-Gaub
d9dd045886
better parameter name
2015-11-02 09:29:09 -08:00
Brad Hefta-Gaub
c3a78ed151
cleanup
2015-11-02 09:27:35 -08:00
Brad Hefta-Gaub
b00f572e1a
add mouseClicked inputs vs mouseButton inputs, make right-click work without right button drag
2015-11-02 09:21:15 -08:00
Anthony J. Thibault
e3e759248f
Merge branch 'master' into tony/anim-sync-blend
2015-11-02 08:37:10 -08:00
Howard Stearns
ea2971a24f
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-11-01 17:02:59 -08:00
Brad Hefta-Gaub
fe4a6fa2bf
Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarnings
2015-11-01 15:01:30 -08:00
Brad Hefta-Gaub
9c23f2551d
Merge pull request #6207 from jherico/pluginSupport
...
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Hefta-Gaub
4a08329d22
fix unix warnings for comparing enums to enums
2015-11-01 12:10:42 -08:00
Brad Hefta-Gaub
43df5b55fe
fix linker warnings
2015-11-01 11:55:55 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Davis
99d8554cc8
Make zlib a true external on windows (linux and OSX should rely on system libraries)
2015-11-01 01:36:59 -07:00
Brad Davis
7fdb8e28e7
Merge pull request #6262 from ZappoMan/fixControllers
...
Tweaks to standard hand controller mappings
2015-10-31 23:42:13 -07:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
Howard Stearns
fb26e85faf
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 14:33:17 -07:00
Brad Davis
0e13348b5a
PR feedback
2015-10-31 14:26:14 -07:00
Brad Davis
abbfe15395
Adding peek support for endpoints
2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
b877f832a9
fix SDL joysticks
2015-10-31 13:02:17 -07:00
Howard Stearns
79f05c63e5
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 11:23:18 -07:00
Seth Alves
5916875345
one more
2015-10-31 08:20:24 -07:00
Seth Alves
224aeea044
quiet compiler
2015-10-31 08:11:43 -07:00
Andrew Meadows
9809fcfa54
Merge pull request #6244 from sethalves/grab
...
kinematic grab fixes
2015-10-31 04:36:13 -07:00
Bradley Austin Davis
0355a37fb1
Fixing SDL2 active/inactive value
2015-10-30 22:19:44 -07:00
Bradley Austin Davis
9b9e35d396
Limit sixense to mavericks and below
2015-10-30 22:02:20 -07:00
Seth Alves
896ed3927c
merge from upstream
2015-10-30 19:17:43 -07:00
Bradley Austin Davis
46d87dda5a
Fixing paths for SDL2 and Sixense libs
2015-10-30 19:00:26 -07:00
Brad Hefta-Gaub
88fda01ce2
Merge pull request #6254 from hyperlogic/tony/log-handler-crash-fix
...
Fix for rare crash in LogHandler::flushRepeatedMessages()
2015-10-30 18:47:37 -07:00
Anthony J. Thibault
2eb62f2fd8
LogHandler: fix for linux build
2015-10-30 17:44:06 -07:00
samcake
78e6fe5563
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-30 17:33:38 -07:00
samcake
00be6b3e3a
Add support for NOT conditional in the route json
2015-10-30 17:32:26 -07:00
Anthony J. Thibault
f50e1a0977
Fix for rare crash in LogHandler::flushRepeatedMessages()
...
This can happen when LogHandler::flushRepetedMessages is called on
the main thread, while the application is printing messages on
a separate thread. The access to the _lastRepeatedMessage QHash was
not guarded.
I've added two mutexes to guard access to both the repeatedMessage
hashes/regexes and the onlyOnceMessages/regexes. This will unfortunately
incur a performance hit for frequent debug logging, but that's better
then crashing.
Also, I've added the ability to print threadIDs as well as Process ids.
This is helpful when debugging multi-threaded access to shared variables.
2015-10-30 17:18:37 -07:00
Seth Alves
944f0965c0
some refactoring and a bug fix -- grab script can throw things again
2015-10-30 16:35:50 -07:00
Seth Alves
cf83ca22bb
change how kinematic objects get data back to entity when an action is active
2015-10-30 15:30:54 -07:00
AlessandroSigna
b8a2fcbb2c
Vive controller - fix inverted inputs
2015-10-30 15:21:48 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
samcake
393f6a4c76
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:35:50 -07:00
Howard Stearns
ce1d0fe07c
Git rid of unused (un-emitted and intended to be removed long ago) script signal.
2015-10-30 11:25:54 -07:00
Seth Alves
93503d0a21
make kinematic grab set entities kinematic in bullet and update entity position
2015-10-30 11:03:13 -07:00
Anthony Thibault
fcfb44207f
Merge pull request #6097 from howard-stearns/expose-anim-vars
...
Expose animation vars to Javascript
2015-10-30 10:50:42 -07:00
Brad Hefta-Gaub
b2f27054f4
Merge pull request #6239 from AlessandroSigna/controllers
...
ViveController - input mapping
2015-10-30 10:39:26 -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
Ryan Huffman
7a4787a79c
Rename stepSimulation to stepSimulationWithSubstepCallback to fix warning
2015-10-30 09:21:13 -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 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
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
c2873ef720
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 22:17:31 -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
Howard Stearns
eb9e54de41
Make AnimVariantXXX.xxx consistent.
2015-10-29 19:45:23 -07:00
Howard Stearns
d491ddc3d6
comment.
2015-10-29 19:43:57 -07:00
Howard Stearns
1918f1835c
Tolerate AnimVars that are float when we want int, and vice versa.
2015-10-29 19:37:13 -07:00
Howard Stearns
f7d558a252
comment
2015-10-29 19:26:54 -07:00
Howard Stearns
dcc173c93a
comment.
2015-10-29 19:21:24 -07:00
Howard Stearns
5d1ba90f1e
More readable code.
2015-10-29 19:18:34 -07:00
Howard Stearns
ada32dd260
typo
2015-10-29 19:17:52 -07:00
AlessandroSigna
01d3805148
ViveController - mapping of buttons
2015-10-29 18:44:43 -07:00
Brad Hefta-Gaub
b56c49a182
add makeAxis support to JSON parsing
2015-10-29 17:33:30 -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
Howard Stearns
502cc7f580
Don't copy while converting.
2015-10-29 16:44:01 -07:00
Howard Stearns
303491817b
assert to get hard error in dev, warning and no-op in release.
2015-10-29 16:35:59 -07:00
Howard Stearns
6b4b4440e8
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 16:06:24 -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
Brad Hefta-Gaub
ffa805affb
Merge pull request #6223 from AlessandroSigna/controllers
...
Vive Controller
2015-10-29 14:16:34 -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
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
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
Ken Cooke
1eabb924f1
Fixed the logic to be correct
2015-10-29 12:53:47 -07:00
Stephen Birarda
fb55f0becb
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 12:50:34 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1f53e425eb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368
Merge pull request #6222 from ZappoMan/hardwareChanged
...
Handle input plugin register/remove when activated/deactivated by menus
2015-10-29 12:24:17 -07:00
Ken Cooke
4d576d7aaf
Fix typo
2015-10-29 12:23:36 -07:00
Ken Cooke
143b9c663f
Quick fix for audio having channels swapped under Qt 5.5.1.
2015-10-29 12:21:28 -07:00
Anthony J. Thibault
f7b6fab0c3
Merge branch 'master' into tony/anim-sync-blend
2015-10-29 11:35:48 -07:00
Brad Hefta-Gaub
851460b2bd
fix build buster for SDL2 missing builds
2015-10-29 11:26:11 -07:00
Howard Stearns
308fd0cf7e
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 11:14:31 -07:00
Brad Hefta-Gaub
3d37a1d249
fix Controller.Hardware when input plugins are deactived
2015-10-29 11:06:20 -07:00
Brad Hefta-Gaub
ed87ae3d5a
remove some debugging
2015-10-29 10:57:30 -07:00
Brad Hefta-Gaub
bab2a7d80f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
2015-10-29 10:56:01 -07:00
Brad Hefta-Gaub
3bbba99e2b
Merge pull request #6178 from samcake/color
...
Refactor the KeyLIght properties in their own group
2015-10-29 10:44:44 -07:00
Howard Stearns
6e4d0043c9
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 10:32:12 -07:00
Howard Stearns
4083c5c71b
Handle wrapping of very long-lived sessions.
2015-10-29 10:31:36 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Ryan Huffman
49877c2dff
Move _hasOutgoingChanges in onSubStep to previous location
2015-10-29 10:19:18 -07:00
Seth Alves
10717dc364
Merge pull request #6154 from howard-stearns/safe-avatar-list-access
...
Safe avatar list access
2015-10-29 10:12:34 -07:00
Brad Hefta-Gaub
a3cd032a41
register/remove devices when the input plugins are activated/deactivated
2015-10-29 10:06:21 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
Andrew Meadows
f9012d5051
Merge pull request #6187 from sethalves/fix-actions-ttl
...
fix actions bug
2015-10-29 09:30:21 -07:00
Howard Stearns
d79d0bc5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:25:41 -07:00
Brad Hefta-Gaub
d324771f6b
Merge pull request #6219 from howard-stearns/fix-avatar-draw-mesh-toggle
...
Fix Developer->Avatar->Draw Mesh
2015-10-28 23:16:51 -07:00
Howard Stearns
697b9fb60b
Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix
...
Fixes locally rendered eye gaze
2015-10-28 21:39:54 -07:00
Howard Stearns
5b6a8eddf9
Merge pull request #6216 from hyperlogic/tony/bug-eyed-mery-fix
...
FBXReader: More deterministic loading behavior
2015-10-28 21:31:57 -07:00
Howard Stearns
8c395209e8
Fix Developer->Avatar->Draw Mesh
...
MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.
2015-10-28 21:23:35 -07:00
Anthony J. Thibault
5e73af9272
Rig: Removed dt from updateFromEyeParameters()
2015-10-28 18:10:41 -07:00
samcake
fd7582ad31
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 17:58:04 -07:00
Anthony J. Thibault
7367f2a28c
FBXReader: remove debugging logs
2015-10-28 17:55:06 -07:00
Atlante45
136747929e
Fix typo
2015-10-28 17:11:46 -07:00
Anthony J. Thibault
5acb088c46
FBXReader: More deterministic loading behavior
...
This makes iteration over meshes and connections between them deterministic.
[QHash](http://doc.qt.io/qt-5/qhash.html#details ) and QMultiHash do not guarantee consistent iteration order.
This is problematic for the FBXReader because it could result in different behavior each time a model was loaded.
Specifically, This was causing a bug with some avatars that contained multiple-bind poses.
The bind pose returned to the application from the FBXReader would be different on different runs.
This PR doesn't add support for multiple-bind poses, but it does make the choice of which
bind pose is chosen deterministic.
This non-determinism was the cause of the Mery avatar having "bug-eyes" 1/12 times.
2015-10-28 16:57:27 -07:00
Atlante45
7695afec0a
Fix ScriptEngine crash
2015-10-28 16:43:41 -07:00
Howard Stearns
8e83943efd
Don't play other avatar's collision sounds.
...
https://app.asana.com/0/32622044445063/61104546898252
2015-10-28 15:43:36 -07:00
samcake
e4aab4bd97
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 15:32:13 -07:00
Brad Hefta-Gaub
61e35d7ada
Merge pull request #6203 from sethalves/fix-action-crash
...
adjust locking in EntityItem::getActionDataInternal
2015-10-28 14:02:28 -07:00
Seth Alves
22d6b6df34
make withWriteLock and withTryWriteLock const
2015-10-28 13:49:52 -07:00
Brad Davis
570b4a32da
Merge pull request #6206 from samcake/controllers
...
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
samcake
b90af1a1ce
Fixing typo and review comments
2015-10-28 13:21:45 -07:00
samcake
07c13f4d66
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 12:54:46 -07:00
samcake
b37a6f689a
Fixing typo and review comments
2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98
Adding the ApplicationStateDevice to the APplication class and add one entry ythere
2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc
Merge pull request #6196 from jherico/gl
...
Move GL utilities to their own library
2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub
c5e22a62e8
Merge pull request #6182 from Atlante45/script-engine
...
Improved ScriptEngine debug messages
2015-10-28 11:27:30 -07:00
Brad Hefta-Gaub
457ec76d3d
CR feedback
2015-10-28 11:21:53 -07:00
Seth Alves
a1096510e8
put some useless consts back
2015-10-28 10:52:01 -07:00
Anthony J. Thibault
b3734b5ddb
Rig: removed redundant method updateEyeJoints()
...
Instead we call updateEyeJoint() twice, once for each eye.
2015-10-28 10:46:09 -07:00
Seth Alves
f6a0004f26
get rid of some useless consts
2015-10-28 10:45:24 -07:00
Seth Alves
08a0bf33a4
avoid unneeded read-lock if action-data was dirty
2015-10-28 09:55:55 -07:00
Seth Alves
d504f449e4
undo last commit -- avoid unneeded read-lock if action-data was dirty
2015-10-28 09:55:11 -07:00
Seth Alves
2b5b4f1118
avoid unneeded read-lock if action-data was dirty
2015-10-28 09:54:16 -07:00
Andrew Meadows
afec2a9771
fix whitespace
2015-10-28 09:42:55 -07:00
