Andrew Meadows
e9d48a2713
fix warning about double-to-float conversion
2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81
faster rate counting
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
1050d2851d
Modify injected code to add to dropdown menu
2017-10-02 12:37:49 -07:00
Howard Stearns
7b0321c1e1
guess for mac/linux openssl
2017-10-02 12:30:25 -07:00
Zach Fox
15c0a21e0e
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
2017-10-02 12:19:24 -07:00
beholder
cc8f1352da
7951 Reload button in Running Scripts dialog stops script
2017-10-02 22:18:03 +03:00
Andrew Meadows
0fc6bf1e89
Merge pull request #11471 from Atlante45/feat/auto-bake
...
Asset Browser tweaks
2017-10-02 11:29:36 -07:00
Liv
f150d77d31
Updating placeholder.js to use a url that points to example scripts
2017-10-02 11:08:07 -07:00
vladest
bf39eb9a77
Test Tablet keyboard specific
2017-10-02 20:02:55 +02:00
Howard Stearns
5c5f052bc2
explicit free, and remove header that isn't available on mac/linux
2017-10-02 10:28:47 -07:00
LaShonda Hopper
cb264b5552
[Case 6491] eslint pass: Addresses curly bracket, keyword spacing issues.
...
* eslint pass using .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-02 13:28:43 -04:00
LaShonda Hopper
97ecf84f3d
[Case 6491] eslint pass: Cleaning up comma-dangle noise.
...
* eslint pass using .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-02 13:21:10 -04:00
Zach Fox
2b03e08c96
Fix errant status when requesting it for the first time
2017-10-02 10:20:24 -07:00
Sam Gateau
68046ae4e3
Merge pull request #11491 from jherico/dev/disable_watchdog
...
Disable watchdog with environment variable
2017-10-02 10:19:32 -07:00
samcake
fc2329193e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 10:15:38 -07:00
LaShonda Hopper
c131686f1b
[Case 6491] eslint pass: Addressing some comment issues.
...
* This should reduces the noise for the eslint passes on this script.
* eslint pass using .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-02 12:55:51 -04:00
Howard Stearns
930832bb19
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-10-02 09:44:29 -07:00
Howard Stearns
0f6884dd80
fix mac/linux compiler error
2017-10-02 09:44:10 -07:00
LaShonda Hopper
a610946af1
[Case 6491] eslint pass: fixes undefined center var in that.updateHandles.
...
* eslint pass using .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-02 12:31:10 -04:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
LaShonda Hopper
dbf8d19095
[Case 6491] eslint pass: fixes issues with equality checks.
...
* Also adds some paren grouping to help with readability of some statements.
* eslint pass on script using .eslintrc.js
Changes to be committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-02 12:26:00 -04:00
vladest
07ba2cce5b
Merge branch 'master' into login_dialog_rework
2017-10-02 18:24:12 +02:00
Zach Fox
2783293d24
Merge pull request #11490 from vladest/fix_walletsetup_focus
...
Remove mouse area for text fields. use activeFocusOnPress property in…
2017-10-02 08:38:04 -07:00
David Rowe
0bd67d494d
Fix UI sometimes turning off/on/off as hand enters entity
2017-10-02 19:27:26 +13:00
Sam Gateau
ec10d38983
more cleaning
2017-10-01 22:28:04 -07:00
David Rowe
829cc8e5e6
Merge branch 'master' into vr-edit-a
2017-10-02 17:08:27 +13:00
Sam Gateau
6c510bc18f
fine tuning the changes to respect clean up
2017-10-01 20:05:48 -07:00
Anthony J. Thibault
7dfa80f666
Bug fix for offset of animated parts of oculus touch controller display
...
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
2017-10-01 17:52:59 -07:00
samcake
0cbf19bcf1
Removing comments
2017-10-01 17:47:35 -07:00
samcake
aa10c29609
Cleaning up the changed code
2017-10-01 17:16:10 -07:00
Seth Alves
0d010d0cf4
Merge pull request #11493 from hyperlogic/bug-fix/oculus-controller-rendering
...
Bug fix for offset of animated parts of oculus touch controller display
2017-10-01 16:54:05 -07:00
samcake
da4de38e91
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-01 15:01:18 -07:00
SamGondelman
572986bfad
fix modeloverlay visible change
...
(cherry picked from commit 0bb27a7165
2017-10-01 13:40:00 -07:00
Sam Gateau
59225ae8ac
Merge pull request #11497 from SamGondelman/modelOverlays
...
Fix ModelOverlay visible change
2017-10-01 12:56:27 -07:00
Sam Gateau
44cc6deac2
moving render specific code from Application.cpp to Application_render.cpp
2017-10-01 12:55:44 -07: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
680235a7b1
+= 1 ==> ++
2017-10-01 13:22:48 +13:00
David Rowe
03e0e21ce0
JSLint ==> ESLint
2017-10-01 13:19:54 +13:00
Sam Gateau
c8c14445b9
Merge branch 'blue' of https://github.com/samcake/hifi into blue
2017-09-30 09:09:52 -07:00
David Rowe
659b2d8a99
Disable debug log info
2017-09-30 15:14:07 +13:00
David Rowe
229c186901
Rename script from vr-edit.js to shapes.js
2017-09-30 15:09:35 +13:00
David Rowe
b56b3a2e61
Change app name from "VR EDIT" to "SHAPES" and use new icon
2017-09-30 15:01:21 +13:00
David Rowe
0daa5012ca
Enable toolbar and tablet icons to load from local script directory
2017-09-30 15:00:15 +13:00
SamGondelman
0bb27a7165
fix modeloverlay visible change
2017-09-29 17:48:59 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
