Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 07:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 25 branches 0 tags 1.1 GiB
Commit graph

16414 commits

Author SHA1 Message Date
David Rowe
fb0f97264c Style HMD menu items 2016-03-11 15:24:35 +13:00
Stephen Birarda
39e869fdfd append a trailing slash for folder rename 2016-03-10 17:54:38 -08:00
Philip Rosedale
e87ef52a4c Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay 
More reliable and usable UI sphere overlay location
 2016-03-10 17:43:50 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Stephen Birarda
52ee2499fc add trim prior to rename in AssetServer 2016-03-10 16:57:39 -08:00
Stephen Birarda
979fda7c8b add trimming for upload mapping 2016-03-10 16:57:39 -08:00
Stephen Birarda
ed4df72eed cleanup logging for asset browser 2016-03-10 16:57:39 -08:00
Stephen Birarda
96a112290f use mapping for overwrite prompt 2016-03-10 16:56:22 -08:00
Atlante45
4a9d88d213 CR 2016-03-10 16:55:51 -08:00
Atlante45
16287b7040 Disable add to world for uncompatible files 2016-03-10 16:44:39 -08:00
Atlante45
35f5ebb938 Don't allow folder overwrite 2016-03-10 16:44:39 -08:00
Stephen Birarda
2fb478ff3c Merge pull request #99 from huffman/atp-more 
Atp more
 2016-03-10 16:22:05 -08:00
Ryan Huffman
ad0fb18d81 Add / to beginning of mapping on upload if missing 2016-03-10 16:02:41 -08:00
Brad Davis
e452020126 Better threaded handling of QML overlays 2016-03-10 15:50:07 -08:00
Ryan Huffman
2d4864ed33 Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 15:40:07 -08:00
Ryan Huffman
76ed16314a Add prepended slash on rename if missing 2016-03-10 15:38:20 -08:00
Stephen Birarda
e29565a717 don't default to yes when prompted for overwrite 2016-03-10 15:32:12 -08:00
Stephen Birarda
672bafc09d Merge pull request #95 from Atlante45/feat/atp 
Wire upload
 2016-03-10 15:30:53 -08:00
Anthony J. Thibault
c0880a570e Stats: fix for avatar velocity stat being stuck at 0.1 2016-03-10 15:15:46 -08:00
Atlante45
a6ccfb1685 CR 2016-03-10 15:11:39 -08:00
Stephen Birarda
cf12a8d396 always center the text in the message dialog 2016-03-10 15:02:19 -08:00
Atlante45
63571a7c36 Make sure Upload is not clicked several times 2016-03-10 14:59:20 -08:00
Atlante45
548d826a4e Couple bug fixes 2016-03-10 14:59:20 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Atlante45
dc79d3262a Update glyphs font 2016-03-10 14:59:20 -08:00
Stephen Birarda
7f0917ea00 add to world in front of MyAvatar 2016-03-10 14:49:07 -08:00
Stephen Birarda
e227f68353 tweak wording for overwrite dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
5167cf69b2 fix for add to world and delete dialog 2016-03-10 14:49:07 -08:00
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
Stephen Birarda
1678c9be20 add a keyboard shortcut for the asset directory 2016-03-10 14:48:44 -08:00
Stephen Birarda
8cc0ae3148 menu and naming changes for asset server directory 2016-03-10 14:48:44 -08:00
Ryan Huffman
c93ba2752b Remove rowDelegate styling for asset window 2016-03-10 14:44:53 -08:00
David Rowe
2b45971f8c Style HMD menu backgrounds 2016-03-11 11:42:49 +13:00
Ryan Huffman
e4b5c14a4c Merge branch 'atp' of github.com:birarda/hifi into atp-more 2016-03-10 14:20:22 -08:00
Ryan Huffman
ef8c66c1be Remove commented out code 2016-03-10 14:18:09 -08:00
samcake
ad7d567932 Fixing the overlay renderItem access issue 2016-03-10 14:09:34 -08:00
Ryan Huffman
71bc937533 Remove copy URL button 2016-03-10 13:56:54 -08:00
Ryan Huffman
273acc6a7e Add context menu to asset manager 2016-03-10 13:55:36 -08:00
Philip Rosedale
e1f91ae8b0 Merge pull request #7311 from hyperlogic/tony/raise-your-hands-in-the-air 
MyAvatar: Allow user to raise hands directly overhead.
 2016-03-10 13:45:15 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Anthony J. Thibault
