Nissim
edd256c600
Fixed crash on invalid HazeMode.
2017-10-19 13:36:32 -07:00
Nissim
fe286aff83
Andrew's corrections (per coding standard).
2017-10-18 08:42:07 -07:00
Nissim
5249e97fa0
Merge branch 'master' into hazeZone
2017-10-17 15:09:22 -07:00
Nissim
845f3e4bee
Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone
2017-10-17 15:03:57 -07:00
Nissim
935180bf09
Fixed my bloody stupid mistake...
2017-10-17 15:02:05 -07:00
Andrew Meadows
5225ca3ca7
Merge pull request #11448 from jherico/future/clang_format
...
Use clang format to enforce coding standards
2017-10-17 13:34:01 -07:00
Nissim
d53aadc617
Merge branch 'master' into hazeZone
2017-10-17 12:13:40 -07:00
Nissim
5a1c4d5a30
Fixed gcc warning.
2017-10-17 11:08:15 -07:00
John Conklin II
31b8013ed9
Merge pull request #11538 from kencooke/audio-mac-bugfix2
...
Additional cleanup of audio noise gate
2017-10-17 11:02:55 -07:00
Nissim
3e228acdb6
Fixed gcc warning.
2017-10-17 10:41:49 -07:00
Nissim
afa93f46e5
Merge branch 'master' into hazeZone
2017-10-17 09:28:07 -07:00
Nissim
a641d6de66
Variable rename.
2017-10-17 09:18:29 -07:00
Brad Hefta-Gaub
f7a1816a99
Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue
...
Reduce present traffic on main thread event queue.
2017-10-16 18:02:11 -07:00
Nissim
072ac13120
Fixed gcc warnings.
2017-10-16 17:12:59 -07:00
Brad Hefta-Gaub
b0fc050fe2
Merge pull request #11586 from Zvork/hdrcube
...
HDR cube map equirectangular bug fix
2017-10-16 16:49:20 -07:00
Brad Hefta-Gaub
c1ce84b060
Merge pull request #11602 from kencooke/audio-startup-fix
...
Fix loud screeching sound when certain users join a domain
2017-10-16 16:47:42 -07:00
Seth Alves
648ae731da
Merge pull request #11603 from MiladNazeri/fogBugz/8382
...
Fix for fogbugz:8382 to shutdown debug window on reload scripts
2017-10-16 15:32:28 -07:00
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
Nissim
1b42572f99
Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone
...
# Conflicts:
# scripts/system/html/js/entityProperties.js
2017-10-16 14:29:56 -07:00
milad
97c255c59e
Fix for fogbugz:8382 to shutdown debug window on reload scripts
2017-10-16 16:12:54 -04:00
Nissim
fd2b0da76d
First version.
2017-10-16 12:20:31 -07:00
Ken Cooke
bd82f47c66
Remove debug logging
2017-10-16 12:11:50 -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
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
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
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
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
Nissim Hadar
afb8b2d8e7
Merge branch 'master' into hazeZone
2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -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
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -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
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
