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

25069 commits

Author SHA1 Message Date
Seth Alves
32d10641dc don't enable so much logging when 'verbose logging' is turned on 2018-05-10 14:41:54 -07:00
Gabriel Calero
a1a48d9b9e Merge remote-tracking branch 'upstream/master' into android_places_goto 2018-05-10 18:24:26 -03:00
Triplelexx
a061e84ad7 remove unused commented code 2018-05-10 19:40:02 +01:00
Zach Fox
0236bc0c44 Cleanup after merge conflict 2018-05-10 09:51:45 -07:00
Zach Fox
ce575d367a Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-10 09:31:02 -07:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression 
more suppression of logging
 2018-05-09 17:36:12 -07:00
Zach Fox
44cfa95830 Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-09 15:01:24 -07:00
John Conklin II
59b9e08f58
Merge pull request #13131 from zfox23/MS14937_CheckoutContentSetFix 
MS14937: Fix Replace button for content sets during Checkout
 2018-05-09 13:04:10 -07:00
Seth Alves
16e832ac08 use setFilterRules rather than specifying each logging category to suppress 2018-05-09 13:01:49 -07:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
Howard Stearns
bf466344ee
Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound 
MS14951: Fix Snapshot hotkey sound playback
 2018-05-09 11:07:46 -07:00
Sam Gateau
17350a79dd
Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester 
Command line parameters for autotester
 2018-05-09 10:51:31 -07:00
Gabriel Calero
843282739e Remove unused includes and white spaces 2018-05-09 14:16:51 -03:00
Thijs Wenker
a42491ded7
Merge pull request #13055 from misslivirose/remove-help-ftue 
Do not open help on first run
 2018-05-09 18:48:05 +02:00
Zach Fox
542e707de8 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:40:51 -07:00
Zach Fox
06c6f55069 MS14951: Fix Snapshot hotkey sound playback 2018-05-09 09:35:42 -07:00
Gabriel Calero
b0fee3fd8b Improve code based on changes requested in the PR 2018-05-09 11:06:32 -03:00
Zach Fox
22c26c348d MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:37:11 -07:00
Zach Fox
540f200b99 MS14937: Fix Replace button for content sets during Checkout 2018-05-08 16:34:28 -07:00
NissimHadar
175fa9108e Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 15:52:15 -07:00
Stephen Birarda
4165ab3667 Merge branch 'RC67' of github.com:highfidelity/hifi into 67-to-master 2018-05-08 14:08:21 -07:00
Gabriel Calero
5e337e90a3 Deactivates display plugin when qt app goes to background 2018-05-08 16:55:04 -03:00
Gabriel Calero
da69c9d077 Make qt application not stop in background and remove separete thread 2018-05-08 15:45:33 -03:00
NissimHadar
d5bb582811 Per Austin's comments. 2018-05-08 11:40:56 -07:00
NissimHadar
eb14658bc5 Per Austin's comments. 2018-05-08 11:13:06 -07:00
NissimHadar
8ad13826bd Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441 Use 'standard' format for command line parameter with multiple options. 2018-05-07 13:01:18 -07:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818 
Fix for 'Login page for steam is blank'
 2018-05-07 11:26:39 -07:00
John Conklin II
6ac43c34c2
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors 
don't spam resetSensors function when holding down Qt::Key_Apostrophe
 2018-05-07 10:52:51 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
Alexander Ivash
b4cfea2fbc FB14818 Login page for steam is blank 2018-05-06 17:17:06 +03:00
Seth Alves
30c5fa6fa1 fix divide-by-zero asan warning in LODManager::autoAdjustLOD 2018-05-05 20:45:06 -07:00
Clement
5a3773ba72 Fix compile error on linux/windows 2018-05-04 18:18:46 -07:00
David Rowe
5021778dc0 Merge branch 'master' into 21866 2018-05-05 12:17:18 +12:00
David Rowe
5e6b83a634 Lint 2018-05-05 12:14:51 +12:00
David Rowe
1be948ee28 Scroll element into view if it's been moved off the screen 2018-05-05 12:03:18 +12:00
Bradley Austin Davis
38f43bdc68 Disable current splash frame implementaton 2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6 Alternate shader 2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Cristian Luis Duarte
03ca427234 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 20:18:15 -03:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking 
Add support for client texture selection
 2018-05-04 16:14:43 -07:00
