samcake
a678a38211
Merge with master
2018-03-20 17:35:57 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
...
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Olivier Prat
da6bd92ff6
Merged with master
2018-03-09 10:07:25 +01:00
Atlante45
69fb830480
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-08 17:23:17 -08:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
Elisa Lupin-Jimenez
c6e5f4c9c8
zip file drags don't auto add model textures
2018-03-06 19:24:09 -08:00
Elisa Lupin-Jimenez
251e4a3127
Fixed blocks importer textures being interpreted as image entities
2018-03-06 16:44:23 -08:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
samcake
d4d5f3a7f0
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 08:50:47 -08:00
Andrew Meadows
3ca21dda67
Merge hifi/master of into hifi/workload
2018-02-28 10:28:31 -08:00
Olivier Prat
2d71d7da9f
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-27 09:11:43 +01: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
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
Olivier Prat
ee253143ff
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-23 14:53:14 +01:00
Olivier Prat
4636f43728
Simplified camera view history and TAA is now working in all circumstances.
2018-02-23 10:19:05 +01:00
ZappoMan
9f68accb30
add menu for testing unresponsive interface
2018-02-22 17:34:00 -08:00
Olivier Prat
ae63610582
Added history of view to try to adjust for GPU slower than game
2018-02-22 23:03:33 +01:00
Nissim Hadar
049beba157
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-21 14:15:41 -08:00
samcake
33b47f9ae2
Merging with the actual worloadspace managed from the EntityTreeRenderer
2018-02-21 10:34:58 -08:00
samcake
34db56c50c
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-02-21 08:58:01 -08:00
samcake
f1dcfeb25e
Adding shaders and means to render the proxies contained in the workload SPace
2018-02-20 18:20:12 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
Olivier Prat
4edfe6c9ab
Trying to keep track of a better previous correction
2018-02-20 14:48:21 +01:00
samcake
9441bb477d
Working on adding rendering from the workload
2018-02-16 17:21:07 -08:00
Andrew Meadows
6d347cf44f
revert deadlock, remove Space stubbery in EntityTree
2018-02-15 17:40:15 -08:00
Andrew Meadows
ba888a14ca
give Application a 'workload' engine
2018-02-14 13:26:42 -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
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
Cristian Luis Duarte
bb4f57f982
Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.
2018-02-09 17:32:12 -03: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
