Commit graph

41839 commits

Author SHA1 Message Date
David Rowe
e37e46d34a Disable arrow keys being able to move between HTML form fields
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
2016-04-08 10:30:00 +12:00
Brad Hefta-Gaub
dc4751a95b Merge pull request #7595 from ZappoMan/depthReticleWork
Fix a random case of the depth reticle hiding when it shouldn't
2016-04-07 12:06:20 -07:00
Brad Hefta-Gaub
50a081db00 Merge pull request #7596 from jherico/texture_transfer_fix
Move the texture transfer context back to the main thread for shutdown
2016-04-07 09:31:42 -07:00
Brad Hefta-Gaub
ce1625b551 Merge pull request #7600 from sethalves/fix-entity-script-error-message
attempt to make the failed-to-load-entity-script error-message be more helpful
2016-04-07 09:17:04 -07:00
Brad Hefta-Gaub
94e797d752 Merge pull request #7585 from zzmp/log/failed-routes
Log failed routes
2016-04-07 09:16:26 -07:00
Brad Hefta-Gaub
e78b202433 Merge pull request #7602 from ZappoMan/default1PView
default to first person view
2016-04-07 09:16:04 -07:00
Brad Hefta-Gaub
7f164a7959 CR feedback 2016-04-07 08:42:40 -07:00
Brad Hefta-Gaub
07a508f3ac Merge pull request #7604 from ZappoMan/loginRedraw
fix redraw issue when logging in to or out of a domain
2016-04-07 08:30:59 -07:00
Ryan Huffman
254f7675d1 Merge pull request #7608 from ctrlaltdavid/fix-edit-checkboxes
Fix checkbox being clickable outside of checkbox and label extents
2016-04-07 08:22:22 -07:00
Brad Hefta-Gaub
986b4bea7c Merge pull request #7603 from zzmp/fix/entities-thread-crash
Fix intermittent crash on exit
2016-04-07 08:21:51 -07:00
Brad Hefta-Gaub
384ead8e4e Merge pull request #7599 from howard-stearns/restore-text3d-overlay
Restore text3d overlay
2016-04-07 08:21:28 -07:00
David Rowe
fd7a6ed042 Fix checkbox being clickable outside of checkbox and label extents 2016-04-07 17:20:40 +12:00
Brad Hefta-Gaub
cef599eaed Merge pull request #7586 from zzmp/log/failed-menu
Log failed MenuUserData::forObject
2016-04-06 19:44:05 -07:00
Brad Hefta-Gaub
cea622f6f1 Merge pull request #7571 from howard-stearns/sandbox-entity-includes
Sandbox entity includes
2016-04-06 19:11:25 -07:00
Brad Hefta-Gaub
89a7b5f731 Merge pull request #7548 from ericrius1/roomAudio
Add examples for entity scripts that set up audio reverb zones
2016-04-06 19:09:09 -07:00
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
Brad Hefta-Gaub
5f4d6ca1d3 CR feedback 2016-04-06 19:07:26 -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
06e827cb5e Guard against no script engine thread affinity 2016-04-06 15:41:13 -07:00
howard-stearns
f35c59ce5f Guard against meaningless query and fragment parts. 2016-04-06 15:21:43 -07:00
Brad Hefta-Gaub
47aed9c8bd fix redraw issue when logging in to or out of a domain 2016-04-06 14:56:20 -07:00
Zach Pomerantz
4300f2e415 Delete resource the Qt way 2016-04-06 14:43:48 -07:00
Seth Alves
672b4df7c1 get rid of magic number 2016-04-06 13:36:44 -07:00
Brad Hefta-Gaub
1f708ccb57 default to first person view 2016-04-06 13:35:08 -07:00
Atlante45
6d1b7f1d37 Wrap sound script object to hold a strong ref 2016-04-06 13:04:18 -07:00
Seth Alves
21c2db7cdc attempt to make the failed-to-load-entity-script error-message be more helpful 2016-04-06 12:40:59 -07:00
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
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
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