6d11dd465c Application: reset avatar on displayMode change 
but not HMD sensor.
 2016-03-10 13:12:09 -08:00
Zach Pomerantz
b627a17ce9 Allow px/color skybox without tex 2016-03-10 12:58:49 -08:00
Andrew Meadows
a5e94ec087 Merge pull request #7307 from ctrlaltdavid/update-glyphs 
Update HiFi glyphs font file
 2016-03-10 12:55:32 -08:00
David Rowe
bbe507ec05 Add file headers and update Qt versions in VR menu QML files 2016-03-11 09:53:10 +13:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Stephen Birarda
b0c326fa2c Merge pull request #92 from huffman/atp-more 
Atp more
 2016-03-10 10:51:12 -08:00
Ryan Huffman
0df05d273d Implement addToWorld in asset window 2016-03-10 10:25:51 -08:00
Anthony J. Thibault
4a78300607 MyAvatar: Allow user to raise hands directly overhead. 
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head.  Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
 2016-03-10 10:20:17 -08:00
Brad Hefta-Gaub
ee727b0632 Merge pull request #7304 from Atlante45/master 
Fix messed up LogDialog multi-lines
 2016-03-10 09:23:35 -08:00
Stephen Birarda
899595183e add reload of mappings on component complete 2016-03-10 09:02:45 -08:00
Stephen Birarda
f1919031de error message boxes for mapping errors 2016-03-10 08:57:37 -08:00
Brad Hefta-Gaub
82ca78b37b Merge pull request #7300 from sethalves/fix-detach-crash 
fix removing attachments
 2016-03-10 08:23:52 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
David Rowe
4c3f374f02 Update HiFi glyphs font file 
Has some new, soon to be used characters, but no other changes.
 2016-03-10 15:10:44 +13:00
Anthony J. Thibault
5f1b8805cf Removed unnecessary include 2016-03-09 17:37:51 -08:00
Atlante45
f6e01bbd36 Fix messed up LogDialog multi-lines 2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120 Update the watchdog heartbeat manually during startup 2016-03-09 17:00:45 -08:00
Ryan Huffman
dd52dd69d9 Fix rename mapping 2016-03-09 16:50:37 -08:00
Anthony J. Thibault
886457939d Merge branch 'master' into tony/wrong-way-overlay 2016-03-09 16:50:18 -08:00
Ryan Huffman
232bfc9061 Cleanup AssetServer qml 2016-03-09 16:44:31 -08:00
Howard Stearns
2b576e86f0 Merge pull request #7259 from jherico/crashes 
Crash fixes
 2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Ryan Huffman
0d2ae4f3a4 Merge branch 'atp' of github.com:birarda/hifi into atp-model 2016-03-09 16:33:53 -08:00
Ryan Huffman
f23057b1c0 Add renaming to Asset qml 2016-03-09 16:29:17 -08:00
Anthony Thibault
5df616be37 OpenVR: More usable UI Sphere overlay location 
Also, added a debug option to display SensorToWorld matrix in Developer > Avatar menu.
 2016-03-09 16:24:08 -08:00
Ryan Huffman
f5497aa1e7 Add new AssetMappingsScriptingInterface and add mappings model 2016-03-09 14:53:04 -08:00
Brad Davis
23a89a63d8 Set deadlock thread name 2016-03-09 14:51:19 -08:00
Seth Alves
d95d0f59cb keep removed attachment models around for one extra call to fixupModelsInScene 2016-03-09 14:36:50 -08:00
Anthony J. Thibault
4af3766804 Don't reset sensors when initializing or changing display plugins. 
This should fix the issue with the Oculus starting up with the UI aligned
to the HMD on your desk, rather then the configured default sitting pose.
 2016-03-09 14:28:26 -08:00
