Dante Ruiz
a5553d5e1c
fixed text scale for notifications
2017-09-06 09:26:48 -07:00
Dante Ruiz
b4f7cb961a
Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man
2017-09-06 08:38:08 -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
Anthony J. Thibault
af8b147321
away.js - works better with sensor scale.
2017-09-05 17:34:35 -07:00
Dante Ruiz
a34dae4aad
adding scale to notifications
2017-09-05 17:12:40 -07:00
David Kelly
1fd30b1e0f
fix passphrase reset
2017-09-05 17:03:11 -07:00
Anthony J. Thibault
74f974c68f
Merge branch 'master' into feature/ant-man
2017-09-05 16:27:41 -07:00
Dante Ruiz
fec8482b69
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
2017-09-05 16:26:51 -07:00
Anthony J. Thibault
3d3bb2853a
Updated naturalDimensiosn for touch controller config
...
Totally untested! I don't have an oculus. I'm sure it will work tho. ;)
2017-09-05 15:39:35 -07:00
Anthony J. Thibault
23ff1b9ead
Fixes for scaling controller display
...
Adds MyAvatar.sensorToWorldScaleChanged signal.
2017-09-05 15:03:41 -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
beholder
c0e7e5a8b2
7385 - Collect Stats on "Exit VR" button
2017-09-05 21:26:35 +03:00
Olivier Prat
b619b2311d
Merged with master
2017-09-05 10:27:53 +02: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
Anthony J. Thibault
26e9e6e580
Fixes for stylus ranges and grab radii
2017-09-01 11:19:51 -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
vladest
681fc529dc
Merge branch 'master' into modal_dialogs_async
2017-09-01 13:31:15 +02:00
druiz17
2948061904
code cleanup
2017-08-31 22:30:30 -07:00
Anthony J. Thibault
6618ba12e9
Merge branch 'master' into feature/ant-man
2017-08-31 18:10:39 -07:00
Dante Ruiz
7cf27c18d3
code cleanup and fix broken features
2017-08-31 18:06:55 -07:00
Anthony J. Thibault
a1b94fd9d2
Bug fixes for laser offset and avatar hold action
2017-08-31 17:26:00 -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
Anthony J. Thibault
98c89cbe78
Fixes for stylus size and offset
2017-08-31 14:45:59 -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
Anthony J. Thibault
a0eb8152a6
fix for tablet spawn position
2017-08-31 13:15:46 -07:00
Anthony J. Thibault
1a01209020
Fixes for scaling tablet at high frame rates
2017-08-31 13:02:31 -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
vladest
1b5e6fd5f8
Merge branch 'master' into modal_dialogs_async
2017-08-31 20:39:48 +02:00
Anthony J. Thibault
9c6b8a6826
Fixes for scaling tablet
2017-08-31 11:28:05 -07:00
Zach Fox
164eeaae64
Fix the duplicated buy buttons for admins on Marketplace
2017-08-31 10:41:44 -07:00
Daniela
42be6434af
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-08-31 18:03:39 +01:00
Anthony J. Thibault
6e6687c3a6
Change tablet dimensions as sensorToWorldScale changes
2017-08-30 18:21:25 -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
Anthony J. Thibault
9cd8b6991e
Merge branch 'master' into feature/ant-man
2017-08-30 08:58:55 -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
Anthony J. Thibault
573985c7c9
Merge branch 'master' into feature/ant-man
2017-08-28 09:27:04 -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
vladest
38295ab73f
Merge conflicts
2017-08-28 16:58:30 +02: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
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
Menithal
e47dfeaeab
Merge remote-tracking branch 'upstream/stable' into 21484
2017-08-24 21:37:20 +03:00
Brad Hefta-Gaub
5c832eae9c
Merge pull request #11226 from SamGondelman/miceWithLasers
...
EntityTreeRender uses RayPick API with precision picking
2017-08-24 08:10:21 -07:00
Dante Ruiz
dbe8aa77d7
working on laser v tablet
2017-08-23 17:32:41 -07:00
Zach Fox
e815946744
Merge pull request #11231 from ElderOrb/Case5830
...
5830: Go-To menu shows up blank except for address bar
2017-08-23 14:33:04 -07:00
beholder
9cd784990c
5830: Go-To menu shows up blank except for address bar
2017-08-23 23:27:02 +03:00
Zach Fox
a489267cec
Hide behind switch and remove dead code
2017-08-23 10:48:47 -07:00
SamGondelman
d7b3686364
include noncollidable entities
2017-08-22 17:37:51 -07:00
Dante Ruiz
dc8d0c9604
disable far grab when on hud
2017-08-22 16:51:13 -07:00
Zach Fox
4d8980b538
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp
2017-08-22 12:30:24 -07:00
Zach Fox
f1da7a6381
Checkpoint
2017-08-22 11:53:37 -07:00
Anthony J. Thibault
d62a0ea8ff
Correct controller offsets with sensor scaling
2017-08-22 11:43:39 -07:00
vladest
b7a048c6ea
Adopt clonable settings to new styling
2017-08-22 11:23:55 -07:00
Dante Ruiz
cdd184e32d
intergradted teleport
2017-08-22 11:06:11 -07:00
Dante Ruiz
f6151fae85
slowly intergrating teleport.js
2017-08-21 16:53:28 -07:00
Dante Ruiz
94dc942d79
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-21 16:34:10 -07:00
Chris Collins
a85022bb93
Merge pull request #11216 from MidnightRift/emitterShouldTrail
...
Change emitShouldTrail to emitterShouldTrail.
2017-08-21 15:29:05 -07:00
Zach Fox
512a08f67f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp
2017-08-18 17:05:56 -07:00
Howard Stearns
188cbee781
Merge pull request #11212 from howard-stearns/asynchronous-commerce-2
...
Asynchronous Ledger Interactions with Server
2017-08-18 15:40:24 -07:00
anshuman64
a7090c7e07
Merge pull request #11211 from vladest/edit_clonable_lost
...
Adopt cloneable settings to new styling
2017-08-18 15:37:37 -07:00
Midnight
5f162c0352
Change emitShouldTrail to emitterShouldTrail.
2017-08-18 15:10:58 -07:00
Elisa Lupin-Jimenez
44f1f340e1
Merge pull request #11147 from elisa-lj11/blocks
...
Adding Blocks Tablet App to Marketplace
2017-08-18 15:06:18 -07:00
Zach Fox
9636fad679
Updates from wireframes
2017-08-18 13:45:30 -07:00
Dante Ruiz
8d04047d8a
starting to integrate teleport.js
2017-08-18 13:23:44 -07:00
Sam Gondelman
cbf2bb3a61
Merge pull request #10980 from SamGondelman/sharks
...
Reduce laser pointer lag
2017-08-18 13:14:38 -07:00
vladest
d29d4b5016
Adopt clonable settings to new styling
2017-08-18 21:44:44 +02:00
SamGondelman
c9f4958925
handControllerGrab fix, maybe, hopefully
2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6
Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2
2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb
checkpoint
2017-08-18 10:03:00 -07:00
Zach Fox
d052b49a54
Login and picture selection done
2017-08-17 16:34:33 -07:00
Zach Fox
5f69f30551
MOAR PROGRESS
2017-08-17 16:20:50 -07:00
Zach Fox
9135e37078
Go go go go gog o
2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c
Initial progress
2017-08-17 15:01:25 -07:00
Menithal
dc5e374485
Merge remote-tracking branch 'upstream/master' into 21484
2017-08-17 22:28:43 +03:00
Elisa Lupin-Jimenez
2b44608ece
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727
moved blocksApp.js to unpublished scripts, added icon
2017-08-17 10:18:29 -07:00
Artur Gomes
e8fea16449
Fix for line points disappearing on second client (trying new value to
...
see if the line replicates correctly)
2017-08-17 17:19:13 +01:00
Artur Gomes
e59ff51cdd
Fixed two icons showing up when picking a color from the color table or
...
from the custom colors.
2017-08-17 16:25:33 +01:00
Artur Gomes
321742a865
Fix for points disappearing on second client (the one that's not
...
drawing) (trying to limit it a bit more to see if it results in no loss
at all)
2017-08-17 16:01:53 +01:00
Artur Gomes
2835130515
Fix dynamic hue not cycling through all the 360 hue values when drawing
...
the line due to the change in the max size of the line.
2017-08-17 15:53:13 +01:00
Artur Gomes
4f5bfcbc2b
Merge remote-tracking branch 'upstream/master'
2017-08-17 14:57:31 +01:00
Artur Gomes
be35734074
Fix tablet not reopening after removing headset and putting it back on.
2017-08-17 14:56:29 +01:00
Artur Gomes
5e6e675f62
Replace stars brush.
2017-08-17 09:45:54 +01:00
Olivier Prat
1e4cf5d797
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-08-17 09:46:49 +02:00
Chris Collins
9c9bcd80b8
Merge pull request #11191 from SamGondelman/logging
...
Miscellaneous logging fixes
2017-08-16 15:46:32 -07:00
vladest
15f8bc0141
Keep old function names for compatibility
2017-08-16 22:17:34 +02:00
druiz17
8eabf46a30
Merge pull request #11165 from 1P-Cusack/FogBugz/Case_6491_Part1
...
[Case 6491] Part 1 of entitySelectionTool clean up
2017-08-16 13:05:27 -07:00
Artur Gomes
8ef8e974b6
Merge remote-tracking branch 'upstream/master'
2017-08-16 21:00:29 +01:00
Artur Gomes
030877457b
Fix tablet not opening.
...
Fix headers not showing correctly since changes in editProperties page.
2017-08-16 20:59:09 +01:00
vladest
4e5c650621
Modified some usecases for async dialogs
2017-08-16 21:41:18 +02:00
LaShonda Hopper
cc2ff565ac
[Case 6491] Ran lint on entitySelectionTool.js (details below).
...
Prior Issue Count: 35
Current Issue Count: 3
Resolved:
* 17 used out of scope issues.
* 11 already defined issues.
* 2 missing semicolon issues.
* 1 implicit comparison against null issue.
* 1 readability warning.
Remaining Issues as of this commit:
* scripts/system/libraries/entitySelectionTool.js: line 17, col 1, Read only.
** HIFI_PUBLIC_BUCKET assignment
* scripts/system/libraries/entitySelectionTool.js: line 19, col 1, Read only.
** SPACE_WORLD assignment
* scripts/system/libraries/entitySelectionTool.js: line 30, col 1, Read only.
** SelectionManager assignment
One notable item was a chunk of code from makeStretchTool's onMove
function which wasn't in scope of the vars being utilized.
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-08-16 15:21:30 -04:00
Artur Gomes
9d87954d71
Merge branch 'master' of github.com:CraftsmanMG/hifi
2017-08-16 18:52:39 +01:00
Artur Gomes
d4255928c7
Add sections to brushes tab.
...
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
2017-08-16 18:35:23 +01:00
Artur Gomes
3ddddf4ad6
Fix animated hue not working even though the checkbox was checked after
...
restarting the interface.
2017-08-16 18:35:23 +01:00
Artur Gomes
270d41fabf
Fix animation flickering caused on multiplayer because both users
...
where using the script to update the color and the color was also being
replicated.
2017-08-16 18:35:23 +01:00
Artur Gomes
ca37c5ee94
Fix desktop drawing mode creating more than one entity in an unusual way.
2017-08-16 18:35:22 +01:00
Artur Gomes
fb696bcbac
Fix settings not being correctly restored when reloading tablet (when
...
using desktop mode and right clicking over the tablet + refresh)
Remove postMessage in favour of emitWebEvent to communicate between the
tabs and the main script.
2017-08-16 18:35:22 +01:00
Artur Gomes
b41ef08428
Fix tablet loosing focus (from the drawing hand) when switching hands.
2017-08-16 18:35:22 +01:00
Artur Gomes
482924266c
Fix brush texture stretching at start.
...
Add some code refactoring.
2017-08-16 18:35:21 +01:00
Artur Gomes
07416951e5
Did clean up of the code and unused files.
2017-08-16 18:35:21 +01:00
Artur Gomes
83cdd1739d
Add hue, saturation and brightness dynamic brushes.
...
Add continuous drawing mode.
Add new brushes.
Remove some brushes.
Fix animation play distance for when painting in Desktop mode.
Fix Hue animation not starting from the chosen color (would always start
from red).
Fix multiple color polyline.
2017-08-16 18:35:15 +01:00
Artur Gomes
03b70ed492
Do not test!
...
Add color qvector to polyline entity to allow for multiple colors
through the line.
Add some new icons to the tabs of the app.
2017-08-16 18:32:17 +01:00
Artur Gomes
108c02d05e
Fix Desktop painting weird behaviour when painting (painting surface not
...
always facing the user, this happened because of the change of the
paint surface direction on the last commit)
Fix brush tint (was just changing color in the last commit, now is
blending with the brush, using a kind of luminance blend effect)
Remove unecessary files.
2017-08-16 18:28:59 +01:00
Artur Gomes
2d2efab5ed
Fix paint surface always facing the HMD instead of rotating with the
...
brush/hand;
2017-08-16 18:28:58 +01:00
Artur Gomes
6e4ad996af
Make savedSettings variable null after it is used, since it is probably
...
a cause for a big memory leak.
2017-08-16 18:28:58 +01:00
Artur Gomes
130ed238a5
Add restore tablet state after removing and putting back the headset.
...
Update max line width;
Remove erase tab in favor of a single undo button in the tabs bar;
Add background color to brushes (using the same as the stroke color so
the user can preview the stroke with the color);
Add padding between custom color picker and preset colors table.
2017-08-16 18:28:58 +01:00
Artur Gomes
c477b50272
Fix brush weird behaviour when starting with clean settings (brush would
...
be black and filled instead of appliying the correct texture with color)
2017-08-16 18:28:57 +01:00
Artur Gomes
ae078f4689
Add Avatar dominant hand as default hand the first time the user starts
...
fingerpaint app or when the settings for the app are deleted.
Add some checks to fix an non critical error (when trying to reset the
left/right hands and they were not yet initialized)
2017-08-16 18:28:57 +01:00
Artur Gomes
c65010669b
Move line width widget from the palette tab to the brushes tab.
2017-08-16 18:28:57 +01:00
Artur Gomes
91a6f2c8d9
Add undo for created Entities in order to be able to remove entities
...
when drawing in desktop mode.
Fix keyboard not showing.
Fix app button not being deactivated when switching to another app.
2017-08-16 18:28:56 +01:00
Artur Gomes
c94774ec18
Add Keyboard when input fields get focus in the palette tab.
...
Add feedback when user picks a color from the table or from the set
custom colors.
Fix hand hovering tablet when entering the app (stopped working after
restoring brush values).
2017-08-16 18:28:56 +01:00
Artur Gomes
5c40a6810e
Add drawing in Desktop mode.
...
Remove dynamic rotation and translation brushes since the movement would
be unsynced after a while, resulting in a poor user experience.
Fix restoring last used settings taking to long, which caused the user
to see the values to change after the tablet application was open.
Fix using a different brush after restarting the app, if drawing before
the brush was reset.
2017-08-16 18:28:55 +01:00
Artur Gomes
dffbc442be
Add new Interface (more similar to the ui used on other apps)
...
Fix brush on repeat mode (keeps the the aspect ratio of the texture)
2017-08-16 18:28:55 +01:00
Artur Gomes
9d35cdcda3
Add save and restore last user settings;
...
Fix multiple dynamic brushes not working in some cases (mixing axis
would not work neither for rotation nor for translation);
Fix tablet hovering detection only working for right hand;
2017-08-16 18:28:55 +01:00
Artur Gomes
c8d475dff1
Add new dynamic and colored brushes.
...
- Add dynamic hue brush;
- Add dynamic (animated) rotation and translation brush;
- Add colored brushes that already have the colors set (user can't
change it);
2017-08-16 18:25:03 +01:00
Artur Gomes
b6ccce3904
Add new brushes (In progress)
2017-08-16 18:25:03 +01:00
Artur Gomes
69a532ea45
Fix application button not resetting state after exiting the app.
...
Fix hovering tablet detection not working before unhovering the tablet.
Fix finger closing and opening while hovering the tablet and drawing.
2017-08-16 18:25:02 +01:00
Artur Gomes
b6beb2033f
Switch between stylus and fingerpaint mode when not painting and hand
...
hovers the tablet.
Replace OK button in color picker with Add button (allows user to add custom
colors, and enables user to pick color just by pressing on top of the
color picker);
2017-08-16 18:25:02 +01:00
Artur Gomes
9309f5137a
Add tablet application to replicate the existing overlay interface that
...
uses qml.
Add last user picked colors using the custom color picker so that users can easily reuse that color.
2017-08-16 18:25:02 +01:00
Delanir
3d8951a5e0
Replace Paint Source Entity by Overlay
2017-08-16 18:25:01 +01:00
Delanir
066598fe3f
Add Support to different UV modes in the finger paint script and deactivate "paint hand"
2017-08-16 18:25:01 +01:00
Delanir
faf57f068c
Override hand animation for finger paint.
...
Paint hand stays in a pointing position while in paint mode.
2017-08-16 18:25:00 +01:00
Delanir
59719a13b6
Move fingerPaint folder into "scripts/system" and add fingerPaint script to DEFAULT_SCRIPTS_SEPARATE
2017-08-16 18:23:04 +01:00
Artur Gomes
f794079c62
Merge remote-tracking branch 'upstream/master'
2017-08-16 17:54:35 +01:00
SamGondelman
86cc938a47
Merge remote-tracking branch 'upstream/master' into sharks
2017-08-16 09:54:12 -07:00
Artur Gomes
07a16d658b
Add sections to brushes tab.
...
Add preview of special effects.
Fix polyline poinst disappearing (using 48 points for now as a quick
fix)
Fix dynamic saturation and brightness effect being to strong.
2017-08-16 17:21:19 +01:00
Dante Ruiz
e48c14ec23
fixed tablet spawn position for oculus menu button
2017-08-16 09:08:55 -07:00
Seth Alves
3082c357f9
cloning sort-of works... cloning an equipable doesn't
2017-08-15 17:54:04 -07:00
Seth Alves
4bfbab294d
near-trigger works?
2017-08-15 14:53:58 -07:00
Seth Alves
03977334a0
near-trigger works?
2017-08-15 14:50:39 -07:00
Seth Alves
3b61e8518f
near-trigger works? equip calls its entity methods now
2017-08-15 14:46:48 -07:00
Seth Alves
ddca25672f
trying to get near-triggering working
2017-08-15 14:14:28 -07:00
vladest
273261ee57
Reworked WindowScriptingInterface browse method for async methods
2017-08-15 23:12:35 +02:00
vladest
8afdb27c1b
Reworked WindowScriptingInterface save method for async methods
2017-08-15 22:55:44 +02:00
Zach Fox
b7282cc776
Lots of fixes
2017-08-15 13:46:20 -07:00
Seth Alves
1d24523be9
equip drop gesture works
2017-08-15 13:09:17 -07:00
Seth Alves
e6ac07d43d
equipping mostly works
2017-08-15 11:45:45 -07:00
Zach Fox
bddce9328b
V1
2017-08-15 11:08:03 -07:00
Seth Alves
b2d7eefc97
equip highlight works now
2017-08-15 10:30:47 -07:00
Elisa Lupin-Jimenez
072f3dfb03
removed commented out code, removed blocks from default scripts
2017-08-15 10:25:14 -07:00
Elisa Lupin-Jimenez
3d7995da34
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-15 10:01:24 -07:00
Seth Alves
774cb33303
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-15 09:17:52 -07:00
vladest
e9ed05c3ba
Reimplement snapshot dir browser for async
2017-08-15 15:55:36 +02:00
Seth Alves
b52a406ff1
trying to get equipping working
2017-08-14 18:25:57 -07:00
SamGondelman
1c27335193
a couple logging fixes
2017-08-14 17:34:32 -07:00
Seth Alves
13424eb792
kinematic-grab defaults to true
2017-08-13 17:42:08 -07:00
Seth Alves
9015d69c71
fix pop at start of far-grab
2017-08-13 17:21:55 -07:00
Seth Alves
f10dc7cbd5
allow far to near-grab transition
2017-08-13 16:54:37 -07:00
Seth Alves
58b199e9f9
far-grab sort-of works
2017-08-13 15:54:03 -07:00
Seth Alves
c2861d29d2
trying to get highlighting to work
2017-08-13 13:49:17 -07:00
Seth Alves
327bc23b5c
get ready for highlighting
2017-08-13 11:41:12 -07:00
Seth Alves
e7437d66ef
if a raypick hits something that's very close, put it into the nearby-entities list
2017-08-12 17:49:02 -07:00
Seth Alves
ec93172676
far-search rays work, but nothing else about far-grab.
2017-08-12 17:27:48 -07:00
Seth Alves
505b564c62
sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase
2017-08-12 13:14:00 -07:00
Seth Alves
92cb1c9bf2
Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1
2017-08-12 12:40:18 -07:00
Seth Alves
9fb1835a26
grabbing overlays works, again
2017-08-12 12:38:36 -07:00
Seth Alves
7ae41064db
tablet stylus works again
2017-08-12 11:19:39 -07:00
Zach Fox
c38837c200
Remove fixmes
2017-08-11 16:21:39 -07:00
Zach Fox
a21ff75a49
Big progress!
2017-08-11 12:54:55 -07:00
Seth Alves
b4a54b017a
plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict
2017-08-11 12:15:41 -07:00
Zach Fox
080c6da71a
Get HFC balance from QmlCommerce API
2017-08-11 10:49:11 -07:00
Zach Fox
d2362e6329
addInventoryButton() under setting
2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd
Add inventory; also fix some bugs
2017-08-11 10:31:32 -07:00
Seth Alves
128be5c2c1
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
2017-08-11 08:52:47 -07:00
Olivier Prat
1763ecd4c6
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-08-11 09:38:00 +02:00
Elisa Lupin-Jimenez
da5bb03187
Trying to add in a back button
2017-08-10 16:34:37 -07:00
SamGondelman
4c55849290
merge from master
2017-08-10 15:43:23 -07:00
Elisa Lupin-Jimenez
28476960bb
Moved Blocks to tablet app
2017-08-10 14:23:45 -07:00
