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

1221 commits

Author SHA1 Message Date
Brad Hefta-Gaub
5287c174b4 Merge pull request #7605 from jherico/route_log_errors 
Fixing logging errors on initial load of controller routes
 2016-04-07 17:13:13 -07:00
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 Davis
2f28c64edb Fixing menu navigation in oculus remote 2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf Support oculus remote input 2016-04-07 13:20:59 -07:00
Brad Davis
85019b2b5e Fixing logging errors on initial load of controller routes 2016-04-07 10:41:54 -07:00
David Rowe
3f62702ff0 Add search icon to entity list filter 2016-04-07 13:38:00 +12:00
David Rowe
4e3cdf6569 Update Running Scripts' search to have rounded ends and a search icon 2016-04-07 12:32:27 +12:00
David Rowe
c9c414d5a8 Fix entities editor display of large negative coordinates and angles 2016-04-06 07:45:04 +12:00
Brad Hefta-Gaub
e5f3ec4600 Merge pull request #7545 from birarda/marketplace-to-examples 
renaming of marketplace icon/window to examples
 2016-04-03 14:25:00 -07:00
Seth Alves
5fa9f662fc Merge pull request #7542 from birarda/refresh-on-asset-connect 
refresh/close the asset browser dialog on domain switch
 2016-04-01 18:08:59 -07:00
Seth Alves
4788bb453b Merge pull request #7540 from murillodigital/master 
Updating defaultAvatar_full.fbx to fixed version
 2016-04-01 15:53:19 -07:00
Stephen Birarda
6e83ed5ccc use a more generic custom user agent 2016-04-01 15:49:24 -07:00
Stephen Birarda
6df7ddeb16 pass the HighFidelityInterface user agent with WebView 2016-04-01 15:13:28 -07:00
Stephen Birarda
194226103c refresh the Asset Browser when switching domains 2016-04-01 11:13:59 -07:00
Leonardo Murillo
946a292cfb Updating defaultAvatar_full.fbx to fixed version 2016-04-01 11:49:45 -06:00
David Rowe
13ab854a9d Reduce space between collapsed sections 
In settings dialogs as well as entities editor.
 2016-03-31 15:02:16 +13:00
David Rowe
382b05e00b Make expand/collapse icon larger 2016-03-31 13:13:13 +13:00
David Rowe
db72e3efbb Increase maximum window height 2016-03-30 19:22:34 +13:00
David Rowe
28d0fc677c Update UIT QML control 2016-03-30 12:19:26 +13:00
David Rowe
1cb08952ae Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-30 12:01:45 +13:00
Brad Davis
ae82298e1b Working on the App JS <-> HTML JS communication 2016-03-28 10:09:22 -07:00
David Rowe
ef4d67008b Style x, y, z fields 2016-03-28 11:45:50 +13:00
David Rowe
b9ec5f39d9 Style color RGB fields 2016-03-27 22:12:10 +13:00
Brad Davis
a47614c9b6 Revert "Build a better event bridge" 
This reverts commit a43fde0803.
 2016-03-25 09:48:25 -07:00
David Rowe
42af3ebc4a Style the entity editor's "grid" tab 2016-03-25 14:15:03 +13:00
Brad Hefta-Gaub
d26fe77803 Merge pull request #7454 from jherico/qml_crashes 
Fix async issues related to JS <-> App <-> QML <-> HTML communication
 2016-03-24 17:32:38 -07:00
David Rowe
46df386f0b Fix edit tab display after script reload 2016-03-25 10:18:58 +13:00
David Rowe
9280443425 Merge branch 'master' into 20855 2016-03-25 09:06:20 +13:00
Brad Davis
a43fde0803 Build a better event bridge 2016-03-24 11:01:06 -07:00
David Rowe
51728d14a7 Miscellaneous improvements to Attachments dialog 2016-03-24 21:17:36 +13:00
Brad Hefta-Gaub
3505c14552 Merge pull request #7444 from birarda/uncover-qml 
Attachments Dialog QML updates (from contractor)
 2016-03-23 20:45:50 -07:00
David Rowe
5541dd6732 Change edit window's title and default size 2016-03-24 15:38:26 +13:00
David Rowe
96ce912d3d Fix up tab display post-merge 2016-03-24 11:07:48 +13:00
David Rowe
8d778141ef Merge branch 'master' into 20855 
Conflicts:
	interface/resources/qml/ToolWindow.qml
 2016-03-24 10:39:09 +13:00
David Rowe
454ba50dc1 Tidying 2016-03-24 10:03:47 +13:00
Stephen Birarda
34fb06a7bd changes to attachments dialog from contractor 2016-03-23 13:52:47 -07:00
Brad Davis
a30df07d53 PR feeback, precendence 2016-03-22 09:15:29 -07:00
David Rowe
7e7e421efa Tidy some QML 2016-03-22 19:33:57 +13:00
David Rowe
42b606c09d Merge branch 'master' into 20855 2016-03-22 18:51:07 +13:00
Brad Davis
28f25489f8 Fix occasional crash on creating overlay tool windows 2016-03-21 19:17:31 -07:00
David Rowe
3d2cb6554e Fix QML binding loop 2016-03-19 15:50:16 +13:00
David Rowe
3fa678a652 Style tabs and background 2016-03-19 14:52:40 +13:00
Brad Hefta-Gaub
481a75faca Merge pull request #7366 from markej/ShowDownloadURLs 
Show which URLs are being actively downloaded
 2016-03-18 10:42:01 -07:00
timemarkov
160b4e7ba2 Implement new design of attachment dialog 2016-03-18 12:11:00 +01:00
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
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
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
Andrew Meadows
6028c3e841 Merge pull request #7318 from birarda/atp 
Asset Transfer Protocol Mappings
 2016-03-15 16:52:36 -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
Atlante45
4a90ec303c Fix drag&drop 2016-03-15 11:22:42 -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
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
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
Mark Johnson
bc2aea8774 Show the (generally truncated) urls being downloaded 2016-03-14 18:18:33 -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
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
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
Stephen Birarda
e51aedeb35 fix error handling for diff request types 2016-03-11 11:36:52 -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
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
ed4df72eed cleanup logging for asset browser 2016-03-10 16:57:39 -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
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
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