Seth Alves
c381da24a7
get interface building on my linux box
2015-11-02 10:42:06 -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
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
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
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
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
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
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
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
