Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 17:55:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
47749 commits 71 branches 56 tags 1.2 GiB
Commit graph

130 commits

Author SHA1 Message Date
howard-stearns
36951c3c95 colors 2016-10-19 11:24:21 -07:00
howard-stearns
a5fc0d92a2 Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar 2016-10-19 11:11:05 -07:00
David Rowe
c8e9e4ecd0 Fix suggestion card appearing behind keyboard 2016-10-19 10:13:07 +13:00
howard-stearns
ecd84bf23d desktop vertical 2016-10-18 10:05:39 -07:00
howard-stearns
0d2bd23874 cleanup 2016-10-18 09:38:55 -07:00
howard-stearns
3ce3e57c38 Merge branch 'master' of https://github.com/highfidelity/hifi into unit-scaled-address-bar 2016-10-18 09:36:09 -07:00
Howard Stearns
313e3e7b6d git rid of wacky scaling 2016-10-15 18:18:24 -07:00
David Rowe
a767a27e7e Merge branch 'master' into 21070 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-16 14:09:53 +13:00
howard-stearns
25f121b462 close button for address bar 2016-10-14 15:10:55 -07:00
David Rowe
49709b42d7 Merge branch 'master' into 21070 2016-10-12 09:45:34 +13:00
David Rowe
31b35f0a35 Only raise keyboard if in HMD display mode 2016-10-12 09:43:33 +13:00
David Rowe
827c2b015b Update other dialogs to use single keyboard QML file 2016-10-09 11:52:30 +13:00
David Rowe
12f4b2854d Fix address bar not being able to regain focus 2016-10-08 19:38:57 +13:00
David Rowe
b954852ba9 Use temporary copy of keyboard QML file while refactoring 2016-10-08 15:23:11 +13:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
David Rowe
b6221a5f83 Fix clearing address bar after navigating using picture card 2016-10-07 09:45:34 +13:00
David Rowe
1ee9317234 Fix clearing address and cursor upon address bar closing 2016-10-06 17:00:25 +13:00
David Rowe
a347936b68 Fix location not being updated after using back and forwards buttons 2016-10-06 16:47:49 +13:00
David Rowe
2807f76e68 Fix semantics of function parameter 2016-10-06 15:49:16 +13:00
David Rowe
742e603fd6 Show cursor if user clicks in address bar 2016-10-06 15:21:08 +13:00
David Rowe
7d23cd7c7c Don't show cursor until after have started entering an address 2016-10-06 15:19:58 +13:00
David Rowe
b70eac353b Enable address entry by typing without clicking in address bar 2016-10-06 15:18:07 +13:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
David Rowe
f8572096b1 Merge branch 'master' into 21055 2016-09-28 20:00:04 +13:00
howard-stearns
39d352e1a7 display location/connection status in address bar when it doesn't have 
focus
 2016-09-26 11:27:50 -07:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
howard-stearns
17549348b4 less busy hotspotting, and make use of restricted feed (by protocol) 2016-09-22 16:48:16 -07:00
howard-stearns
41b20dc69d single feed with snapshot and concurrency, no radio buttons, mini-card 
has two hotspots that bring up different kinds of cards, and anywhere
 else on the minicard takes you "there".
 2016-09-21 16:00:29 -07:00
Seth Alves
2468b56079 Merge branch 'master' of github.com:highfidelity/hifi into qml-keyboard 2016-09-20 13:28:20 -07:00
howard-stearns
db20a8ceef fix 1319 2016-09-14 11:20:09 -07:00
Seth Alves
3e86b2f0f2 remove some unneeded objectNames 2016-09-12 15:34:29 -07:00
Seth Alves
44af3b43cc fix property access 2016-09-09 17:02:11 -07:00
Seth Alves
c396196e0f show and hide keyboard for qml windows 2016-09-09 16:48:46 -07:00
Seth Alves
e5b56fec7c put keyboard on location dialog 2016-09-09 11:32:17 -07:00
howard-stearns
7601876641 Scale the activity card back up to match the window being scaled down, so 
that it covers the address bar.
 2016-08-23 09:44:28 -07:00
David Rowe
f7389dc059 Fix server card window scale 2016-08-23 16:28:32 +12:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
howard-stearns
02d3666d86 code review cleanup 2016-08-22 09:58:27 -07:00
Howard Stearns
f877e65703 larger story card 2016-08-20 10:45:02 -07:00
howard-stearns
993340811f switch over to metaverse server user story cards 2016-08-19 16:40:53 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
howard-stearns
0f415abd6b dual purpose address bar - switchable between html and qml 2016-08-17 16:56:52 -07:00
howard-stearns
d58cc8ddd9 use html card from user_story id, and close things when 
receiveHifiSchemeUrl
 2016-08-17 16:35:29 -07:00
howard-stearns
17d9db487d adjust .qml for useFeed being a c++ property instead of qml. 2016-08-17 09:57:46 -07:00
howard-stearns
4da2cb685c Set full url path to where the picture was taken. 
Expand width of scroll, but leave a margin at both ends.
Include an image at the end to indicate that the scroll is swipable.
Adjust ighlight color and border size.
 2016-08-16 10:43:05 -07:00
Howard Stearns
8708e2ac2b image url, in anticipation of having it in details 2016-08-12 07:00:07 -07:00
howard-stearns
b4a43db025 include user name in search text for user stories 2016-08-11 17:04:48 -07:00
howard-stearns
cd9bd8dddf we don't need the dummy data any more 2016-08-11 16:58:06 -07:00
howard-stearns
747c43d065 basic user story card 2016-08-11 16:43:29 -07:00
howard-stearns
f34030d276 factor out metaverseBase to make it easier to repoint to a test server 2016-08-09 12:48:01 -07:00