Stephen Birarda
57ea51d244 Merge pull request #84 from Atlante45/feat/atp 
Replace old drag&drop with new UI
 2016-03-09 14:26:49 -08:00
Atlante45
6bd7afc7b3 Confirm overrides 2016-03-09 14:19:28 -08:00
Zach Pomerantz
21719b3980 Wait 10m for DEBUG deadlocks 2016-03-09 14:07:36 -08:00
Ryan Huffman
4da4fd889a Add AssetMappingModel 2016-03-09 14:03:56 -08:00
Ryan Huffman
fd5a5dd8f4 Add QJSEngine compatible AssetMappingScriptInterface 2016-03-09 14:03:25 -08:00
Brad Davis
d428f3b96f Working on crash bugs 2016-03-09 14:00:05 -08:00
Brad Davis
cac31761c0 Safer shutdown code in deadlock thread 2016-03-09 13:45:01 -08:00
Stephen Birarda
2e9ee4f8a7 Merge branch 'atp' of github.com:birarda/hifi into atp 2016-03-09 12:16:59 -08:00
Stephen Birarda
9a2b2b4c16 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-09 12:16:46 -08:00
Brad Hefta-Gaub
e038c8a43c Merge branch 'master' of https://github.com/highfidelity/hifi into bugfixes 2016-03-09 11:47:55 -08:00
Atlante45
5a0beec1f5 Replace old drag&drop with new UI 2016-03-09 11:47:31 -08:00
Brad Davis
80fdef4348 Ensure the heartbeat has a valid value before the thread starts 2016-03-09 10:53:01 -08:00
Ryan Huffman
eb402eab75 Fix bugsplat username setting 2016-03-09 10:21:59 -08:00
Ryan Huffman
d20cf12941 Add HF username as default username for bugsplat 2016-03-09 10:21:59 -08:00
Anthony J. Thibault
4691ca1716 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-09 10:06:28 -08:00
Brad Hefta-Gaub
1c07276501 fix a couple bugs 2016-03-09 09:45:55 -08:00
Brad Hefta-Gaub
5862181e70 Merge pull request #7288 from jherico/watchdog 
Add a watchdog thread to trigger a crash on detecting a deadlock
 2016-03-09 09:18:48 -08:00
Seth Alves
efdef52081 Merge pull request #7269 from ctrlaltdavid/20822 
Restyle bookmark dialogs
 2016-03-09 07:31:15 -08:00
Brad Davis
95f5d82d37 Add a watchdog thread to trigger a crash on detecting a deadlock 2016-03-09 00:32:46 -08:00
Chris Collins
d1401796d8 Merge pull request #7284 from ctrlaltdavid/fix-raleway-semibold 
Fix case of RalewaySemiBold font name
 2016-03-08 21:24:15 -08:00
Atlante45
380480d4ee Add a couple more dialogs 2016-03-08 18:19:26 -08:00
Brad Hefta-Gaub
cb70c398cd Merge pull request #7233 from jherico/vive_menu 
Fix the Vive controllers to support menus
 2016-03-08 18:03:32 -08:00
samcake
bfed0304c3 Merge pull request #7218 from zzmp/fix/resort-in-octree 
Fix item key lookup on updated items in scene
 2016-03-08 17:48:51 -08:00
