howard-stearns
|
f60bb1faa5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into restore-text3d-overlay
|
2016-04-06 12:16:19 -07:00 |
|
howard-stearns
|
5284af6b51
|
Update text3d shader post pbr.
|
2016-04-06 12:15:19 -07:00 |
|
ericrius1
|
0e08b15db7
|
spacing fix attempt
|
2016-04-06 11:30:29 -07:00 |
|
Brad Davis
|
e194fc39f4
|
Move the texture transfer context back to the main thread for shutdown
|
2016-04-06 11:29:03 -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 |
|
Zach Pomerantz
|
1e710712cc
|
Check entities scripting thread before signaling it
|
2016-04-06 11:19:07 -07:00 |
|
Seth Alves
|
d09d16082e
|
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
|
2016-04-06 11:05:31 -07:00 |
|
Brad Hefta-Gaub
|
0f4e1e79fd
|
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
|
2016-04-06 11:01:00 -07:00 |
|
Brad Hefta-Gaub
|
8c15116190
|
fix auto-hide logic in depthReticle
|
2016-04-06 11:00:43 -07:00 |
|
ericrius1
|
2be2f940ea
|
remove panel
|
2016-04-06 10:59:18 -07:00 |
|
ericrius1
|
21f6d7bee3
|
fixed largeroom illegal characters
|
2016-04-06 10:50:58 -07:00 |
|
ericrius1
|
ce290a1993
|
got rid of illegal character
|
2016-04-06 10:38:59 -07:00 |
|
ericrius1
|
9cac249122
|
f1
|
2016-04-06 10:36:38 -07:00 |
|
Ryan Huffman
|
5fb898de74
|
Add rolled log files to BugSplat
|
2016-04-06 10:14:12 -07:00 |
|
samcake
|
e28e85a29c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-04-06 09:30:53 -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 |
|
samcake
|
d9bc06d92d
|
Trying to ge5t the proper behavior for the Compression texture and textures in genral...
|
2016-04-05 19:13:24 -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
|
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 |
|
samcake
|
710c4a1b8f
|
TRying to merge and expose counters for in flights transfers
|
2016-04-05 12:18:30 -07: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 |
|