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
Brad Davis
2ae61cb96b
Prototype packaging QML and related resources into a QRC
2017-10-14 14:40:46 -07:00
Zach Fox
bcbddb7106
Fix unix warnings
2017-10-14 14:13:19 -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
samcake
a852d5040d
FIxing the zone entity not stacked properly when created
2017-10-13 16:04:48 -07:00
Anthony J. Thibault
67d43b4fac
Use atomic<bool> and compare_exchange_strong
2017-10-13 16:03:56 -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
Zach Fox
5be9f2022e
Fix writing backup instructions when restoring wallet backup
2017-10-13 14:33:36 -07:00
Anthony J. Thibault
a2a6cd0c7a
Reduce present traffic on main thread event queue.
...
In an effort to diagnose the root cause of several deadlocks,
it seems possible that the main thread event queue can grow
to a size where it can take many seconds to drain.
This PR attempts to address this in two ways:
* Change the connection between the DisplayPlugin::presented signal and
the Application::onPresent slot to be a DirectConnection. This should
prevent the main thread from filling up with signal events.
* Within Applicaiton::onPresent use an atomic counter to prevent the main
thread from filling up with repeated Idle events.
2017-10-13 14:28: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
Stephen Birarda
dabfec9436
ignore unbakeable textures in FBX files
2017-10-13 13:42:39 -07:00
Nissim Hadar
afb8b2d8e7
Merge branch 'master' into hazeZone
2017-10-13 13:40:06 -07:00
Zach Fox
6b7c997a4c
Minor text tweak
2017-10-13 13:37:11 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -07:00
Zach Fox
17a0dd2a76
Elide long usernames in injected code
2017-10-13 13:32:55 -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
Nissim Hadar
6697d7c93a
Simplified setHazeColor.
2017-10-13 12:49:38 -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
David Rowe
fc4e440dc4
Update system scripts to use new properties
2017-10-14 08:32:14 +13:00
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -07:00
Zach Fox
051019a57a
Fix certificate username text eliding too early
2017-10-13 12:10:37 -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
Nissim Hadar
5bfbaf4860
Renamed HazeMode to ComponentMode.
2017-10-13 11:24:56 -07:00
David Rowe
949ed3b33d
Add some Quat and Uuid JavaScript helper properties
2017-10-14 07:17:23 +13:00
Zach Fox
95a9675220
Final help QA - minus link to blockchain docs
2017-10-13 10:58:15 -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
Ken Cooke
e4e37e65e6
Handle packets in-flight during audio codec startup
2017-10-13 08:19:30 -07:00
Olivier Prat
01c3ca17ee
Fixed cube map conversion from equirectangular maps when done after HDR conversion
2017-10-13 11:05:27 +02: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
Nissim Hadar
b1174ce40c
Merge branch 'master' into hazeZone
2017-10-12 17:04:42 -07:00
Nissim Hadar
7eb9dade6a
Added hazeTestInitialPose.js
2017-10-12 17:03:33 -07:00
Zach Fox
1400c66506
Be a bit more thorough
2017-10-12 16:58:48 -07:00
Zach Fox
b56a38ca15
Re-add references to recentlyDeletedEntityItemIDs
2017-10-12 16:32:09 -07:00
Zach Fox
d75c0a00bb
Closer than ever
2017-10-12 16:29: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
Zach Fox
6a47884fcf
Cleanup and fix
2017-10-12 13:41:19 -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
50446619f5
Remove unnecessary (?) references to _recentlyDeletedEntityItemIDs
2017-10-12 11:59:46 -07:00
Zach Fox
abe1cd1b51
Minor cleanup
2017-10-12 11:53:47 -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