Anthony J. Thibault
deb17e1f93 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-08 17:45:50 -08:00
Atlante45
169af80bc0 Add a couple dialogs 2016-03-08 17:11:54 -08:00
Atlante45
028c7ab6ba Add text box 2016-03-08 17:11:54 -08:00
Atlante45
254e04c4b7 UI change 2016-03-08 17:11:54 -08:00
Stephen Birarda
87d5958eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-08 17:11:18 -08:00
David Rowe
973fa28d3f Fix case of RalewaySemiBold font name 2016-03-09 13:32:37 +13:00
David Rowe
155a084eaa Temporarily rename file a part of changing case of filename 2016-03-09 13:08:44 +13:00
David Rowe
269936f3ac Fix typo 2016-03-09 12:20:09 +13:00
Brad Davis
f651adbd24 Correcting vive button naming 2016-03-08 15:12:54 -08:00
Brad Davis
1312901f06 Removing thumb mappings, using start/back for camera and menu 2016-03-08 15:09:45 -08:00
Brad Davis
ac1ab4b5b7 Map the primary thumbs to menu/camera as well as the secondary thumb 2016-03-08 15:09:44 -08:00
David Rowe
edc50f102d Fix "duplicate bookmark" dialog 2016-03-09 11:55:09 +13:00
Brad Hefta-Gaub
35d6afbe77 Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable 2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5 first cut at fixing the scene not stable bug 2016-03-08 14:52:21 -08:00
David Rowe
10e4e5e3a7 Use OffscreenUI icon enum instead of QMessageBox icon enum 2016-03-09 11:33:55 +13:00
David Rowe
03fb6b1444 Add ability to have icons in query dialogs 
Add icon to bookmark dialogs' titles.
 2016-03-09 10:45:14 +13:00
Atlante45
0bed46d43a Fix typos and file browser directory 2016-03-08 13:24:36 -08:00
Atlante45
74fb1aab55 Add file dialog 2016-03-08 13:15:04 -08:00
Atlante45
e32fd4524c Start wiring UI 2016-03-08 13:13:45 -08:00
Atlante45
ded449072f Rename window 2016-03-08 13:13:45 -08:00
Atlante45
e0371929a2 Remove unused variables 2016-03-08 13:13:45 -08:00
Atlante45
51be88d4c3 Reset Window changes 2016-03-08 13:13:45 -08:00
Atlante45
320bd2b4d4 Reset ContentSection scheme 2016-03-08 13:13:45 -08:00
Atlante45
d0e29846f4 Add GlyphButton 2016-03-08 13:13:45 -08:00
Atlante45
6fecb4e1d1 Window fixup 2016-03-08 13:13:45 -08:00
Atlante45
30a6dd8629 Update StaticSection 2016-03-08 13:13:45 -08:00
Atlante45
82d6d3ff01 Small fix to buttons color 2016-03-08 13:13:45 -08:00
Atlante45
784f669998 First draft Assets Manager 2016-03-08 13:13:45 -08:00
Stephen Birarda
969244927b use extension for entity add for drag and drop upload 2016-03-08 13:09:20 -08:00
Stephen Birarda
28af9c51e6 add a missing parenthesis 2016-03-08 12:22:13 -08:00
Stephen Birarda
8fa32e75b2 client side fixes for upload with no extension 2016-03-08 12:19:15 -08:00
Stephen Birarda
bfb9801b22 Merge branch 'atp' of github.com:birarda/hifi into atp-mappings 2016-03-08 11:37:27 -08:00
Anthony J. Thibault
e046ba64dd Properly marshal fakeMouseEvent data from script thread to main thread 2016-03-08 10:58:54 -08:00
Seth Alves
b780fad83f Merge pull request #7270 from birarda/local-socket-check 
add a secondary method for local socket check
 2016-03-08 10:48:08 -08:00
Brad Hefta-Gaub
19ad4314ca Merge pull request #7276 from jherico/bookmarks 
Don't trigger modal dialog from menu handler
 2016-03-08 10:29:29 -08:00
Zach Pomerantz
d1324b2e7a Merge branch 'master' of github.com:highfidelity/hifi into fix/resort-in-octree 2016-03-08 10:22:25 -08:00
Brad Hefta-Gaub
50eb07d465 Merge pull request #7221 from jherico/threaded_compositing2 
Migrate composition of the overlay and pointer to the present thread
 2016-03-08 10:22:02 -08:00
