druiz17
|
cc7a222374
|
fixing Hifi-Hand-Drop for equipEntity
|
2017-09-06 17:15:05 -07:00 |
|
druiz17
|
0d66bfca05
|
added far trigger
|
2017-09-06 14:58:04 -07:00 |
|
Dante Ruiz
|
15c853567d
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-09-06 08:34:28 -07:00 |
|
David Kelly
|
4bdfe092cf
|
Regression in injection script
|
2017-09-05 12:28:31 -07:00 |
|
Dante Ruiz
|
cefa65de5e
|
some more small changes
|
2017-09-05 12:06:32 -07:00 |
|
Dante Ruiz
|
28694dcf8a
|
small change to contextOVerlays in farActionGrab
|
2017-09-05 11:46:06 -07:00 |
|
David Kelly
|
8723ff2df2
|
Merge pull request #11294 from zfox23/commerce_walletPassphraseModal
Commerce: Wallet Passphrase Input Modal
|
2017-09-01 17:46:09 -07:00 |
|
Dante Ruiz
|
3b357ad61e
|
finshed handControllerGrab refactoring
|
2017-09-01 17:07:26 -07:00 |
|
Seth Alves
|
8ccacf34f4
|
Merge pull request #11290 from Menithal/21484
WL21484 - Add an additional parameter for entity animations to "allow translation"
|
2017-09-01 15:34:07 -07:00 |
|
Zach Fox
|
3cf0df518f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
|
2017-09-01 11:53:47 -07:00 |
|
Dante Ruiz
|
9bd368c0a9
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-09-01 08:27:09 -07:00 |
|
druiz17
|
2948061904
|
code cleanup
|
2017-08-31 22:30:30 -07:00 |
|
Dante Ruiz
|
7cf27c18d3
|
code cleanup and fix broken features
|
2017-08-31 18:06:55 -07:00 |
|
Zach Fox
|
fa25c434ca
|
Messages to marketplaces.js
|
2017-08-31 15:50:42 -07:00 |
|
Brad Davis
|
65b49a958f
|
Merge branch 'master' into 21484
|
2017-08-31 14:59:30 -07:00 |
|
Zach Fox
|
ce32d2d420
|
Checkout and Purchases
|
2017-08-31 14:12:05 -07:00 |
|
David Kelly
|
de2ce1cd5f
|
warning
|
2017-08-31 13:23:38 -07:00 |
|
druiz17
|
98b1fe6138
|
Merge pull request #11266 from ElderOrb/case6819
6819 - Create button not disabled
|
2017-08-31 12:36:08 -07:00 |
|
David Kelly
|
396f108182
|
forgot this the first time
|
2017-08-31 12:18:46 -07:00 |
|
Zach Fox
|
914a6bae00
|
Commerce: Wallet Passphrase Modal
|
2017-08-31 12:18:38 -07:00 |
|
Zach Fox
|
164eeaae64
|
Fix the duplicated buy buttons for admins on Marketplace
|
2017-08-31 10:41:44 -07:00 |
|
Dante Ruiz
|
47699d4439
|
fixed edit.js
|
2017-08-30 16:52:59 -07:00 |
|
David Kelly
|
988ee8c8d1
|
fix image provider, couple other things
|
2017-08-30 15:23:54 -07:00 |
|
Dante Ruiz
|
3960ec7d5a
|
finish main handControllerGrab refactoring
|
2017-08-30 15:20:03 -07:00 |
|
Zach Fox
|
f366743be7
|
Login; punctuationMode; new images
|
2017-08-30 11:07:03 -07:00 |
|
Zach Fox
|
1b48319a3f
|
Merge pull request #11267 from zfox23/commerce_zachsPunchlist1
Commerce: Zachs Punchlist 01
|
2017-08-30 10:10:56 -07:00 |
|
Dante Ruiz
|
ff134b338b
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-08-30 08:25:53 -07:00 |
|
howard-stearns
|
5b264a867a
|
fix wallet login (and share code with snapshot login)
|
2017-08-29 16:05:01 -07:00 |
|
Zach Fox
|
a9c99854f9
|
Haven't purchased anything yet UI
|
2017-08-29 15:39:07 -07:00 |
|
Dante Ruiz
|
49608f1253
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-08-29 15:19:16 -07:00 |
|
Dante Ruiz
|
ed52136fc5
|
finished equiping locked clone-able entities
|
2017-08-29 15:18:28 -07:00 |
|
Zach Fox
|
50241078ae
|
Buncha punchlist items checked off
|
2017-08-29 14:30:00 -07:00 |
|
beholder
|
180acbc188
|
6819 - Create button not disabled
|
2017-08-29 23:49:44 +03:00 |
|
Zach Fox
|
91f4e59f61
|
Misc fixes. Get started.
|
2017-08-29 12:33:44 -07:00 |
|
Dante Ruiz
|
4b592687b7
|
finished webEntityLaserInput, now working on cloning
|
2017-08-28 17:35:34 -07:00 |
|
Zach Fox
|
22d3857501
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory
|
2017-08-28 15:10:17 -07:00 |
|
Sam Gateau
|
a98d861600
|
Merge pull request #11242 from SamGondelman/tabletLayer2
Web overlays and entities are always non anti-aliased
|
2017-08-28 09:10:14 -07:00 |
|
Dante Ruiz
|
0eceb7b382
|
unviersial web3d vs laser
|
2017-08-25 17:40:30 -07:00 |
|
Zach Fox
|
a03f9592c1
|
Inventory to Purchases
|
2017-08-25 16:34:48 -07:00 |
|
Zach Fox
|
d19377d2d4
|
Saving
|
2017-08-25 15:56:30 -07:00 |
|
Dante Ruiz
|
a5508c9f75
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-08-25 14:21:01 -07:00 |
|
Dante Ruiz
|
b3ffa7b6b4
|
Working laser vs tablet
|
2017-08-25 14:20:31 -07:00 |
|
Zach Fox
|
e606e3dfb3
|
Squashed commit of the following:
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date: Fri Aug 25 10:56:53 2017 -0700
Huge cleanup!
|
2017-08-25 11:45:37 -07:00 |
|
Zach Fox
|
453897b9e2
|
Huge cleanup!
|
2017-08-25 10:56:53 -07:00 |
|
Dante Ruiz
|
fa676aaadf
|
lasers on tablet working
|
2017-08-24 17:42:27 -07:00 |
|
Zach Fox
|
3980a478d9
|
Only show 'buy' on costed items'
|
2017-08-24 16:38:44 -07:00 |
|
Zach Fox
|
e2c74d8b88
|
Initial progress
|
2017-08-24 15:22:30 -07:00 |
|
SamGondelman
|
4a49801217
|
web overlays and entities are always nonAA
|
2017-08-24 14:23:21 -07:00 |
|
Dante Ruiz
|
eb6248400c
|
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
|
2017-08-24 13:41:54 -07:00 |
|
David Kelly
|
eb9436ba96
|
Merge pull request #11235 from davidkelly/dk/encryptFile
Initial wallet app plus some encryption of security image
|
2017-08-24 13:17:14 -07:00 |
|