Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 01:00:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40925 commits 76 branches 59 tags 1.2 GiB
Commit graph

16305 commits

Author SHA1 Message Date
Mark Johnson
b7a47d7bf2 Tabs -> Spaces 2016-03-12 17:35:57 -08:00
Mark Johnson
47d3f418e3 Merge remote-tracking branch 'highfidelity/master' 2016-03-12 17:30:22 -08:00
Mark Johnson
00829db375 Fill in the downloads line of the stats window 
Will show the active download, current download limit and how many
pending requests
 2016-03-12 17:27:43 -08:00
Anthony Thibault
ea95295e66 ApplicationOveraly: Fix for gray line at top of HMD UI overlay 2016-03-12 14:52:26 -08:00
Brad Hefta-Gaub
c93ed7c6f7 Merge pull request #7321 from ctrlaltdavid/20829 
Restyle HMD menus
 2016-03-11 20:43:27 -08:00
Stephen Birarda
76e547498d support compound shape URLs in ATPAssetMigrator 2016-03-11 18:02:06 -08:00
Stephen Birarda
8375de4517 make the ATPAssetMigrator hmd friendly and a little less brittle 2016-03-11 17:32:24 -08:00
Anthony Thibault
9fb897476e Application: fix for mouse control in third-person camera 
Process the keyboard & mouse input plugin after the userInputMapper()->update().
 2016-03-11 17:29:18 -08:00
David Rowe
8b9319b29e Merge branch 'master' into 20829 2016-03-12 13:09:59 +13:00
David Rowe
3deb30d699 Remove no longer need font type 2016-03-12 13:06:29 +13:00
David Rowe
3bf1afb80b HMD submenus not allcaps 2016-03-12 12:56:38 +13:00
David Rowe
9da64e540d Add shortcut keys to HMD menu 2016-03-12 12:53:16 +13:00
Stephen Birarda
890266e0bd shrink message dialog to contentWidth 2016-03-11 15:45:57 -08:00
Stephen Birarda
188712a55b select a right-clicked item in asset browser 2016-03-11 15:45:57 -08:00
Stephen Birarda
31f0e4a919 disable the rename and delete buttons if nothing selected 2016-03-11 15:45:57 -08:00
Stephen Birarda
6d6a53a69a use timer for upload click handle to avoid focus issue 2016-03-11 15:45:57 -08:00
David Rowe
ecf67282d5 Add separators to HMD menus 2016-03-12 12:29:52 +13:00
Philip Rosedale
7e581cc831 Merge pull request #7325 from hyperlogic/tony/smooth-hands 
Smoother hand motion when using hand controllers
 2016-03-11 15:08:59 -08:00
Stephen Birarda
66e572f226 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-11 14:44:49 -08:00
Ryan Huffman
55817e6b5a Merge branch 'master' of https://github.com/highfidelity/hifi into bugsplat-username 2016-03-11 14:01:45 -08:00
Ryan Huffman
d7b800283b Adjust bugsplat to use qPrintable 2016-03-11 13:57:05 -08:00
Stephen Birarda
1502348731 Merge pull request #105 from Atlante45/feat/atp 
Disable asset browser if user can't rez
 2016-03-11 13:25:28 -08:00
Atlante45
7efe26e854 Disable asset browser if user can't rez 2016-03-11 11:53:14 -08:00
Chris Collins
ae596d79f1 Merge pull request #7317 from jherico/hmd_worn 
Expose a property in display plugins to determine if the device is visible to the user
 2016-03-11 11:46:06 -08:00
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -08:00
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Ryan Huffman
631aad80f9 Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation 2016-03-11 09:53:08 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter 
Move userInputMapper->update() after inputPlugin->pluginUpdate().
 2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
9b89654d6a Merge pull request #7312 from jherico/crashes 
Better threaded handling of QML overlays
 2016-03-11 08:45:08 -08:00
Seth Alves
0d15706f34 Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix 
Stats: fix for avatar velocity stat being stuck at 0.1
 2016-03-11 06:37:23 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes 
Compile shaders into separate dir for inclusion
 2016-03-10 21:07:49 -08:00
Anthony J. Thibault
ab19d3e5a2 Moved animation after physics, hand poses are in world frame. 
There are still some debug hacks enabled so I can test in the vive room.
 2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d Compile shaders to their own folders 2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
David Rowe
e175c19754 Style checkbox for menu items 2016-03-11 15:51:27 +13:00
Stephen Birarda
7ccba8b406 remove debug for selected index crash 2016-03-10 18:36:12 -08:00
Stephen Birarda
7675c83f92 clear selection on reload 2016-03-10 18:34:28 -08:00
Stephen Birarda
8e2b06a8e5 use an explicit selection model for treeview 2016-03-10 18:32:18 -08:00
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