Brad Hefta-Gaub
ed67ef8f14 Merge pull request #7247 from jherico/qml_script_messaging 
Allow message passing from a script to a QML window
 2016-03-08 10:21:09 -08:00
Brad Davis
f08f54fd22 Don't trigger modal dialog from menu handler 2016-03-07 21:48:07 -08:00
James B. Pollack
2e9ebfb178 remove avatar head and body from pacakage model selections 2016-03-07 21:03:11 -08:00
David Rowe
2aaf9ff0d0 Update message dialogs to use HiFi-Glyphs icons 2016-03-08 17:13:05 +13:00
Anthony J. Thibault
3d71226f72 Crash fix for moving reticle via script. 
sendMessage is not thread-safe, use invokeMethod to call into application thread instead.
 2016-03-07 18:33:09 -08:00
David Rowe
e5188108a1 Fix width of delete bookmark drop-down 2016-03-08 15:21:15 +13:00
Stephen Birarda
ed9faf4189 add a secondary check for local IP address 2016-03-07 18:00:09 -08:00
Brad Davis
8988dd9771 Fix mouse drag turning 2016-03-07 17:14:44 -08:00
Brad Davis
634f8fbc83 Fix texture leak 2016-03-07 17:14:43 -08:00
Brad Davis
28103cf5ef Migrate composition of the overlay and pointer to the present thread 2016-03-07 17:14:41 -08:00
David Rowe
2f91b29c06 Set default focus 2016-03-08 14:03:54 +13:00
David Rowe
09390ffffd Remove colon from dialog label 2016-03-08 14:00:49 +13:00
David Rowe
b71a512a6f Reorder OK and Cancel buttons 2016-03-08 13:58:20 +13:00
David Rowe
7f2938c53f Tidy message dialog code 2016-03-08 13:56:25 +13:00
David Rowe
b7fd5467ba Restyle query dialogs 2016-03-08 13:53:05 +13:00
David Rowe
d893b2e3b1 Handle no icon in modal dialogs 2016-03-08 13:52:24 +13:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
Philip Rosedale
7c765f3d5a Merge pull request #7258 from hyperlogic/tony/better-lean-detection 
MyAvatar: use a box instead of a sphere for horizontal re-centering
 2016-03-07 15:05:10 -08:00
Seth Alves
34a76f1962 Merge pull request #7265 from ctrlaltdavid/fix-treeview 
Fix Running Script's tree view
 2016-03-07 14:03:50 -08:00
Stephen Birarda
267ed3af82 remove client side handling of extension for ATP hash URLs 2016-03-07 13:57:02 -08:00
David Rowe
e6b81b31d8 Fix Running Script's tree view 2016-03-08 09:59:00 +13:00
Chris Collins
7850ca3576 Merge pull request #7227 from hyperlogic/tony/eye-look-at-fixes 
Avatar eye look at fixes for HMD and desktop
 2016-03-07 11:50:16 -08:00
Anthony Thibault
2cbb41fd38 MyAvatar: bug fix for forward/backward lean detection 2016-03-07 10:11:22 -08:00
Anthony J. Thibault
aefeff2493 MyAvatar: Use a box instead of a sphere for horizontal re-centering 2016-03-07 09:50:38 -08:00
Philip Rosedale
ee3e0fcc38 Merge pull request #7238 from hyperlogic/tony/hmd-follow-work 
MyAvatar: Improved body recentering for room scale
 2016-03-04 15:51:07 -08:00
Anthony Thibault
0de19d13c4 MyAvatar: open up horizontal leaning threshold 2016-03-04 15:28:38 -08:00
Brad Hefta-Gaub
30bcb04a2f Merge pull request #7149 from jherico/overlays_qml 
Make Overlay API usable from QML
 2016-03-04 15:00:45 -08:00