Anthony J. Thibault
8480bb962b Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 16:04:05 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist 
Multifrustum queries punchlist
 2018-05-04 15:50:44 -07:00
John Conklin II
b314d496ec
Merge pull request #13103 from zfox23/MS14699_clearCachedPasscode 
MS14699: Prevent Wallet passcode from being sticky in certain cases
 2018-05-04 15:22:41 -07:00
Cristian Luis Duarte
8c96d2be3c Patch for secondary camera assert error on Android 2018-05-04 18:44:07 -03:00
Clement
ad60a79180 Fix for android builds 2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db CR 2018-05-04 14:43:16 -07:00
Cristian Luis Duarte
9f5365a277 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-04 18:38:08 -03:00
Liv Erickson
ee0af079cf merge from upstream master and fix conflict 2018-05-04 14:34:38 -07:00
NissimHadar
2311fa33fb Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-04 14:13:43 -07:00
Zach Fox
53fe0bc616 MS14699: Prevent Wallet passcode from being sticky in certain cases 2018-05-04 14:08:21 -07:00
NissimHadar
aef5ea0936 Correct usage of the test script URL. 2018-05-04 12:30:13 -07:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639 
Fix for crash deep in QML after useFullAvatarURL
 2018-05-04 11:33:28 -07:00
Zach Fox
1da840984b Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-04 10:24:28 -07:00
Zach Fox
e48d39ec38 MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 10:10:48 -07:00
David Rowe
03da2f0946 Only scroll keyboard if necessary 2018-05-04 20:32:53 +12:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e Update avatar query names 2018-05-03 18:19:30 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2 Rename ViewFrustum packets to AvatarQuery 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av 
Add support for multifrustum avatar queries
 2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam 
Add support for multifrustum entity queries
 2018-05-03 18:13:51 -07:00
NissimHadar
da621d99d3 Removed unneeded pragma. 2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix 
Keep CrashpadClient around for application lifetime
 2018-05-03 16:48:29 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd Removed unneeded pragma. 2018-05-03 16:44:04 -07:00
NissimHadar
2c6c0a25fc Add testSnapshotLocation parameter to takeSnapshot. 2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7 Added quitWhenFinished parameter to the command line. 2018-05-03 15:02:11 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g 
JSDoc fixes
 2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-03 14:06:06 -07:00
Zach Fox
c3d3cdca3d Add cubemap output format 2018-05-03 12:57:00 -07:00
NissimHadar
46f461dcdb Don't display crash message if running from command line with a test script. 2018-05-03 11:20:37 -07:00
Howard Stearns
d4a562ee47
Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation 
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
 2018-05-03 10:02:20 -07:00
NissimHadar
8b3c451f91 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 08:25:19 -07:00
Ken Cooke
2a7e8c6f89 Default audio meter overlay to "on" 2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g 
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
 2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing 
fixing avatr attachments not being visible when coming out of first person
 2018-05-02 18:50:41 -07:00
Zach Fox
56ba59681a Fix MS14741, allowing uninstall of apps whose scripts are no longer running 2018-05-02 16:12:55 -07:00
Zach Fox
900486ed01 Don't use entity scripting interface 2018-05-02 16:03:50 -07:00
NissimHadar
5cbb8674ec Use default parameter for saveSnapshot(). 2018-05-02 14:45:28 -07:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw 
Added items to the developer menu for debugging physics
 2018-05-02 14:25:09 -07:00
NissimHadar
83846aec04 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 14:17:22 -07:00
NissimHadar
e0b16dfe03 Allow use of --url command line argument in test mode. 2018-05-02 14:17:01 -07:00
Cristian Luis Duarte
843aa9e261 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-02 18:06:56 -03:00
Cristian Luis Duarte
c460f8bf1e Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-05-02 16:35:13 -03:00
Gabriel Calero
4dce62cc2e Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
Zach Fox
57993cfdd0 Cleanup 2018-05-02 11:22:42 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534 Added items to the developer menu for debugging physics 
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:

  * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
  * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
  * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
  * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
  * Show Bullet Constraint Limits - will render the joint limits for each constraint.
 2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Zach Fox
ecae3ceb9d Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements 2018-05-02 10:05:15 -07:00
NissimHadar
3edfdae6b2 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-02 08:35:59 -07:00
David Rowe
3febdcb141 Miscellaneous JSDoc tidying 2018-05-02 16:15:35 +12:00
Clement
a283d28686 Send number of frustums in packet 2018-05-01 18:03:21 -07:00