David Rowe
06f0e23bf9
There no longer is a handControllerGrab.js
2017-10-03 21:44:56 +13:00
David Rowe
5145107f8c
2D overlays can no longer be lasered
2017-10-03 21:36:40 +13:00
Sam Gateau
64f70f1ebb
more cleanups
2017-10-02 22:00:41 -07:00
Sam Gateau
895e3d0430
more cleanups
2017-10-02 21:46:52 -07:00
Sam Gateau
316156db46
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee
fixing th e bug on exit due to the debug anim draw of the avatars
2017-10-02 21:31:30 -07:00
Andrew Meadows
21cd986645
tally PerformanceTimer records when it is active
2017-10-02 20:57:20 -07:00
David Rowe
31e72c5503
Work around bug undoing physics where entities can end at wrong position
2017-10-03 16:26:00 +13:00
druiz17
86f580919c
remove what space
2017-10-02 17:43:43 -07:00
David Rowe
a59d590111
ESLint
2017-10-03 13:33:20 +13:00
David Rowe
46ce68a893
Fix lasers
2017-10-03 13:33:11 +13:00
samcake
bb99f68d40
Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead
2017-10-02 17:04:00 -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
Seth Alves
e7fa8131ea
make json importer understand AVATAR_SELF_ID
2017-10-02 16:44:03 -07:00
Andrew Meadows
c3167444a9
decouple 'general timing' from 'game loop' details
2017-10-02 16:31:20 -07:00
Howard Stearns
9b0ebf0e07
doh! string not boolean
2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e
allow importing of avatar entities from json
2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016
more linux warnings
2017-10-02 15:38:59 -07:00
Seth Alves
cc50bf9b56
Merge pull request #11503 from ElderOrb/case7951
...
7951 Reload button in Running Scripts dialog stops script
2017-10-02 14:20:34 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9
fatal compiler warning on mac/linux
2017-10-02 13:56:15 -07:00
SamGondelman
97b09d680c
fix and improve laser pointer locking
2017-10-02 13:17:53 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
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
