Cain Kilgore
583b0c521e
Open
2017-10-10 03:40:48 +01:00
Cain Kilgore
e9f4dee56d
WL 21562 - Fix the error in the Asset Browser
2017-10-10 03:39:13 +01:00
Zach Fox
b81a8a95ea
Final fixes
2017-10-09 15:23:22 -07:00
Zach Fox
38b95b5403
Instructions HTML file and flow
2017-10-09 15:07:14 -07:00
Zach Fox
733df8391f
Round 2
2017-10-09 12:27:56 -07:00
Zach Fox
acdd1e32e4
First round
2017-10-09 12:11:07 -07:00
druiz17
cd97ab0fdf
fixed looping sample sound bug
2017-10-09 11:39:57 -07:00
Thijs Wenker
77a36bf788
Merge pull request #10892 from ctrlaltdavid/vr-edit-a
...
VR edit app
2017-10-07 02:19:00 +02:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Zach Fox
051b63503c
Merge pull request #11534 from zfox23/commerce_daveIntegration1
...
Commerce backend changes sync, October 5 2017
2017-10-06 09:45:45 -07:00
David Rowe
28c7ef2e97
Merge branch 'master' into vr-edit-a
2017-10-06 11:54:08 +13:00
Zach Fox
0b600a74c3
Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout
2017-10-05 14:34:53 -07:00
Zach Fox
9290a51685
Fix confirmed text
2017-10-05 14:03:56 -07:00
Andrew Meadows
05f2dfbbc3
Merge pull request #11529 from vladest/fix_audiotab_name_alignment
...
Fix alignment of audio devices input header
2017-10-05 13:50:29 -07:00
Zach Fox
8e82095135
Number sold and limited run
2017-10-05 12:46:20 -07:00
Zach Fox
d605bd9ef4
Preprocess inventory endpoint result
2017-10-05 11:01:15 -07:00
Ryan Huffman
f0c9badbd6
Fix misspelling in lost-connection-to-atp error
2017-10-05 09:10:46 -07:00
vladest
193dc83b99
Fix alignment of audio devices input header
2017-10-05 13:59:42 +02:00
Zach Fox
9d51d40af4
Merge pull request #11489 from vladest/login_dialog_rework
...
Login dialog rework
2017-10-04 15:47:44 -07:00
David Rowe
63e7521711
Merge branch 'master' into vr-edit-a
2017-10-05 11:29:49 +13:00
vladest
86e8076362
Fix puntuation mode
2017-10-04 20:30:25 +02:00
vladest
0a505617df
Implemented single keyboard instance for all Tablet login dialog items
2017-10-04 19:33:36 +02:00
Zach Fox
fcafbef109
Fix buying free items using Commerce system
2017-10-04 09:34:32 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
vladest
6fddf49988
Merge branch 'master' into login_dialog_rework
2017-10-03 21:39:38 +02:00
Zach Fox
ea3da6c9dd
Merge pull request #11495 from zfox23/pop_interfaceChanges2
...
Commerce: One step closer!
2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2
Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit
...
Tweak debug stats for more clarity
2017-10-03 11:23:16 -07:00
Zach Fox
e64b0861a1
Change passphrase working
2017-10-03 10:53:10 -07:00
David Rowe
f52df6667a
Merge branch 'master' into vr-edit-a
2017-10-03 21:50:49 +13:00
druiz17
86f580919c
remove what space
2017-10-02 17:43:43 -07:00
Zach Fox
11d0062104
Progress on buy endpoint
2017-10-02 16:57:41 -07:00
druiz17
8a0ecf4e6f
propertly determine is laser intersects with HUD UI
2017-10-02 16:46:43 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Zach Fox
1d1b846f39
Better 'view backup instructions' behavior
2017-10-02 12:44:51 -07:00
Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
Andrew Meadows
0fc6bf1e89
Merge pull request #11471 from Atlante45/feat/auto-bake
...
Asset Browser tweaks
2017-10-02 11:29:36 -07:00
vladest
bf39eb9a77
Test Tablet keyboard specific
2017-10-02 20:02:55 +02:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
vladest
07ba2cce5b
Merge branch 'master' into login_dialog_rework
2017-10-02 18:24:12 +02:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
David Rowe
829cc8e5e6
Merge branch 'master' into vr-edit-a
2017-10-02 17:08:27 +13:00
vladest
ad32e7bdf5
Merge branch 'master' into login_dialog_rework
2017-10-01 19:27:23 +02:00
vladest
9a00468ea9
semicolons, yes
2017-10-01 19:21:30 +02:00
vladest
feafd441b1
Make sure keyboard will be rised after lowering on another click
2017-10-01 18:54:07 +02:00
vladest
c3bc67b72d
Merge branch 'master' into fix_walletsetup_focus
2017-10-01 18:24:38 +02:00
David Rowe
0daa5012ca
Enable toolbar and tablet icons to load from local script directory
2017-09-30 15:00:15 +13:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
Zach Fox
e6ea76eefe
Tiny language fix - Thanks Cain!
2017-09-29 15:44:44 -07:00
Zach Fox
4668294389
Fix login flow regression
2017-09-29 15:25:24 -07:00
Zach Fox
bbbce96407
Fix gray securityimage
2017-09-29 14:30:02 -07:00
Zach Fox
63396a2fc3
WalletScriptingInterface; wallet status refactor
2017-09-29 13:42:04 -07:00
vladest
7f6773b1f4
Added semicolons
2017-09-29 21:12:21 +02:00
SamGondelman
f7af581c71
track traversal time, rename entity server stat
2017-09-29 11:34:35 -07:00
SamGondelman
247764b679
add total entity packets in stat (kbps)
2017-09-29 11:34:34 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
vladest
01a0b26b90
Remove mouse area for text fields. use activeFocusOnPress property instead
2017-09-29 17:14:35 +02:00
vladest
d3cd034d61
Cleanup
2017-09-29 16:33:52 +02:00
Atlante45
af69222fdb
Fix icon name change
2017-09-28 18:34:42 -07:00
Zach Fox
a1ae13489e
Slight changes to tutorial
2017-09-28 16:41:29 -07:00
Zach Fox
2cff5c1fa6
First time Purchases tutorial
2017-09-28 15:12:55 -07:00
Zach Fox
66be558a04
My Items Interface
2017-09-28 14:04:57 -07:00
vladest
4023c40149
Cleanup
2017-09-28 22:55:01 +02:00
Zach Fox
3a537cdcc3
Make usernameDropdown collapse when clicking anywhere outside it
2017-09-28 13:21:55 -07:00
Zach Fox
3742ccbdd3
Fix keyboard focus during setup while tip is up
2017-09-28 13:12:42 -07:00
Zach Fox
751dca0761
styling updates for purchases
2017-09-28 13:06:37 -07:00
Zach Fox
68c08969ae
Update Purchases
2017-09-28 12:49:38 -07:00
vladest
769c57208c
Signup ready
2017-09-28 21:35:41 +02:00
Zach Fox
8d74487393
Use edition number; fix CONFIRMED timer
2017-09-28 10:25:05 -07:00
vladest
8d23bf38ac
Merge branch 'master' into login_dialog_rework
2017-09-28 14:55:12 +02:00
vladest
4f907aba1e
sign in reworked
2017-09-28 14:49:48 +02:00
Zach Fox
60823903cf
You own X others
2017-09-27 17:05:07 -07:00
Zach Fox
7b7e0bc78b
Updated Recent Activity
2017-09-27 16:35:35 -07:00
Atlante45
eb06c33187
Naming coding standard fix
2017-09-27 15:32:53 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
beholder
3677718e48
7926 Create Mode: the keyboard tray is not styled correctly
2017-09-27 21:33:18 +03:00
Atlante45
73483eef94
Update information sentence
2017-09-26 19:19:34 -07:00
Atlante45
bf984e8d1a
Fix tablet asset browser
2017-09-26 19:05:36 -07:00
Atlante45
03bd887f9a
Re-sync files
2017-09-26 18:42:50 -07:00
Atlante45
dda715e171
Update TabletAssetServer
2017-09-26 18:25:20 -07:00
Atlante45
acb0bf8d20
Asset Browser tweaks
2017-09-26 17:26:46 -07:00
anshuman64
ca4d5ef807
Merge pull request #11454 from ElderOrb/case7877
...
7877 Unexpected Behavior when pressing Enter on Input Field
2017-09-26 16:26:42 -07:00
Andrew Meadows
909e5e86b1
Merge pull request #11442 from vladest/fix_dde_visibility
...
Fix dde visibility
2017-09-26 14:19:47 -07:00
beholder
5502a639e2
7877 Unexpected Behavior when pressing Enter on Input Field
2017-09-26 01:07:47 +03:00
vladest
083b52abaf
CHeck containsMouse property for mouse area instead on hovered
2017-09-25 21:15:05 +02:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
b5f0c4d940
Added settings controls sounds
2017-09-25 16:46:36 +02:00
vladest
5a452fa981
Merge branch 'master' into tablet_extended_sounds
2017-09-25 15:40:40 +02:00
Ryan Huffman
883bdc6003
Merge pull request #11425 from Atlante45/feat/auto-bake
...
Asset Browser auto-refresh
2017-09-22 13:17:04 -07:00
vladest
5aab9bf5b0
Merge branch 'master' into fix_dde_visibility
2017-09-22 21:10:21 +02:00
vladest
4d530ef173
Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close
2017-09-22 21:08:34 +02:00
Atlante45
6cdbf0c44a
Fix RunningScripts in tablet mode
2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991
Add Asset Server auto refresh
2017-09-21 14:41:59 -07:00
Andrew Meadows
6b3b3a7448
Merge pull request #11382 from ElderOrb/case6618
...
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
vladest
c48aba423a
Rename check box
2017-09-20 22:48:39 +02:00
vladest
7a36894f76
Make sure audio device not gets unchecked
2017-09-19 23:25:41 +02:00
vladest
10f7f08171
Added peak model, missed during merging
2017-09-19 21:42:52 +02:00
vladest
6297448e90
Build fix
2017-09-19 19:49:19 +02:00
vladest
6c32783a09
Merge branch 'master' into audio_devices_split
2017-09-19 17:43:03 +02:00