Brad Davis
468cb05571 Merge pull request #7231 from ctrlaltdavid/20812 
Restyle settings dialogs
 2016-03-04 14:33:21 -08:00
David Rowe
b4c489d4c6 Fix not reliably being able to select "None" in Graphics settings 2016-03-05 10:17:39 +13:00
Brad Davis
4e1f78b585 Allow message passing from a script to a QML window 2016-03-04 13:11:08 -08:00
Anthony Thibault
37ba0ecd9f MyAvatar: prevent face from being visible when crouching 
Overall, this should fix many of the issues with the head being visible when it shouldn't.
 2016-03-04 11:48:55 -08:00
Brad Davis
2f89253dc1 Make Overlays usable from QML 2016-03-04 11:35:54 -08:00
Anthony J. Thibault
dc456cbdbe MyAvatar: dropped vertical recenter limit. 2016-03-04 11:15:11 -08:00
Ryan Huffman
f21815e332 Merge pull request #7245 from birarda/domain-security 
manually install OpenSSL DLLs for Qt
 2016-03-04 09:23:21 -08:00
Brad Hefta-Gaub
5b2c3b4b26 Merge pull request #7243 from thoys/20821 
CR for Job #20821 - Remove stray tray icon
 2016-03-03 18:10:56 -08:00
Stephen Birarda
3750d5d780 manually install OpenSSL DLLs for Qt 2016-03-03 17:57:34 -08:00
Brad Hefta-Gaub
7bb87305d4 Merge pull request #7234 from zzmp/fix/line3d-back-cull 
Render line3d without backface culling
 2016-03-03 17:16:54 -08:00
Thijs Wenker
17f0688db5 removed stray traybar icon 2016-03-03 19:18:47 +01:00
David Rowe
1eb6fa425c Fix up Running Scripts dialog 2016-03-03 20:09:50 +13:00
David Rowe
f88eef7549 Update section headers 2016-03-03 19:17:48 +13:00
David Rowe
fb675dbaf5 Add vertical spacing above other settings fields 2016-03-03 18:49:13 +13:00
David Rowe
2d250e2f64 Only the first checkbox in a group has vertical space before it 2016-03-03 17:51:14 +13:00
David Rowe
a41f409e33 Defer dialog vertical spacing decisions to content items 2016-03-03 17:49:18 +13:00
Anthony J. Thibault
2a75084579 Merge branch 'master' into tony/hmd-follow-work 2016-03-02 17:44:13 -08:00
David Rowe
4729020df1 Change section expand/collapse icons 2016-03-03 14:32:08 +13:00
David Rowe
46bb3c05a5 Right justify leading control labels 2016-03-03 14:17:02 +13:00
David Rowe
81f13afb4e Tweak look of combo box control 2016-03-03 10:24:42 +13:00
David Rowe
c83ed578db Merge branch 'master' into 20812 2016-03-03 02:01:20 +13:00
David Rowe
c3b47088c9 Fix slider vertical alignment 2016-03-03 01:59:21 +13:00
David Rowe
a51dd43dff Wrap labels 2016-03-03 01:56:02 +13:00
David Rowe
c1f5bac86a Style the ComboBox 2016-03-03 01:14:00 +13:00
David Rowe
98ad785267 Get ComboBox working 2016-03-03 00:04:15 +13:00
David Rowe
829c858b04 Start on ComboBox again using Austin's HMD-compatible code 2016-03-02 22:18:12 +13:00
David Rowe
4d53dee29c Rename section control 2016-03-02 19:46:26 +13:00
David Rowe
e79427bb3b Make some settings dialogs have collapsible sections 2016-03-02 19:41:50 +13:00
Brad Hefta-Gaub
cfce5af8d4 Merge pull request #7191 from samcake/orange 
Better Shading Model and support fr Stingray material
 2016-03-01 18:24:09 -08:00
