Bradley Austin Davis
1f8bd50d2b
Add clang format specification
2017-10-16 15:19:12 -07:00
Brad Hefta-Gaub
c4e672d6b8
Merge pull request #11582 from ElderOrb/case8213
...
8213 Keyboard Input Field: Reveals Passwords
2017-10-16 14:57:18 -07:00
Andrew Meadows
d276adc3a9
Merge pull request #11597 from samcake/orange
...
Master : Fixing the zone entity not rendered properly when created
2017-10-16 08:49:44 -07:00
beholder
f83040c572
updating code accordingly to the comments
2017-10-14 12:29:06 +03:00
samcake
31ea5d7417
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-10-13 17:09:41 -07:00
Ryan Huffman
4a9aa30630
Merge pull request #10956 from birarda/feat/update-default-avatar
...
update default avatar to be better with oculus grab triggers
2017-10-13 15:57:37 -07:00
samcake
918e13b2fc
fixing the zone entity not rendering when created or when avatar appears in one
2017-10-13 15:03:23 -07:00
Clément Brisset
725dc1851e
Merge pull request #11412 from mnafees/21495
...
CR for Job #21495 - Add limit to file size imported into asset server
2017-10-13 13:45:42 -07:00
Seth Alves
fe9f142bf6
Merge pull request #11562 from druiz17/fix-release-grab
...
include release message to controller modules
2017-10-13 13:06:18 -07:00
Brad Hefta-Gaub
704cb1fd21
Merge pull request #11574 from ctrlaltdavid/shapes-preload
...
Preload Shapes app asset files so that they're in disk cache ready for use
2017-10-13 13:00:03 -07:00
Brad Hefta-Gaub
9f3331ec19
Merge pull request #11587 from druiz17/stylus-fix
...
Fix Stylus in Tablet + Grab with Hand Results in the other Stylus being Dysfunctional
2017-10-13 12:42:26 -07:00
Brad Hefta-Gaub
b1812c30c9
Merge pull request #11571 from huffman/fix/ktx-thrashing
...
Fix KTX requests thrashing if a mip level can't be assigned
2017-10-13 11:53:24 -07:00
Brad Hefta-Gaub
60030c08fa
Merge pull request #11573 from druiz17/bug-hud-module
...
hud module intersects with dev stats window
2017-10-13 11:48:06 -07:00
Dante Ruiz
d14e6b6e5a
Merge pull request #11450 from ElderOrb/case7722
...
7722 Add onHover Outline to Tablet "X" Button
2017-10-13 11:38:38 -07:00
druiz17
2422c9d9f3
made requested changes
2017-10-13 10:45:24 -07:00
druiz17
6799b9ca13
fix stylus
2017-10-13 09:34:08 -07:00
Bradley Austin Davis
4dcce6ef45
Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread
...
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
2017-10-12 17:37:05 -07:00
Stephen Birarda
8a331e29a2
Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker
...
Feat/JS-Baker
2017-10-12 16:16:02 -05:00
druiz17
83d2a54b0f
fixed some bugs
2017-10-12 13:48:21 -07:00
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -07:00
beholder
8c7462f012
fine-tuning based on discussion with Anshuman
2017-10-12 22:21:40 +03:00
beholder
c31aa6bcdb
8213 Keyboard Input Field: Reveals Passwords
2017-10-12 22:08:46 +03:00
utkarshgautamnyu
75aa3a73ad
changed pointer args to references in JSBaker:bakeJS()
2017-10-12 12:08:44 -07:00
Zach Fox
30d6c78e4e
Merge pull request #11580 from ElderOrb/case8210
...
8210 Keyboard Input Field: Pressing Space should Clear Field
2017-10-12 11:49:18 -07:00
utkarshgautamnyu
49f601329f
Update JSBaker.h
2017-10-12 11:35:38 -07:00
utkarshgautamnyu
f3983b3edc
Update JSBaker.cpp
2017-10-12 11:34:28 -07:00
Zach Fox
1227168939
Merge pull request #11575 from ElderOrb/QTBUG-49297
...
workaround for https://bugreports.qt.io/browse/QTBUG-49297
2017-10-12 10:56:45 -07:00
druiz17
a6bc6a09a5
Merge branch 'master' of github.com:highfidelity/hifi into bug-hud-module
2017-10-12 10:34:17 -07:00
beholder
f31316b0aa
8210 Keyboard Input Field: Pressing Space should Clear Field
2017-10-12 15:03:32 +03:00
beholder
9c15af9fbe
raise highlight above button overlay to reduce flickering
2017-10-12 14:46:01 +03:00
David Rowe
74899e4798
Preload PNG files also
2017-10-12 13:58:18 +13:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Sam Gateau
7edb41b0ea
Merge pull request #11577 from samcake/orange
...
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 17:12:27 -07:00
Mohammed Nafees
52e29c07cc
Fix warning resulting in build error
2017-10-11 19:59:04 -04:00
Mohammed Nafees
19b00e1364
Add option to limit assets filesize in settings
2017-10-11 19:59:04 -04:00
Brad Hefta-Gaub
cd2a742974
Merge pull request #11576 from SamGondelman/pointerEvents
...
Remove unused HFMetaEvents
2017-10-11 16:10:43 -07:00
beholder
dcdf85b08e
workaround for https://bugreports.qt.io/browse/QTBUG-49297
2017-10-12 02:10:09 +03:00
druiz17
42cab19ab2
generialze window search
2017-10-11 16:04:35 -07:00
samcake
592a4de1e5
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 15:56:22 -07:00
Sam Gateau
38b467a6bf
Merge pull request #11570 from jherico/overlays_blocking
...
Remove unnecessary blocking call
2017-10-11 15:40:53 -07:00
SamGondelman
403b18977b
remove unused HFMetaEvents
2017-10-11 14:37:23 -07:00
Ryan Huffman
c6672fc4ac
Fix KTX requests thrashing if a mip level can't be assigned
...
When downloading a mip level and assigning it to the underlying
resource, we weren't checking to see if the assignment was successful.
If it was unsuccessful, we would queue up a request for the next mip
which would end up being a request for the same mip that was just
attempted. This change fixes this problem by checking to see if the
texture's available mip level is at least <= the assigned mip level.
2017-10-11 14:20:57 -07:00
Seth Alves
a4462056df
Merge pull request #11549 from sethalves/linux-clang-build
...
allow project to be built with clang on Linux
2017-10-11 13:28:45 -07:00
David Rowe
f3b2ccf5f8
Preload asset files so that they're in disk cache ready for use
2017-10-12 09:09:57 +13:00
druiz17
8f3fa08b1e
hud module intersects with stats window
2017-10-11 11:41:10 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Zach Fox
99109fe8e5
Merge pull request #11567 from zfox23/commerce_daveIntegration3
...
2017-10-10 Commerce Frontend Updates
2017-10-11 11:07:03 -07:00
Bradley Austin Davis
1e91c5cfce
Merge pull request #11561 from AndrewMeadows/improve-geometry-cache
...
more correct use of BufferView in GeometryCache
2017-10-11 11:03:53 -07:00
Brad Davis
69f869b339
Remove unecessary blocking call
2017-10-11 11:01:06 -07:00
Zach Fox
3f0ec73be6
Fix date displays
2017-10-11 10:55:14 -07:00
