Seth Alves
bdd926f89e
cleanups
2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
NissimHadar
c0f20900a0
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
...
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-26 09:39:16 -08:00
Seth Alves
f08864f17b
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 09:01:41 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog
...
Relax deadlock watchdog
2018-02-23 17:09:30 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Seth Alves
99893d81e2
merge from upstream
2018-02-23 09:14:48 -08:00
ZappoMan
9f68accb30
add menu for testing unresponsive interface
2018-02-22 17:34:00 -08:00
Nissim Hadar
049beba157
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-21 14:15:41 -08:00
Seth Alves
abc467b919
load json from indicated file to populate serverless domain
2018-02-15 16:09:03 -08:00
Seth Alves
17e2db96c6
make domain-manager and pals be still when interface is in serverless mode
2018-02-15 15:19:50 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Seth Alves
764447fa24
merge from upstream
2018-02-13 13:01:45 -08:00
Seth Alves
bf9496b46b
start on support for models.json serverless domains
2018-02-13 13:00:27 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
NissimHadar
faec9a62b6
Changed "" to QString()
2018-02-06 11:01:50 -08:00
NissimHadar
cf87052b7f
Added option to select snapshot filename in scripts.
2018-02-05 17:29:00 -08:00
Elisa Lupin-Jimenez
2ff47fa454
images auto-add to asset server, started asset browser add link
2018-02-02 10:27:42 -08:00
Gabriel Calero
970ca5e08f
Add virtual pad for android
2018-01-17 15:00:43 -03:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Anthony J. Thibault
61edd83987
Improve stability for HMD third person avatars
...
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.
To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
2018-01-08 11:26:29 -08:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
David Rowe
138092ac37
Remove "Prefer Avatar Finger Over Stylus" setting
2018-01-04 15:12:34 +13:00
David Rowe
901af8896f
Add "Prefer Stylus Over Laser" setting
2018-01-03 17:54:43 +13:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
Andrew Meadows
2538204b1e
expose physics simulation stats to Test JS API
2017-12-11 11:31:00 -08:00
SamGondelman
c5ebb8a279
expose Window.getDeviceSize()
2017-11-28 16:16:30 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -08:00
Brad Davis
7bbc719d79
Fix for black screen on HMD derived display plugins
2017-11-16 08:53:12 -08:00
Brad Davis
23653f08ca
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-30 09:20:58 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
SamGondelman
a44e8efb99
merge from master
2017-10-26 12:14:53 -07:00
Bradley Austin Davis
becd99a964
Merge pull request #11584 from SamGondelman/pointerEvents
...
First step of cleaning up PointerEvents
2017-10-26 12:01:03 -07:00
luiscuenca
3d3077978e
Simplyfied and fixed null pointer
2017-10-25 18:47:10 -07:00
Sam Gondelman
863a2041a6
Merge branch 'master' into pointerEvents
2017-10-25 17:22:19 -07:00
luiscuenca
a1c9285c90
Fixed bug on case 6443
2017-10-25 13:13:50 -07:00
SamGondelman
9bbb2eb692
austin's comments, send events directly to selected web entity
2017-10-23 10:17:45 -07:00
SamGondelman
7686948daf
resolve conflicts and cleanup
2017-10-20 15:23:17 -07:00
SamGondelman
24ce09f914
generalized pointer, laserpointermanager -> pointermanager
2017-10-20 11:28:48 -07:00
SamGondelman
d7745efc8e
one global pickmanager
2017-10-19 16:55:24 -07:00
Zach Fox
3f0b08aea8
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-18 10:37:47 -07:00
