Brad Hefta-Gaub
|
bfc96d277c
|
Merge pull request #7577 from birarda/domain-base64
migrate domain-server basic auth to use SHA256 hash
|
2016-04-06 19:08:52 -07:00 |
|
Brad Hefta-Gaub
|
4f1de77946
|
Merge pull request #7581 from birarda/suppress-more
suppress a couple more noisy messages in AudioRingBuffer
|
2016-04-06 19:08:23 -07:00 |
|
Clément Brisset
|
680ab1e38b
|
Merge pull request #7578 from zzmp/fix/delete-resource-later
Delete resource the Qt way
|
2016-04-06 17:17:47 -07:00 |
|
Brad Hefta-Gaub
|
40e53baa79
|
Merge pull request #7597 from Atlante45/fix/script-sound-hold-strong-ref
Fix audio injectors not working
|
2016-04-06 16:57:29 -07:00 |
|
Zach Pomerantz
|
4300f2e415
|
Delete resource the Qt way
|
2016-04-06 14:43:48 -07:00 |
|
Atlante45
|
6d1b7f1d37
|
Wrap sound script object to hold a strong ref
|
2016-04-06 13:04:18 -07:00 |
|
Brad Hefta-Gaub
|
2ee5b45ca6
|
Merge pull request #7583 from zzmp/log/bookmarks-exists
Do not warn if no bookmarks file
|
2016-04-06 11:20:06 -07:00 |
|
Brad Hefta-Gaub
|
e76a04951c
|
Merge pull request #7582 from zzmp/fix/desktop-signal
Fix showDesktop SIGNAL
|
2016-04-06 08:29:26 -07:00 |
|
Brad Hefta-Gaub
|
51660ab3a8
|
Merge pull request #7579 from sethalves/log-about-webengine-remote-debugging
Log about webengine remote debugging
|
2016-04-06 08:28:37 -07:00 |
|
Brad Hefta-Gaub
|
699c717828
|
Merge pull request #7580 from hyperlogic/tony/keyboard-focus-on-web-entity-fix
Application: focusOut keyboard device when clicking on web entity.
|
2016-04-05 18:44:30 -07:00 |
|
Brad Hefta-Gaub
|
70f3a39463
|
Merge pull request #7593 from hyperlogic/tony/keyboard-focus-improvements
Application: change keyboard input focus when using ui overlay.
|
2016-04-05 18:44:16 -07:00 |
|
Anthony J. Thibault
|
07ff687bfe
|
Application: change keyboard input focus when using ui overlay.
call focusOutEvent on keyboard input plugin when an offscreen ui has activeFocus.
|
2016-04-05 18:12:02 -07:00 |
|
Brad Hefta-Gaub
|
5cf2906cd4
|
Merge pull request #7576 from hyperlogic/tony/show-collision-geometry-fixes
Model: Toggling Physics > Draw Collision Hulls works again
|
2016-04-05 17:50:19 -07:00 |
|
Brad Hefta-Gaub
|
52497b1dfc
|
Merge pull request #7560 from sethalves/remove-handcontroller-touch
remove code that sends entity 'touch' events
|
2016-04-05 17:50:07 -07:00 |
|
Stephen Birarda
|
fdde3f2551
|
Merge pull request #7587 from huffman/fix/assignment-duplicate
Fix AssignmentClient unpacking an assignment when it already has one
|
2016-04-05 17:28:44 -07:00 |
|
Brad Hefta-Gaub
|
891cc12d3f
|
Merge pull request #7549 from zzmp/feat/resource-vis
Add a visualization of cacheable resource usage
|
2016-04-05 15:43:27 -07:00 |
|
Ryan Huffman
|
29c287227c
|
Fix AssignmentClient unpacking an assignment when it already has one
|
2016-04-05 15:30:53 -07:00 |
|
Zach Pomerantz
|
cba866b375
|
Do not warn if no bookmarks file
|
2016-04-05 14:59:57 -07:00 |
|
Zach Pomerantz
|
91126037e0
|
Fix showDesktop SIGNAL
|
2016-04-05 14:59:54 -07:00 |
|
Stephen Birarda
|
d536026ff4
|
suppress a couple more noisy messages in AudioRingBuffer
|
2016-04-05 14:44:20 -07:00 |
|
Seth Alves
|
bda8761e00
|
fix how env variable is accessed
|
2016-04-05 14:30:41 -07:00 |
|
Stephen Birarda
|
a0edbac486
|
change comment for domain-server migration to SHA256
|
2016-04-05 14:12:50 -07:00 |
|
Seth Alves
|
f42e968dda
|
commit to repush to see if github is working yet
|
2016-04-05 14:12:46 -07:00 |
|
Stephen Birarda
|
7cd115f421
|
store and transmit passwords as SHA256 hash
|
2016-04-05 14:11:12 -07:00 |
|
Stephen Birarda
|
13a3b47d1b
|
convert password to base64 before settings post
|
2016-04-05 14:11:12 -07:00 |
|
Stephen Birarda
|
5054243655
|
compare HTTP auth password to base 64 settings value
|
2016-04-05 14:11:12 -07:00 |
|
Stephen Birarda
|
fd2ee8ce4e
|
add migration of plaintext password to base64
|
2016-04-05 14:11:12 -07:00 |
|
Anthony J. Thibault
|
4c632cb4c4
|
Application: focusOut keyboard device when clicking on web entity.
|
2016-04-05 14:00:43 -07:00 |
|
Seth Alves
|
d8282ae799
|
log value of QTWEBENGINE_REMOTE_DEBUGGING before exit
|
2016-04-05 13:56:39 -07:00 |
|
Anthony J. Thibault
|
1a4ae72270
|
Merge branch 'master' into tony/show-collision-geometry-fixes
|
2016-04-05 13:55:51 -07:00 |
|
Brad Hefta-Gaub
|
7c6c75c484
|
Merge pull request #7575 from jherico/oculus_crash
Don't release the Oculus plugin when disabling the plugin
|
2016-04-05 13:50:46 -07:00 |
|
Brad Davis
|
fd4a374e08
|
Add comment
|
2016-04-05 13:04:17 -07:00 |
|
Brad Davis
|
71e6f9bdd6
|
Display a blank frame before switching away from oculus
|
2016-04-05 13:03:14 -07:00 |
|
Anthony J. Thibault
|
6a7a572b53
|
Model: Toggling Physics > Draw Collision Hulls works again
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
|
2016-04-05 11:06:24 -07:00 |
|
Brad Davis
|
ffc2c75534
|
Don't release the Oculus plugin when disabling the plugin
|
2016-04-05 09:59:12 -07:00 |
|
Brad Hefta-Gaub
|
08a19c0471
|
Merge pull request #7554 from jherico/load_stutter2
Addressing stuttering in the frame while loading content - Part 2
|
2016-04-05 09:45:31 -07:00 |
|
Brad Hefta-Gaub
|
3fee1abd2d
|
Merge pull request #7574 from zzmp/guard/octree-del
Hold onto octree child after creation
|
2016-04-05 09:45:00 -07:00 |
|
Ryan Huffman
|
ab89e47bba
|
Merge pull request #7562 from hyperlogic/tony/make-debugger-work-again
Fix for debugging on windows
|
2016-04-05 09:08:50 -07:00 |
|
Brad Hefta-Gaub
|
ff4f693267
|
Merge pull request #7553 from zzmp/fix/tex-invoke-method
Fix ImageReader threading issues
|
2016-04-04 18:29:24 -07:00 |
|
Zach Pomerantz
|
ac30aed948
|
Hold onto octree child after creation
|
2016-04-04 17:52:41 -07:00 |
|
Brad Davis
|
c168e2cc58
|
PR feedback
|
2016-04-04 16:53:30 -07:00 |
|
Seth Alves
|
d60fcdbf42
|
Merge pull request #7569 from highfidelity/revert-7544-faster-kinematics
Revert "faster kinematic motion for entities"
|
2016-04-04 16:12:08 -07:00 |
|
Seth Alves
|
69bb0ebd74
|
Revert "faster kinematic motion for entities"
|
2016-04-04 16:11:54 -07:00 |
|
Brad Davis
|
e86066c1ce
|
Merge pull request #7563 from hyperlogic/tony/jittery-hands-fix
Application: fix for jittery hands when moving.
|
2016-04-04 15:58:22 -07:00 |
|
Seth Alves
|
c48a67b933
|
Merge pull request #7544 from AndrewMeadows/faster-kinematics
faster kinematic motion for entities
|
2016-04-04 15:26:32 -07:00 |
|
Philip Rosedale
|
f3d948e20f
|
Merge pull request #7564 from sethalves/search-ray-follows-controller
make handGrabController search ray follow controller
|
2016-04-04 14:38:05 -07:00 |
|
Stephen Birarda
|
4fb53246a9
|
Merge pull request #7561 from zzmp/log/checkin-reset
Log when limit of checkins reached
|
2016-04-04 14:26:32 -07:00 |
|
Zach Pomerantz
|
107cfcf10b
|
Change Resource setBytes->setSize
|
2016-04-04 13:59:57 -07:00 |
|
Zach Pomerantz
|
f34e951c3f
|
Make resource cache props thread-safe
|
2016-04-04 13:59:56 -07:00 |
|
Brad Hefta-Gaub
|
606cf55b1b
|
Merge pull request #7565 from ZappoMan/simpleTestPR
Simple test PR
|
2016-04-04 13:31:28 -07:00 |
|