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 |
|
James B. Pollack
|
cb8adf6c2f
|
Merge branch 'homereset' of github.com:imgntn/hifi into homereset
|
2016-04-05 18:23:46 -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 |
|
James B. Pollack
|
1598c2fade
|
Merge pull request #21 from ericrius1/atpHomeReset
lamp is now always grabbable
|
2016-04-05 17:31:48 -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 |
|
ericrius1
|
ed3b9ab209
|
lamp is now always grabbable
|
2016-04-05 16:42:04 -07:00 |
|
James B. Pollack
|
7d6018e895
|
Merge pull request #20 from ericrius1/atpHomeReset
Whiteboard marker and eraser fixes, and some name changes
|
2016-04-05 16:04:40 -07:00 |
|
ericrius1
|
bf46eda6c1
|
name changes
|
2016-04-05 15:57:32 -07:00 |
|
James B. Pollack
|
738d3d249b
|
lid stuff
|
2016-04-05 15:54:13 -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 |
|
ericrius1
|
1257fac0f5
|
removed s3 paths
|
2016-04-05 15:08:32 -07:00 |
|
ericrius1
|
bd4e3b3460
|
whiteboard markers and erasers now spawn back at rack when they collide with home
|
2016-04-05 15:01:08 -07:00 |
|
Zach Pomerantz
|
37efeb7f29
|
Avoid warning for expected unset PresentThread
|
2016-04-05 14:59:59 -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 |
|
Zach Pomerantz
|
6bcfeccdd8
|
Log failed MenuUserData::forObject
|
2016-04-05 14:59:52 -07:00 |
|
Zach Pomerantz
|
062760ff3b
|
Log failed routes
|
2016-04-05 14:59:48 -07:00 |
|
howard-stearns
|
1de3aaffc7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes
|
2016-04-05 14:58:27 -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 |
|
David Rowe
|
c9c414d5a8
|
Fix entities editor display of large negative coordinates and angles
|
2016-04-06 07:45:04 +12:00 |
|
howard-stearns
|
da4975e817
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes
|
2016-04-05 11:09:01 -07:00 |
|
Seth Alves
|
d5136f011c
|
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
|
2016-04-05 11:08:38 -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 |
|
James B. Pollack
|
40be28a916
|
Merge branch 'homereset' of github.com:imgntn/hifi into homereset
|
2016-04-05 10:33:58 -07:00 |
|
James B. Pollack
|
024ce4954c
|
wrappers
|
2016-04-05 10:33:54 -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 |
|
James B. Pollack
|
9f60a4e05c
|
music boxin it
|
2016-04-05 09:37:00 -07:00 |
|
howard-stearns
|
21c3a8813a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sandbox-entity-includes
|
2016-04-05 09:25:40 -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 |
|
James B. Pollack
|
e780e46d5f
|
most of a music box
|
2016-04-04 19:56:25 -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 |
|