Seth Alves
|
28a8b18060
|
Revert "fix importing of avatar entities"
|
2017-10-07 16:54:05 -07:00 |
|
Brad Hefta-Gaub
|
62fc193bff
|
Merge pull request #11532 from sethalves/import-av-entities
fix importing of avatar entities
|
2017-10-06 17:59:54 -07:00 |
|
Thijs Wenker
|
77a36bf788
|
Merge pull request #10892 from ctrlaltdavid/vr-edit-a
VR edit app
|
2017-10-07 02:19:00 +02:00 |
|
Seth Alves
|
8d00731620
|
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
|
2017-10-06 07:20:34 -07:00 |
|
David Rowe
|
105457b388
|
Don't unbusubscribe from possibly shared channel
|
2017-10-06 13:27:08 +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 |
|
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 |
|
David Rowe
|
b526ec0d93
|
Code review
|
2017-10-05 18:21:04 +13:00 |
|
David Rowe
|
63e7521711
|
Merge branch 'master' into vr-edit-a
|
2017-10-05 11:29:49 +13:00 |
|
Clément Brisset
|
74fd69ac2d
|
Merge pull request #11523 from Atlante45/new-master
RC56 into Master
|
2017-10-04 15:17:52 -07:00 |
|
Brad Hefta-Gaub
|
a1979a2600
|
Merge branch 'master' into RC-56
|
2017-10-03 18:16:21 -07:00 |
|
druiz17
|
13feec89c2
|
remove update stylus
|
2017-10-03 16:12:37 -07:00 |
|
druiz17
|
ad9677f63e
|
fixing grabbing and tablet bugs
|
2017-10-03 16:11:51 -07:00 |
|
druiz17
|
6b3d89d18f
|
fix hudlaser module
|
2017-10-03 14:13:37 -07:00 |
|
druiz17
|
33e9a71000
|
grab attachments
|
2017-10-03 12:51:51 -07:00 |
|
Zach Fox
|
ea3da6c9dd
|
Merge pull request #11495 from zfox23/pop_interfaceChanges2
Commerce: One step closer!
|
2017-10-03 11:56:00 -07:00 |
|
Howard Stearns
|
22f0ef33ed
|
Merge pull request #11496 from howard-stearns/certificate-properties
Certificate properties
|
2017-10-03 10:06:48 -07:00 |
|
David Rowe
|
5145107f8c
|
2D overlays can no longer be lasered
|
2017-10-03 21:36:40 +13: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 |
|
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 |
|
druiz17
|
68780f56b7
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
|
2017-10-02 14:06:26 -07:00 |
|
Zach Fox
|
1050d2851d
|
Modify injected code to add to dropdown menu
|
2017-10-02 12:37:49 -07:00 |
|
Zach Fox
|
15c0a21e0e
|
Varied commit - styling changes, beginnings of new Wallet endpoint, etc
|
2017-10-02 12:19:24 -07:00 |
|
Howard Stearns
|
930832bb19
|
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
|
2017-10-02 09:44:29 -07:00 |
|
Zach Fox
|
1ec0f5d9a0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
|
2017-10-02 09:26:59 -07:00 |
|
David Rowe
|
829cc8e5e6
|
Merge branch 'master' into vr-edit-a
|
2017-10-02 17:08:27 +13: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 |
|
druiz17
|
20918641f4
|
saving work
|
2017-09-29 16:48:25 -07:00 |
|
Howard Stearns
|
73c8da99dc
|
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
|
2017-09-29 16:46:43 -07:00 |
|
Zach Fox
|
1e52e7824b
|
Fix injection
|
2017-09-29 16:39:07 -07:00 |
|
Zach Fox
|
255cede808
|
Correctly determine if we're on a marketplace screen
|
2017-09-29 16:05:26 -07:00 |
|
Anthony J. Thibault
|
9273e02497
|
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-09-29 14:01:50 -07:00 |
|
Zach Fox
|
63396a2fc3
|
WalletScriptingInterface; wallet status refactor
|
2017-09-29 13:42:04 -07:00 |
|
David Rowe
|
75365847a1
|
Merge branch 'master' into vr-edit-a
|
2017-09-30 09:30:38 +13:00 |
|
Seth Alves
|
7645808694
|
Merge pull request #11479 from druiz17/more-bugs
fixing grabbing and tablet bugs
|
2017-09-28 20:02:47 -07:00 |
|
Seth Alves
|
3d05a0c07c
|
Merge pull request #11484 from druiz17/grab-js
disable grab.js in HMD
|
2017-09-28 17:27:26 -07:00 |
|
Howard Stearns
|
d1350a03c2
|
working checkpoint, but with a lot of debug/development stuff
|
2017-09-28 17:06:07 -07:00 |
|
druiz17
|
45b8bfdb1f
|
disbale grab.js in HMD
|
2017-09-28 16:17:39 -07:00 |
|
Thijs Wenker
|
cabd68a63a
|
Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import.
|
2017-09-28 16:03:09 -07:00 |
|
Zach Fox
|
2cff5c1fa6
|
First time Purchases tutorial
|
2017-09-28 15:12:55 -07:00 |
|
Zach Fox
|
66be558a04
|
My Items Interface
|
2017-09-28 14:04:57 -07:00 |
|
druiz17
|
1947f2ba99
|
remove update stylus
|
2017-09-28 13:23:28 -07:00 |
|
Zach Fox
|
68c08969ae
|
Update Purchases
|
2017-09-28 12:49:38 -07:00 |
|
druiz17
|
3b05317db6
|
fixing grabbing and tablet bugs
|
2017-09-28 11:18:40 -07:00 |
|
Zach Fox
|
f0d668c5c3
|
Fix marketplace injection problems - yay!
|
2017-09-28 11:14:44 -07:00 |
|
David Rowe
|
30c4a22441
|
Merge branch 'master' into vr-edit-a
|
2017-09-28 16:10:26 +13:00 |
|