Anthony J. Thibault
6e80665107 MyAvatar: reduced rotation re-center threshold to 30 degrees 
Also, warning fix for Linux.
 2016-03-01 17:45:16 -08:00
Anthony J. Thibault
2dfc517d14 MyAvatar: re-center vertically, on x & z drive keys 2016-03-01 16:45:36 -08:00
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
David Rowe
20bf07550a Update to new HiFi-Glyphs font file 2016-03-02 13:10:52 +13:00
Anthony J. Thibault
be446f4e96 MyAvatar: separate rotation, horizontal and vertical HMD follow 2016-03-01 15:38:02 -08:00
David Rowe
d1f4369a5f Fix width of divider above buttons at bottom of settings dialogs 2016-03-02 12:00:29 +13:00
Zach Pomerantz
48aaac2971 Render line3d without backface culling 2016-03-01 14:57:02 -08:00
David Rowe
16fbf60bae Update preferences dialog titles to match menu items 2016-03-02 11:52:58 +13:00
Zach Pomerantz
5c64115b26 Use keyLight in DLE instead of _skyboxTexture 2016-03-01 14:44:34 -08:00
Stephen Birarda
248aa58d23 force statically linked OpenSSL on windows 2016-03-01 13:04:37 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562 Merge pull request #7217 from huffman/udt-random-seq 
Randomize initial send sequence number in UDT
 2016-03-01 12:59:10 -08:00
David Rowe
881302df02 Merge branch 'master' into 20812 2016-03-02 09:55:17 +13:00
David Rowe
5a3f74d51b Style drop-down combo box for Developer > Graphics... 2016-03-02 09:53:10 +13:00
David Rowe
a309a2e08f Style slider controls 2016-03-02 09:24:57 +13:00
Atlante45
14ae35e741 CR 2016-03-01 12:00:43 -08:00
Atlante45
4944d0a8d0 Handle threading inside AssetServer 2016-03-01 12:00:43 -08:00
Atlante45
f0ccada945 Fix for Ubuntu 2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b Temporary fix to disk cache editor crash 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Andrew Meadows
c1b3858193 Merge pull request #7228 from ZappoMan/hmdHacking 
HMD and Away improvements
 2016-03-01 11:48:09 -08:00
Ryan Huffman
cc9c87d281 Fix packet version mismatch not showing for domain packets 2016-03-01 11:36:49 -08:00
Anthony J. Thibault
506e46faee MyAvatar: fix for missing include 2016-03-01 11:21:14 -08:00
Anthony J. Thibault
babf48ac57 MyAvatar: take IPD scale into account when computing corrected eye lookAt 2016-03-01 11:17:03 -08:00
Anthony J. Thibault
3cde972174 Rig: issue warnings for missing joints 
Also, Removed Rig::computeEyesInRigFrame, it was causing warnings because it was looking up
Eye and Head joints for all models, not just avatars.
 2016-03-01 11:07:22 -08:00
samcake
7120b64a33 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-01 10:53:40 -08:00
Chris Collins
926b93b4db Merge pull request #7224 from ctrlaltdavid/20816 
Change Running Scripts reload, close, and tree buttons when pressed
 2016-03-01 10:26:58 -08:00
Brad Hefta-Gaub
a3f4dbddcf Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-29 20:23:14 -08:00
Brad Hefta-Gaub
2c3fdc995f Away improvements 2016-02-29 20:23:06 -08:00
samcake
e72035ee3d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 18:55:30 -08:00
Anthony J. Thibault
460582239a Avatar eye look at fixes for HMDs 
There were three things that were causing issues with eye look at vectors while wearing an HMD.

1) The matrix returned by AvatarUpdate->getHeadPose() was in the wrong space, it should be in avatar space.
   it was actually returning a matrix in sensor/room space.
2) The lookAtPosition was incorrect while wearing an HMD and with no avatars to look at.
3) The eye rotation limits in Rig::updateEyeJoint were relative to the model's zero orientation, NOT relative to the head.
   this was causing the eyes to hit limits when the avatar head turned.
 2016-02-29 18:02:50 -08:00
