Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:44:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40513 commits 25 branches 0 tags 1.1 GiB
Commit graph

16159 commits

Author SHA1 Message Date
Brad Davis
80fdef4348 Ensure the heartbeat has a valid value before the thread starts 2016-03-09 10:53:01 -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
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
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
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
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