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 Davis
71a6e783e3
Merge pull request #6265 from ZappoMan/fixWarnings
...
warnings fixes
2015-11-01 16:16:17 -08:00
Brad Hefta-Gaub
92bcd9ca9e
make oculus plugin use static glew
2015-11-01 15:48:01 -08:00
Brad Hefta-Gaub
b9d60e803b
fix mac warning
2015-11-01 15:13:28 -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 Davis
1e47a53603
Fixing mac oculus crash
2015-11-01 14:34:03 -08:00
Brad Hefta-Gaub
13e805ac15
replace copy_resolved_item_into_bundle with a version that doesn't report warnings for a status case
2015-11-01 13:18:53 -08:00
Brad Hefta-Gaub
886c4526c0
Merge pull request #6263 from jherico/externals
...
Move ZLib to automatically downloaded externals on Win32
2015-11-01 12:33:05 -08:00
Brad Davis
e0ac48fe27
PR comments
2015-11-01 12:19:19 -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
f751d5bf85
Merge pull request #6264 from ZappoMan/fixControllers
...
tweaks to how VrMenu is shown
2015-11-01 11:29:25 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde
tweaks to how VrMenu is shown
2015-11-01 09:55:30 -08:00
Brad Davis
cad1d28b7b
Updating build notes
2015-11-01 01:49:33 -07: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
7fa6fb1308
Remove GLEW spam in cmake
2015-11-01 01:36:12 -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
286905c20c
Merge pull request #6250 from jherico/peek
...
Adding peek support for endpoints
2015-10-31 16:09:27 -07:00
Brad Hefta-Gaub
77816d818a
make RY map to jump
2015-10-31 16:00:22 -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 Hefta-Gaub
158dfbe4b7
Merge pull request #6261 from sethalves/master
...
fix grab script
2015-10-31 14:30:29 -07:00
Seth Alves
9346366fc5
fix grab script
2015-10-31 14:28:54 -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
Seth Alves
93eed1c0da
Merge pull request #6259 from ZappoMan/fixControllers
...
fix handControllerGrab.js
2015-10-31 14:24:52 -07:00
Brad Hefta-Gaub
46f9a432ab
fix handControllerGrab.js
2015-10-31 14:21:50 -07:00
Brad Davis
9138ca4627
Merge pull request #6258 from ZappoMan/fixControllers
...
fix SDL joysticks
2015-10-31 13:04:21 -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
Brad Hefta-Gaub
2c4bd7e441
Merge pull request #6257 from sethalves/quiet-compiler
...
quiet compiler
2015-10-31 10:29:36 -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
Brad Hefta-Gaub
c53553a00a
Merge pull request #6256 from jherico/sdl22
...
Fixing paths for SDL2 and Sixense libs
2015-10-30 23:30:03 -07:00
Brad Davis
aee03e79f3
Fix win32 and linux Sixense config
2015-10-30 22:37:00 -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
James B. Pollack
c67bfc8883
Merge pull request #6180 from huffman/line-js
...
Add js line library for drawing infinite poly lines
2015-10-30 17:47:31 -07:00
Anthony J. Thibault
2eb62f2fd8
LogHandler: fix for linux build
2015-10-30 17:44:06 -07:00
Brad Davis
ee50df0e2e
Merge pull request #6252 from AlessandroSigna/controllers2
...
Vive controller - fix inverted inputs
2015-10-30 17:26:34 -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
Howard Stearns
2a16b56cba
Merge pull request #6253 from hyperlogic/tony/avatar-manager-real-fix
...
Crash fix for AvatarManager when iterating over _avatarHash
2015-10-30 16:32:34 -07:00
Ryan Huffman
77e0023b43
Fix lifetime bug with first PolyLine in InfiniteLine
2015-10-30 16:31:15 -07:00