Anthony J. Thibault
99bd0f3d13 MyAvatar: fixes for eye look at 
Users in desktop mode should now see the eyes change focus between the left eye, right eye and the mouth.
Users in mirror mode, or third person camera, should more accurately determine which avatar to look at.
 2016-02-29 16:49:35 -08:00
David Rowe
ddc5e952f1 Merge branch 'master' into 20812 2016-03-01 11:16:14 +13:00
David Rowe
a32452db8b Change Running Scripts reload, close, and tree buttons when pressed 
Provides visual feedback to user.
 2016-03-01 10:43:46 +13:00
Brad Hefta-Gaub
bd80ecd4dc Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-29 13:17:24 -08:00
Seth Alves
95f9793999 Merge branch 'master' of github.com:highfidelity/hifi into fix-grab-more 2016-02-29 11:35:58 -08:00
samcake
4bec6ddf52 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
8de4a59078 add support for auto-hide reticle and seek lookat on auto-show of reticle 2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578 Merge pull request #7212 from ZappoMan/depthReticleWork 
add fade between depths in depth reticle
 2016-02-28 12:49:47 -08:00
Brad Hefta-Gaub
188cf3694b fix rotation of depth reticle 2016-02-27 17:31:35 -08:00
David Rowe
50ebbe362d Style avatar browser field 2016-02-27 14:06:33 +13:00
David Rowe
1a331fcdac Style basic text field 2016-02-27 13:52:21 +13:00
David Rowe
98eb94ecef Fix up capitalization of other settings dialogs 2016-02-27 13:30:49 +13:00
samcake
99ba011996 Post merge with Zach work for environment map 2016-02-26 16:04:50 -08:00
David Rowe
2b03e16bec Increase the title's focus shadow offset 2016-02-27 12:48:09 +13:00
Zach Pomerantz
5995c3717f Continue updating overlay key on edit 2016-02-26 14:46:42 -08:00
Anthony J. Thibault
9a01c93322 Avatar: fix for rendering avatar attachments 2016-02-26 14:28:27 -08:00
David Rowe
839303168e Fix missed capital 2016-02-27 11:20:31 +13:00
David Rowe
247ba7d3dd Merge branch 'master' into 20812 2016-02-27 11:05:47 +13:00
David Rowe
b62bd682ed Tidying 2016-02-27 11:03:57 +13:00
David Rowe
e8f349ec31 Fix up capitalization of labels and use of colons 2016-02-27 11:02:39 +13:00
David Rowe
bf0bcbe2ec Style spinbox control 2016-02-27 10:48:53 +13:00
Zach Pomerantz
3c53078178 Merge pull request #7194 from ZappoMan/toggleOverlay 
add toggleOverlays menu item and action
 2016-02-26 10:17:24 -08:00
Philip Rosedale
783892ac2e Merge pull request #7206 from hyperlogic/tony/simrate-fix 
Application: don't simulate until we are ready to render
 2016-02-26 07:27:35 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
bf0fb7258a CR feedback 2016-02-25 22:01:10 -08:00
David Rowe
3cac94ed35 Refactor label style 2016-02-26 17:32:25 +13:00
David Rowe
3dc9d01aab Style checkbox control 2016-02-26 15:56:19 +13:00
David Rowe
b620427ae8 Fix text field label color 2016-02-26 15:54:50 +13:00
Anthony J. Thibault
e5c81f66a5 Application: removed threadID and milliseconds from logging. 2016-02-25 18:20:43 -08:00
Anthony J. Thibault
08c16beff2 Application: re-worded presentCount comments 2016-02-25 18:17:42 -08:00
Andrew Meadows
f964df6c97 final names for ViewFrustum intersection tests 2016-02-25 18:09:35 -08:00
Andrew Meadows
5d1e283508 namechange TouchesKeyhole to IntersectsKeyhole 2016-02-25 18:09:35 -08:00