David Rowe
5587a2fdf8
Fix creating an entity while a tool is active
2017-10-06 11:13:53 +13:00
druiz17
3139f5ef2a
improve mouseHMD exit logic
2017-10-05 15:12:58 -07:00
druiz17
ba50fcc509
fix mouse dissapearing in desktop mode
2017-10-05 15:07:49 -07:00
David Rowe
1673c08353
Update undo for grouping
2017-10-06 10:42:23 +13:00
Zach Fox
0b600a74c3
Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout
2017-10-05 14:34:53 -07:00
Andrew Meadows
a3bafa3c44
Merge pull request #11506 from SamGondelman/sharks
...
Fix and improve laser pointer locking
2017-10-05 14:10:06 -07:00
David Rowe
21d286b422
Fix undo not coping with cloning with both hands simultaneously
2017-10-06 10:04:14 +13:00
Zach Fox
9290a51685
Fix confirmed text
2017-10-05 14:03:56 -07:00
Seth Alves
30269c6794
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 13:57:44 -07:00
Andrew Meadows
05f2dfbbc3
Merge pull request #11529 from vladest/fix_audiotab_name_alignment
...
Fix alignment of audio devices input header
2017-10-05 13:50:29 -07:00
SamGondelman
6b02cbb911
move locking inside laserpointer and raypick
2017-10-05 13:17:57 -07:00
Zach Fox
8e82095135
Number sold and limited run
2017-10-05 12:46:20 -07:00
SamGondelman
a6b7578c3c
start fixing asynch issue, fixes model loading!
2017-10-05 12:30:00 -07:00
Seth Alves
b96fac2f00
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-05 11:43:25 -07:00
Seth Alves
53a49272dc
fix importing of avatar-entities
2017-10-05 11:43:19 -07:00
Cain Kilgore
b3c3b2d34f
Switched Time & Session ID Over
2017-10-05 19:42:31 +01:00
Zach Fox
d605bd9ef4
Preprocess inventory endpoint result
2017-10-05 11:01:15 -07:00
John Conklin II
a63c7c70a2
Merge pull request #11527 from sethalves/rebase-pr-11526
...
allow farGrab module to run when stylus is visible
2017-10-05 10:18:24 -07:00
Brad Hefta-Gaub
faa06e78eb
Merge pull request #11472 from huffman/fix/baking-tmp-files
...
Add removal of temporary files in FBXBaker
2017-10-05 10:06:39 -07:00
Ken Cooke
8822b1bfa4
Minor cleanup
2017-10-05 09:49:38 -07:00
Ken Cooke
82d13090f9
Better comments
2017-10-05 09:28:30 -07:00
Ken Cooke
d8341a0929
Work around compiler optimization bug
2017-10-05 09:27:07 -07:00
Seth Alves
c4de99ac85
Merge pull request #11 from druiz17/rebase-pr-11526
...
fixing laser staying on in edit mode
2017-10-05 09:17:08 -07:00
druiz17
347645329e
fixing laser staying on in edit mode
2017-10-05 09:11:02 -07:00
Ryan Huffman
f0c9badbd6
Fix misspelling in lost-connection-to-atp error
2017-10-05 09:10:46 -07:00
Ryan Huffman
a6d148475b
Add removal of temporary baked files in AssetServer
2017-10-05 09:08:42 -07:00
Ryan Huffman
de2c1aabac
Add removal of temporary files in FBXBaker
2017-10-05 09:08:42 -07:00
Brad Hefta-Gaub
218d58df81
Merge pull request #11528 from Atlante45/fix/macos-build-guide
...
Update macOS build guide
2017-10-05 08:32:16 -07:00
Ken Cooke
218de29356
disable compiler optimization as temporary fix
2017-10-05 07:39:21 -07:00
vladest
193dc83b99
Fix alignment of audio devices input header
2017-10-05 13:59:42 +02:00
David Rowe
b526ec0d93
Code review
2017-10-05 18:21:04 +13:00
Sam Gateau
25dae2f24e
Merge pull request #11499 from samcake/blue
...
Moving Camera update and render frame to Game Loop (Main thread)
2017-10-04 18:42:02 -07:00
David Rowe
4855e0f528
Fix children's rotations drifting when scale group
2017-10-05 14:36:25 +13:00
Sam Gateau
02bcbe6d5f
Merge pull request #11512 from AndrewMeadows/more-profile-details
...
expose performance hot spot in stats details
2017-10-04 18:34:19 -07:00
LaShonda Hopper
18d884f6c4
[Case 6491] eslint pass: Fixes no-multiple-empty-lines issues.
...
* eslint pass using .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-04 20:51:06 -04:00
LaShonda Hopper
e9ae2099f3
[Case 6491] eslint pass: Fixes indent issues.
...
* eslint pass using .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-04 20:37:57 -04:00
Clément Brisset
c43deabe88
Merge pull request #11502 from misslivirose/fix/demo-ac
...
Updating placeholder.js to use a url that points to example scripts
2017-10-04 17:33:53 -07:00
SamGondelman
3a6e84e681
trying to fix model issue
2017-10-04 17:26:12 -07:00
LaShonda Hopper
ac81b22cc9
[Case 6491] eslint pass: Fixes references to SelectionManager (details below).
...
SelectionManager was being referred to as selectionManager.
* eslint pass used .eslintrc.js
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-04 20:24:20 -04:00
Chris Collins
e5405ef5df
Merge pull request #11525 from SamGondelman/models
...
Try to improve performance without messing up model loading
2017-10-04 16:42:51 -07:00
Zach Fox
9d51d40af4
Merge pull request #11489 from vladest/login_dialog_rework
...
Login dialog rework
2017-10-04 15:47:44 -07:00
David Rowe
63e7521711
Merge branch 'master' into vr-edit-a
2017-10-05 11:29:49 +13:00
Atlante45
f8aa3d72de
Update macOS build guide
2017-10-04 15:21:52 -07:00
Clément Brisset
74fd69ac2d
Merge pull request #11523 from Atlante45/new-master
...
RC56 into Master
2017-10-04 15:17:52 -07:00
druiz17
9de1ca4e1a
allow farGrab module to run when stylus is visible
2017-10-04 15:04:27 -07:00
Clément Brisset
8dd00e80ac
Merge pull request #11334 from NickShaffner/patch-1
...
brew tap homebrew/versions no longer works. (or is needed)
2017-10-04 14:41:45 -07:00
LaShonda Hopper
a5b913a8b9
[Case 6491] Fixes minor spacing issue, on while loop missed previous eslint pass.
...
Changes Committed:
modified: scripts/system/libraries/entitySelectionTool.js
2017-10-04 17:36:28 -04:00
SamGondelman
215193ad90
try to improve performance
...
(cherry picked from commit a5f5f9fc5d
2017-10-04 13:50:35 -07:00
samcake
d773b40a63
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-04 13:25:14 -07:00
SamGondelman
a5f5f9fc5d
try to improve performance
2017-10-04 12:05:13 -07:00
