Andrew Meadows
23bb8608b1
minor optimizations in updateModelBounds()
2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc
update profiling timers
2017-10-16 11:52:30 -07:00
Ken Cooke
7c14d5bbdf
Remove debug logging
2017-10-16 11:43:52 -07:00
Ken Cooke
a702c5a0e4
Fix audio glitches caused by initial burst of SelectedAudioFormat packets.
...
Temporary codec mismatch is expected during audio codec startup, due to packets already in-flight.
2017-10-16 11:41:40 -07:00
Zach Fox
552defb418
Change protocol version
2017-10-16 11:23:34 -07:00
Zach Fox
1cf816a261
Fix Wallet notification appearing when taking screenshots
2017-10-16 11:15:09 -07:00
Nissim
45ffd3bd58
Merge branch 'master' into hazeZone
2017-10-16 11:01:33 -07:00
Nissim
0a5302ce25
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-10-16 11:01:13 -07:00
Nissim
e51b8047f1
Corrected gcc warning.
2017-10-16 11:00:10 -07:00
Zach Fox
febc725520
Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57
2017-10-16 09:53:15 -07:00
Zach Fox
c25008cff3
Merge pull request #11594 from zfox23/commerce_octoberTweaks
...
2017-10-13 Commerce frontend tweaks
2017-10-16 09:25:43 -07:00
John Conklin II
1fcbf56ab7
Merge pull request #11596 from samcake/RC-57
...
RC-57 : Fixing the zone entity not rendered properly when created
2017-10-16 09:12: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
Olivier Prat
70f892e67d
Ready to plug multiple selections javascript side
2017-10-16 17:02:13 +02:00
Olivier Prat
1b67223e0e
Preparing for multiple outline groups in shader
2017-10-16 12:38:44 +02:00
Olivier Prat
e42699c0ea
Added multiple selections but still only first linked to outline
2017-10-16 10:57:06 +02:00
Olivier Prat
8d79313a9d
Working mask rendering and debugging
2017-10-16 09:42:58 +02:00
Olivier Prat
f716d0cc44
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-10-16 09:00:59 +02: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
SamGondelman
c4e6cb28ce
move contextoverlay connection to contextoverlayinterface
2017-10-13 16:23:29 -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
samcake
c550d5089e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-13 14:58:26 -07:00
SamGondelman
5bfb0baf09
const references
2017-10-13 14:38:46 -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
