David Rowe
7eb9420c92
Update tool window to use restyled frame
2016-03-18 16:33:55 +13:00
David Rowe
7ed30048a4
Set up files for restyling tool window frame
2016-03-18 16:27:13 +13:00
Howard Stearns
0cbddb217c
Don't ask about differences over after the user has said no -- until the external file changes again.
2016-03-17 19:58:28 -07:00
Brad Hefta-Gaub
eb8a6527c6
change ModelBlender to use a set<WeakPointers> to safely handle model lifetime
2016-03-17 19:44:42 -07:00
Brad Hefta-Gaub
917c4644a5
make SkeletonModel be shared_ptr friendly as well
2016-03-17 18:03:49 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
howard-stearns
d59d5549a1
Merge branch 'master' of https://github.com/highfidelity/hifi into os-window-vs-modal-overlay-in-script-editor
2016-03-17 17:04:54 -07:00
howard-stearns
a957716511
Disable script editor close and tab close when we have a modal dialog up
...
about external changes to the file.
2016-03-17 16:54:59 -07:00
Zach Pomerantz
5e953c9833
Rm Enable3DTVMode const
2016-03-17 15:56:57 -07:00
Brad Hefta-Gaub
edcf642410
Merge pull request #7374 from jherico/plugin_switch_crash
...
Reduce crashes on switching display plugins
2016-03-17 15:51:39 -07:00
Brad Hefta-Gaub
6f8f5ed15c
Merge pull request #7382 from hyperlogic/tony/crash-fix-focus-out-event
...
Application: prevent crash on startup when "Crashed" dialog is shown
2016-03-17 15:51:15 -07:00
Bradley Austin Davis
d6d7e67ca3
Fix OpenVR shutdown crash
2016-03-17 14:37:43 -07:00
Ryan Downe Karpf
8914406987
Merge pull request #7367 from ctrlaltdavid/20852
...
Restyle directory, edit, and marketplace toolbars
2016-03-17 14:32:48 -07:00
Ryan Huffman
d7d447c998
Add log to bugsplat report
2016-03-17 13:05:57 -07:00
Anthony J. Thibault
a8bc8a7843
Application: prevent crash on startup when "Interface Crashed" dialog is shown.
...
If the application "Interface Crashed" dialog is shown at startup, it can cause Application to receive events before it has been fully constructed.
In this case the QMainWindow _window pointer is uninitialized, causing Menu::getInstance() to de-reference an invalid pointer.
The fix for this is three fold.
1. Construct the QMainWindow before calling setupEssentials (which in turn spawns the "Interface Crashed" dialog).
2. Change Menu::getInstance() from a static_cast to a dynamic_cast. This will cause it to return a nullptr if [QMainWindow::menuBar()](http://doc.qt.io/qt-4.8/qmainwindow.html#menuBar ) returns an instance of QMenuBar and not a ui::Menu instance.
3. In Application::event return false if Menu::getInstance() returns a nullptr. This should prevent any code that relies on having a valid ui::Menu instance from running.
2016-03-17 12:13:01 -07:00
Bradley Austin Davis
1cf89f046c
Fix off by one error
2016-03-17 10:13:52 -07:00
Bradley Austin Davis
7045680bc7
Reduce crashes on switching display plugins
2016-03-17 10:13:52 -07:00
Andrew Meadows
4bb705360d
interface calls _exit() on Release shutdown
2016-03-17 09:48:50 -07:00
Brad Hefta-Gaub
10a0bac90b
Merge pull request #7375 from jherico/display_switch_shortcut
...
Allow display plugin switching by keyboard
2016-03-16 18:38:09 -07:00
Bradley Austin Davis
80e2025ebf
Allow display plugin switching by keyboard
2016-03-16 18:28:48 -07:00
Mark Johnson
66f9effd12
Update to match coding standards
...
- Single letter for loop variable names
- Preface bool variables with is/has/should/can/want
2016-03-16 15:15:42 -07:00
David Rowe
df870d6e82
Merge branch 'master' into 20852
2016-03-17 10:35:26 +13:00
David Rowe
bef8c5a807
Fix some QML warnings
2016-03-17 09:51:32 +13:00
David Rowe
48d4316714
Fix typo
2016-03-17 09:34:21 +13:00
David Rowe
5faa7b3e87
Merge branch 'master' into 20851
...
Conflicts:
interface/resources/qml/dialogs/MessageDialog.qml
2016-03-17 09:29:56 +13:00
Chris Collins
733e4d74f8
Merge pull request #7290 from huffman/bugsplat-username
...
Add HF username as default username for bugsplat
2016-03-16 08:42:26 -07:00
Andrew Meadows
6028c3e841
Merge pull request #7318 from birarda/atp
...
Asset Transfer Protocol Mappings
2016-03-15 16:52:36 -07:00
Stephen Birarda
0012967734
use curly braced initialization for consts
2016-03-15 14:38:41 -07:00
Stephen Birarda
29cd487f84
fixes for styling and logging from CR
2016-03-15 14:38:08 -07:00
David Rowe
5d08f6f5a2
Update the HiFi-Glyphs font file
2016-03-16 10:29:22 +13:00
Atlante45
03efde5b3c
Change text in case of drag and drop.
2016-03-15 13:53:13 -07:00
Mark Johnson
6094613d06
When truncating the URL, show the first 5 characters (for the protocol)
2016-03-15 13:43:42 -07:00
Chris Collins
e47c8896db
Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h
...
Application: fix third-person and fullscreen-mirror toggle
2016-03-15 11:50:22 -07:00
Atlante45
4265ddbd0e
Can't drop fbx if you can't rez
2016-03-15 11:42:48 -07:00
Atlante45
4a90ec303c
Fix drag&drop
2016-03-15 11:22:42 -07:00
Anthony Thibault
addde84bee
Merge pull request #7363 from markej/master
...
Fill in the Downloads: line of the stats window
2016-03-15 10:42:09 -07:00
Clément Brisset
17e5b441cf
Merge pull request #111 from huffman/atp-manager-name
...
Add atp filename to entities added to world
2016-03-15 10:19:53 -07:00
Ryan Huffman
1b81b4f01b
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
2016-03-15 10:19:20 -07:00
Anthony J. Thibault
7539eec134
Application: fix third-person and fullscreen-mirror toggle
2016-03-15 10:11:56 -07:00
Ryan Huffman
7947bd7724
Fix message typo enter => entering
2016-03-15 10:11:53 -07:00
Ryan Huffman
cbed674cba
Merge pull request #112 from Atlante45/feat/atp
...
In place editing
2016-03-15 09:54:03 -07:00
Clément Brisset
bbfbbf6565
Merge pull request #109 from birarda/asset-migrator
...
tweaks to the ATP asset migrator for compound URLs and mappings
2016-03-15 09:25:11 -07:00
Atlante45
07d2213628
Remove debug
2016-03-15 09:14:22 -07:00
Atlante45
9b8b1d41e3
Edit in place
2016-03-15 09:14:22 -07:00
Atlante45
98851679c5
Remove unused AssetMappingItem
2016-03-15 09:14:22 -07:00
Stephen Birarda
72c64532f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2016-03-15 09:12:49 -07:00
Brad Hefta-Gaub
11e88f965d
Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location
...
MyAvatar: prevent roll and pitch in avatar via snapshot url.
2016-03-14 18:58:49 -07:00
Brad Hefta-Gaub
447918d148
Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes
...
Avatar & Animation cppcheck static analysis fixes
2016-03-14 18:58:25 -07:00
Mark Johnson
bc2aea8774
Show the (generally truncated) urls being downloaded
2016-03-14 18:18:33 -07:00
Stephen Birarda
605474a32c
actually use the JSONTypePair alias
2016-03-14 18:11:34 -07:00
Ryan Huffman
7823882aa1
Add atp filename to entities added to world
2016-03-14 16:13:33 -07:00
David Rowe
ab963b4a4b
Fix up script editor's "reload script?" message box
2016-03-15 09:04:23 +13:00
Mark Johnson
2834ff2935
Change Q: -> Pending:
2016-03-14 11:45:05 -07:00
David Rowe
f75aa97728
Grow width of QML message box to accommodate wide title if necessary
2016-03-15 07:22:21 +13:00
Ryan Huffman
4b6dd4636f
Merge branch 'atp' of github.com:birarda/hifi into atp-upload
2016-03-13 21:32:25 -07:00
Ryan Huffman
960047f412
Remove right click selection
2016-03-13 21:06:52 -07:00
Ryan Huffman
6c27bd9eb2
Update upload flow and make asset list dynamically sized
2016-03-13 21:04:07 -07:00
Anthony Thibault
1e94d9bdf5
interface/src/avatar: cppcheck fixes
2016-03-13 18:56:15 -07:00
Anthony Thibault
b921ac7757
MyAvatar: prevent roll and pitch in avatar via snapshot url.
2016-03-13 11:32:48 -07:00
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
