Brad Davis
e0ac48fe27
PR comments
2015-11-01 12:19:19 -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
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
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
Anthony J. Thibault
085282db4f
Crash fix for AvatarManager when iterating over _avatarHash
...
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d ) will *insert*
an empty smart_ptr into the hash.
2015-10-30 16:13:04 -07:00
samcake
710b51fe14
Merge pull request #6251 from ZappoMan/master
...
more tweaking of keyboard input routes
2015-10-30 15:34:51 -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
Seth Alves
c38a252b12
Merge pull request #2 from AndrewMeadows/grab-fixes
...
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:59:16 -07:00
Brad Hefta-Gaub
22324eb281
more tweaking of keyboard input routes
2015-10-30 14:55:33 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Brad Hefta-Gaub
ec92c4e12f
Merge pull request #6248 from ZappoMan/master
...
fix json
2015-10-30 13:17:23 -07:00
Brad Hefta-Gaub
ce7fed2292
fix json
2015-10-30 13:16:31 -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
Brad Hefta-Gaub
56e10552c5
Merge pull request #6246 from samcake/color-bis
...
Fixing a bad field ID for keyLight.AmbientURL and bumping the domain version
2015-10-30 11:46:31 -07:00
Seth Alves
b102081f2f
upon release, set velocity after returning entity to being dynamic
2015-10-30 11:35: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
Brad Hefta-Gaub
b5fd3424b8
Merge pull request #6245 from EdgarPironti/controllers
...
Fixed controllerExample.js parse error
2015-10-30 11:10:08 -07:00
EdgarPironti
f887bbd45c
Fixed controllerExample parse error
2015-10-30 11:06:20 -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
