Elisa Lupin-Jimenez
|
da5bb03187
|
Trying to add in a back button
|
2017-08-10 16:34:37 -07:00 |
|
Elisa Lupin-Jimenez
|
28476960bb
|
Moved Blocks to tablet app
|
2017-08-10 14:23:45 -07:00 |
|
Elisa Lupin-Jimenez
|
d3c76c99c2
|
See all markets button working again
|
2017-08-09 17:28:05 -07:00 |
|
Elisa Lupin-Jimenez
|
69a13052ab
|
commented out blocks injection
|
2017-08-09 17:23:08 -07:00 |
|
Elisa Lupin-Jimenez
|
74c90d6323
|
minor typo
|
2017-08-09 16:08:47 -07:00 |
|
Elisa Lupin-Jimenez
|
a2e407f786
|
fixed merge conflicts in marketplacesInject.js
|
2017-08-09 15:59:20 -07:00 |
|
Howard Stearns
|
cc634a2d1b
|
Merge pull request #11148 from zfox23/commerce_singleSetting
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
|
2017-08-09 13:25:10 -07:00 |
|
howard-stearns
|
1cf81495ab
|
basic commerce infrastructure
|
2017-08-09 11:50:52 -07:00 |
|
Zach Fox
|
33fa8c4f86
|
Fix bugs and also change to single setting
|
2017-08-09 11:44:09 -07:00 |
|
Zach Fox
|
61526256bc
|
Remove personalized comment
|
2017-08-09 09:30:18 -07:00 |
|
Elisa Lupin-Jimenez
|
d599753771
|
Started blocks download catch, fixed a debug typo
|
2017-08-08 18:43:35 -07:00 |
|
Zach Fox
|
9d60d5153f
|
Clarifying comment and turn setting off first
|
2017-08-08 18:00:17 -07:00 |
|
Zach Fox
|
4f85923517
|
Tons of fixes and improvements!
|
2017-08-08 17:58:41 -07:00 |
|
Zach Fox
|
b2c5a1f899
|
Fancy MutationObserver!
|
2017-08-08 17:12:06 -07:00 |
|
Elisa Lupin-Jimenez
|
efd25a5e70
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-08-08 16:55:10 -07:00 |
|
Zach Fox
|
871a5ff1ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation
|
2017-08-08 15:53:22 -07:00 |
|
Zach Fox
|
69fc69cffb
|
Comment fix and overlay click fix
|
2017-08-08 15:52:59 -07:00 |
|
Andrew Meadows
|
71ba6ba10a
|
Merge pull request #10807 from jmo7/21356
21356 - Reorder Edit.js
|
2017-08-08 15:15:37 -07:00 |
|
Zach Fox
|
7d26d2d88b
|
Switch and fix overlay clicks
|
2017-08-08 14:29:44 -07:00 |
|
Elisa Lupin-Jimenez
|
1102b27ba1
|
Fixed merge conflicts with master
|
2017-08-08 11:47:08 -07:00 |
|
Zach Fox
|
1493a310af
|
Beginning of stack stuff
|
2017-08-07 17:02:24 -07:00 |
|
Zach Fox
|
7e922cb2c2
|
Layout
|
2017-08-07 16:16:17 -07:00 |
|
Zach Fox
|
517128a939
|
More steps
|
2017-08-07 16:03:42 -07:00 |
|
Zach Fox
|
d7dd331685
|
Bugfixes
|
2017-08-07 14:39:31 -07:00 |
|
Zach Fox
|
7d4fd995f2
|
First steps
|
2017-08-07 14:29:47 -07:00 |
|
Dante Ruiz
|
38db4a6f47
|
fixed create spinner not appearing
|
2017-08-07 20:03:55 +01:00 |
|
Chris Collins
|
4acccb6ace
|
Merge pull request #11118 from cain-kilgore/chat-char-limit
WL 21493 - Update the Chat.js to indicate when a message is too long
|
2017-08-07 09:52:57 -07:00 |
|
Seth Alves
|
c570d483d8
|
Merge pull request #11113 from elisa-lj11/zip_drag
Zip drag (needs review)
|
2017-08-07 03:17:31 -07:00 |
|
Seth Alves
|
f898a05014
|
Merge pull request #11122 from ElderOrb/case6760
fix for 6760: Create Mode turns to Portrait when Reopening tablet
|
2017-08-06 19:02:47 -07:00 |
|
beholder
|
06c9378b03
|
fix for 6760: Create Mode turns to Portrait when Reopening tablet
|
2017-08-05 04:07:04 +03:00 |
|
anshuman64
|
22afb25d44
|
Capitalize "ENTER VR"
|
2017-08-04 17:19:26 -07:00 |
|
Elisa Lupin-Jimenez
|
c2cb7573c5
|
Removed commented out blocks code
|
2017-08-04 16:58:33 -07:00 |
|
Elisa Lupin-Jimenez
|
06ff766952
|
Drag zip cleaned up, marketplaces stylized, back button fixed
|
2017-08-04 16:58:33 -07:00 |
|
Elisa Lupin-Jimenez
|
9d2be28a8a
|
troubleshooting Blocks injection
|
2017-08-04 16:58:15 -07:00 |
|
Elisa Lupin-Jimenez
|
ca6a323d54
|
Can drag blocks zip folder into hifi and upload the .obj
|
2017-08-04 16:57:48 -07:00 |
|
Elisa Lupin-Jimenez
|
4570814145
|
Added Blocks to marketplace window
|
2017-08-04 16:56:30 -07:00 |
|
Elisa Lupin-Jimenez
|
a7dd6a5a41
|
Changed marketplaces message to be more discoverable
|
2017-08-04 16:56:30 -07:00 |
|
Cain Kilgore
|
f79a8b3cb5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into chat-char-limit
|
2017-08-04 23:34:44 +01:00 |
|
Cain Kilgore
|
c8ebc299f5
|
Limited Max Length of the Chat Box to 256 - as this exceeds Message. max.
|
2017-08-04 23:25:26 +01:00 |
|
Brad Hefta-Gaub
|
8f98d0b7c8
|
Merge pull request #11114 from ElderOrb/case6677
6677: Change "Desktop" App to Say "Exit VR"
|
2017-08-04 13:09:47 -07:00 |
|
beholder
|
d05e1677c3
|
6677: Change "Desktop" App to Say "Exit VR"
|
2017-08-04 23:04:15 +03:00 |
|
Howard Stearns
|
71ce5a6494
|
Merge pull request #11016 from highfidelity/context-overlays
Context Overlays
|
2017-08-03 16:28:14 -07:00 |
|
David Kelly
|
4b7779f0f5
|
add flag to outline render flags, fix pal.js/edit.js interaction
|
2017-08-03 07:57:21 -07:00 |
|
Brad Hefta-Gaub
|
0f73496a44
|
Merge pull request #11055 from misslivirose/fix-chat-bubble-length
Fix chat bubble length
|
2017-08-02 23:29:09 -07:00 |
|
VRCat\VRKitten
|
e4e4ead4af
|
'Untabified' files
|
2017-08-02 16:56:02 -06:00 |
|
vladest
|
638eeede43
|
Merge conflict
|
2017-08-02 20:07:06 +02:00 |
|
Elisa Lupin-Jimenez
|
c03c1c80e1
|
Drag zip cleaned up, marketplaces stylized, back button fixed
|
2017-08-02 10:51:40 -07:00 |
|
Elisa Lupin-Jimenez
|
eb1fb1a1e1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-08-02 08:28:55 -07:00 |
|
vladest
|
2d4396ac8e
|
Merge branch 'master' into fix_toolbar_apps_switch
|
2017-08-02 16:34:49 +02:00 |
|
vladest
|
4330e31212
|
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
|
2017-08-02 16:32:09 +02:00 |
|