Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
Dante Ruiz
|
5843c24309
|
adding perfectly straight model and adjusting ovelray
|
2018-06-08 13:56:00 -07:00 |
|
Dante Ruiz
|
dfea4a0f7c
|
fixing rotation
|
2018-06-08 11:50:52 -07:00 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -07:00 |
|
Zach Fox
|
93eba5fe5e
|
Merge pull request #13293 from zfox23/MS7224_cubeSnapshots
Fix MS7224: Add dimensions to printed Snapshot entity
|
2018-06-07 12:52:20 -07:00 |
|
John Conklin II
|
067fa46355
|
Merge pull request #13265 from wayne-chen/toggleSpaceMode
Re-adding toggleSpaceMode function
|
2018-06-07 11:21:28 -07:00 |
|
John Conklin II
|
389bddb0f4
|
Merge pull request #13255 from ctrlaltdavid/21884
Fix properties not populating particle explorer tab
|
2018-06-07 09:42:45 -07:00 |
|
John Conklin II
|
66e2bebcbf
|
Merge pull request #13279 from thoys/fix/create-camera
Fix MS13500: create-app camera orbit to not jump around on secondary monitor
|
2018-06-07 09:38:10 -07:00 |
|
David Rowe
|
32c21a1397
|
Fix particle property value reverting to old value when switch tabs
|
2018-06-07 12:22:56 +12:00 |
|
Dante Ruiz
|
5a89a51b85
|
make edit mode play nicely
|
2018-06-06 16:04:36 -07:00 |
|
David Rowe
|
3e100fb141
|
Merge branch 'master' into 21884
|
2018-06-07 10:46:53 +12:00 |
|
Dante Ruiz
|
6ddc768f57
|
making overlays use precisionPicking and adjust tablet screen position
|
2018-06-06 15:40:33 -07:00 |
|
Dante Ruiz
|
d57d087752
|
update tablet model again
|
2018-06-06 12:48:20 -07:00 |
|
Dante Ruiz
|
995cfeb3c5
|
cleaning code
|
2018-06-06 10:42:12 -07:00 |
|
Dante Ruiz
|
59c50b7f26
|
remove highlight overlay in favor of materialEntity
|
2018-06-06 08:38:58 -07:00 |
|
Dante Ruiz
|
b275bbe5a7
|
saving changes
|
2018-06-05 15:44:17 -07:00 |
|
Zach Fox
|
4ebfca0c57
|
Really fix it
|
2018-06-05 10:04:37 -07:00 |
|
Zach Fox
|
82c438a174
|
CR
|
2018-06-05 10:04:26 -07:00 |
|
Zach Fox
|
b9604fdb9d
|
Fix MS14796: Fix position of tablet close button highlight
|
2018-06-05 10:04:13 -07:00 |
|
Wayne Chen
|
c18c2358d6
|
adding fix for tablet screen y offset
|
2018-06-05 10:03:59 -07:00 |
|
David Rowe
|
b4b63187ae
|
Fix typo
|
2018-06-05 08:48:10 +12:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
Zach Fox
|
cf7a3d1af6
|
Fix MS7224: Add dimensions to printed Snapshot entity
|
2018-06-04 11:30:29 -07:00 |
|
Seth Alves
|
708cbbc984
|
Merge pull request #13258 from wayne-chen/toggleAdvancedMovementFile-case-15453
JavaScript exception in toggleAdvancedMovementForHandControllers.js
|
2018-06-01 10:48:24 -07:00 |
|
Thijs Wenker
|
3779a4780e
|
Prevent the cursor from being stuck on the most outer edges of the screen
|
2018-06-01 02:07:02 +02:00 |
|
Thijs Wenker
|
a06c9eccca
|
- fix create-app camera orbit to not jump around on secondary monitor
- style fixes entityCameraTool.js
|
2018-06-01 00:16:42 +02:00 |
|
Wayne Chen
|
9f20d52d01
|
adding alternate solution.
|
2018-05-31 15:05:33 -07:00 |
|
Wayne Chen
|
d66b548fc5
|
fixing typo in script file.
|
2018-05-31 15:04:29 -07:00 |
|
David Rowe
|
3c5a779a98
|
Don't modify function parameter
|
2018-06-01 09:36:28 +12:00 |
|
Wayne Chen
|
34120da63f
|
re-adding toggleSpaceMode
|
2018-05-30 16:06:34 -07:00 |
|
Dante Ruiz
|
072d8b70b1
|
adding back notifcations
|
2018-05-30 13:36:02 -07:00 |
|
David Rowe
|
8c9bdf51a7
|
Remove superfluous variable
|
2018-05-30 17:16:08 +12:00 |
|
David Rowe
|
03cec8cb54
|
Fix properties not populating particle explorer tab
|
2018-05-30 17:15:33 +12:00 |
|
Gabriel Calero
|
bb73af7230
|
Show stats button only in debug mode. Add isDebugMode to Script public interface
|
2018-05-29 17:21:44 -03:00 |
|
Wayne Chen
|
8453c7baba
|
reverting commit 802cedf1bc regarding toggleSpaceMode
|
2018-05-25 09:25:05 -07:00 |
|
Wayne Chen
|
89f7eb0b30
|
Adding fix for enabling saved front/back advanced controls.
|
2018-05-25 09:21:01 -07:00 |
|
Wayne Chen
|
3d0e0da42f
|
re-adding removed toggleSpaceMode function
|
2018-05-24 11:08:26 -07:00 |
|
John Conklin II
|
3e665fb616
|
Merge pull request #13179 from dback2/cloneables
Server-Managed Cloneables + Cloneable Properties
|
2018-05-23 12:40:27 -07:00 |
|
Dante Ruiz
|
c4f39841f5
|
fix another menu name changes that broke snapshot
|
2018-05-22 10:46:20 -07:00 |
|
Dante Ruiz
|
9df79462ad
|
fix snapshot
|
2018-05-22 09:06:10 -07:00 |
|
Liv Erickson
|
604b3cac1c
|
check for null entities in grab, add conversion for old userdata cloneable
|
2018-05-21 16:19:43 -07:00 |
|
Dante Ruiz
|
249d22b4b4
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-21 10:31:24 -07:00 |
|
Anthony Thibault
|
4f69ae253d
|
Merge pull request #12906 from Triplelexx/21794_move_inspect
WorkList #21794: Modify inspect.js to work with Avatars as well as entities
|
2018-05-21 09:40:42 -07:00 |
|
Liv
|
0927cadf10
|
Merge pull request #13093 from RebeccaStankus/edit-bug-14671
moved checkEditPermissionsAndUpdate function to higher scope
|
2018-05-18 16:44:53 -07:00 |
|
Liv
|
99960b3024
|
Merge pull request #13085 from ctrlaltdavid/21863
Fix intermittent ability to select particle and light entities
|
2018-05-18 16:44:11 -07:00 |
|
Dante Ruiz
|
3b59af3ed7
|
Merge branch 'master' of github.com:highfidelity/hifi into menu-updates
|
2018-05-18 16:42:31 -07:00 |
|
Dante Ruiz
|
60dd7e49ab
|
making requested changes
|
2018-05-18 16:41:39 -07:00 |
|
Liv Erickson
|
de05388ebf
|
Merge branch 'master' of github.com:highfidelity/hifi into clone-server
|
2018-05-18 10:42:26 -07:00 |
|
RebeccaStankus
|
27638b9ced
|
Removing duplicate function
|
2018-05-18 09:20:03 -07:00 |
|
Sam Gondelman
|
74840d2130
|
Merge pull request #12935 from gcalero/android_new_login
Android new login
|
2018-05-17 15:53:25 -07:00 |
|