David Rowe
1e3a2b3e4e
Merge branch 'master' into 21568
2017-10-17 15:15:49 +13: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
Andrew Meadows
339edc67c8
ifdef out more per-frame-per-entity profiling
2017-10-16 17:27:53 -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
Andrew Meadows
1f09c10fb1
comment out more profiling stuff
2017-10-16 16:43:16 -07:00
John Conklin II
42a018c2c5
Merge pull request #11606 from ElderOrb/case8213
...
8213 Keyboard Input Field: Reveals Passwords (RC-57)
2017-10-16 16:14:43 -07:00
beholder
fa7892e5c6
8217 Search in tablet doesn't update
2017-10-17 02:02:21 +03:00
Andrew Meadows
102a1cb36b
ifdef out detailed profiling
2017-10-16 16:02:11 -07:00
Bradley Austin Davis
ffc3678ec3
Merge pull request #11609 from SamGondelman/ui
...
Update scripts to use new ignore/include Items, fix caching bug
2017-10-16 16:01:33 -07:00
Andrew Meadows
fb1c075a12
fix animating entities
2017-10-16 15:55:25 -07:00
SamGondelman
429905de51
update scripts to use ignoreItems, fix caching bug
2017-10-16 15:52:17 -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
Bradley Austin Davis
17a6847609
Fix CMake command line options
2017-10-16 14:58:19 -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
Sam Gondelman
671eb09bf3
Merge pull request #11605 from jherico/pointers_cleanup
...
C++ cleanup for pointers / picking
2017-10-16 14:48:08 -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
Bradley Austin Davis
3f99e70af0
C++ cleanup for pointers / picking
2017-10-16 14:20:31 -07:00
SamGondelman
aee817fbbc
scale end sphere in c++ for controller modules
2017-10-16 13:31:25 -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
Zach Fox
46f0189ab4
Merge pull request #11601 from zfox23/walletNotifFix
...
Fix Wallet notification appearing when taking screenshots
2017-10-16 12:19:50 -07:00
Ken Cooke
bd82f47c66
Remove debug logging
2017-10-16 12:11:50 -07:00
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
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
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
Brad Davis
2ae61cb96b
Prototype packaging QML and related resources into a QRC
2017-10-14 14:40:46 -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
