Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-20 20:10:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
60534 commits 76 branches 59 tags 1.2 GiB
Commit graph

60534 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
77f967c7e1 Merge pull request #11623 from zfox23/mergeRC57IntoMaster_20171018 
2017-10-18: Merge RC57 into Master
 2017-10-18 15:52:51 -07:00
Bradley Austin Davis
aa6c841357 Merge pull request #11588 from jherico/future/qrc 
Package all UI resources into a QRC built into the application.
 2017-10-18 15:29:34 -07:00
Zach Fox
a669aff453 Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018 2017-10-18 10:45:30 -07:00
John Conklin II
08cfa32858 Merge pull request #11610 from ElderOrb/case8217_RC57 
8217 Search in tablet doesn't update (RC-57)
 2017-10-18 10:41:33 -07:00
Melissa Brown
8965f2aac3 Merge pull request #11620 from cain-kilgore/21571 
WL 21571 - Remove "common questions" button
 2017-10-18 08:38:20 -07:00
Thijs Wenker
7b2dbc34dc Merge pull request #11622 from ctrlaltdavid/21572 
Fix importing entities from URL
 2017-10-18 14:25:42 +01:00
David Rowe
5b6d33bcb2 Missing semicolon 2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597 Fix importing entities from URL 2017-10-18 17:44:36 +13:00
Cain Kilgore
16467128a2 WL 21571 2017-10-18 02:42:08 +01:00
beholder
e8589d53dd updated code based on code review 2017-10-18 03:45:50 +03:00
Andrew Meadows
52813d1abe Merge pull request #11607 from jherico/fix/cmake_command_line 
CMake tweaks
 2017-10-17 17:39:54 -07:00
Andrew Meadows
25818fc5e9 Merge pull request #11613 from jherico/feature/qml_whitelist 
Support for custom functionality for specific QML URLs
 2017-10-17 17:34:22 -07:00
Seth Alves
e9d4da5a01 Merge pull request #11619 from druiz17/fix-web-entity-and-overlay-keyboard 
Fix web3Doverlays and webEntities keyboard not showup
 2017-10-17 17:32:04 -07:00
Bradley Austin Davis
9e46e288b1 Merge pull request #11604 from SamGondelman/endSphere 
Scale LaserPointer end overlay in C++
 2017-10-17 16:37:35 -07:00
druiz17
9a881c5e57 fix keyboard 2017-10-17 15:43:23 -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
Bradley Austin Davis
f53a74b515 Support for custom functionality for specific QML URLs 2017-10-17 11:53:30 -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
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
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
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
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
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
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
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
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
Zach Fox
6b7c997a4c Minor text tweak 2017-10-13 13:37:11 -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