Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 23:35:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
66176 commits 75 branches 59 tags 1.2 GiB
Commit graph

66176 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
c4b46d0a5f
Merge pull request #12719 from Atlante45/fix/ess-method-call 
Fix ESS remote method calls for connect only users
 2018-03-29 10:07:44 -07:00
SamGondelman
afe39aba46 fix octal code char issue 2018-03-29 10:05:08 -07:00
Dante Ruiz
0bdf26faaf minimize diff 2018-03-29 09:29:01 -07:00
Dante Ruiz
8cdb59413d fix-qml-confict 2018-03-29 09:26:05 -07:00
Stephen Birarda
35ee1bec09 fix cmake changes for script copy for dev builds 2018-03-28 14:56:53 -07:00
Clement
cb07fc47dc Fix ESS remote method calls for connect only users 2018-03-28 14:01:03 -07:00
John Conklin II
d59a721f16
Merge pull request #12724 from sethalves/fix-entity-import 
fix entity importing
 2018-03-28 09:18:20 -07:00
Brad Davis
9be162de95 Synchronously shut down QML rendering threads 2018-03-28 09:13:46 -07:00
Brad Davis
aacfe92751 Don't trigger crashes from timers while waiting for some operation on exit 2018-03-28 09:09:56 -07:00
Seth Alves
bb101956a6 fix entity importing 2018-03-27 18:25:43 -07:00
Brad Davis
29106fbbbe Prevent potential double delete of QML overlays 2018-03-27 14:18:19 -07:00
Brad Davis
eb20181b60 Shut down the overlay interface on exit 2018-03-27 14:18:01 -07:00
John Conklin II
0862f345fe
Merge pull request #12717 from sethalves/workaround-dialog-crash 
fix -- work around asset-upload dialog crash
 2018-03-27 13:35:50 -07:00
John Conklin II
7c505a0b85
Merge pull request #12711 from sethalves/serverless-tutorial-rc66 
Serverless tutorial rc66
 2018-03-27 11:17:07 -07:00
Seth Alves
4f7d856a1c don't free dialogs to avoid crash in setKeyboardRaised 2018-03-27 09:28:55 -07:00
John Conklin II
3e23ad4900
Merge pull request #12709 from zfox23/RC66_commerce_fixCheckoutInfiniteLoad 
RC66: Fix infinite loading when authing wallet during Checkout
 2018-03-26 14:33:57 -07:00
Seth Alves
60ed033667 new content md5 2018-03-26 14:33:08 -07:00
Ryan Huffman
d01a58517f Fix serverless content not using correct directories 2018-03-26 14:32:52 -07:00
Seth Alves
6948de7e24 default to serverless tutorial 2018-03-26 14:32:40 -07:00
Stephen Birarda
787947b6a8 add a default tutorial json for dev interface 2018-03-26 14:32:26 -07:00
Stephen Birarda
b52a877d8d optionally grab serverless tutorial, on for installers 2018-03-26 14:32:11 -07:00
Zach Fox
a588776b47 Fix infinite loading when authing wallet during Checkout 2018-03-26 13:19:40 -07:00
Sam Gondelman
11f5e7812b
Merge pull request #12702 from SamGondelman/android 
Android: Fix tonemapping
 2018-03-23 17:43:57 -07:00
SamGondelman
a19f71e759 fix tonemapping on android 2018-03-23 14:16:47 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
Ryan Huffman
e90c051744
Merge pull request #11872 from huffman/feat/version-wo 
Add asset server baking versioning
 2018-03-23 08:27:37 -07:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics 
Wrap text in query dialogs. Add right margins for input field and but…
 2018-03-22 17:56:47 -07:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807 
JSDoc that an entity's clientOnly property can be set at entity creation
 2018-03-22 17:55:45 -07:00
Ryan Huffman
d2ae30f8e0 Disable support for baking scripts in the Asset Server 2018-03-22 16:22:59 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1 
Commerce: Item Updates!
 2018-03-22 15:40:22 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
John Conklin II
6d9892856d
Merge pull request #12510 from sethalves/serverless-domains 
Serverless domains
 2018-03-22 14:06:49 -07:00
Stephen Birarda
1d9b00d7bb
Merge pull request #12685 from huffman/fix/backup-download-timeout 
Update content backup downloads to be asynchronous
 2018-03-22 13:45:49 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix 
Lexer code has confusion between strings and chars
 2018-03-22 12:03:47 -07:00
Sam Gondelman
bbded2215d
Merge pull request #12665 from gcalero/android_bottombar_resize 
Android - Resize bottombar after window size changes (to always fill …
 2018-03-22 11:15:02 -07:00
John Conklin II
b6920a503c
Merge pull request #12618 from vladest/hificonstants_as_object 
Hificonstants as object
 2018-03-22 11:03:05 -07:00
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context 
Fix/current context
 2018-03-22 10:54:34 -07:00
Ryan Huffman
fdeae4c11a Fix missing semicolon in content.js 2018-03-22 10:24:29 -07:00
Ryan Huffman
5485f60677 Add removal of old consolidated backups 2018-03-22 10:23:18 -07:00
Seth Alves
22f5752316
Merge pull request #27 from druiz17/serverless-domains 
adding content to resources
 2018-03-22 09:24:16 -07:00
Dante Ruiz
cea0f98aae reverting files 2018-03-22 09:20:27 -07:00
Dante Ruiz
14061a88d3 removing files 2018-03-22 09:07:24 -07:00
Dante Ruiz
f5a954d08e Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-22 09:06:42 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Simon Walton
10f3032746 Compare QString w/ char*, not char 2018-03-21 23:09:46 -07:00
Seth Alves
6c1d713968 review 2018-03-21 19:21:57 -07:00
Seth Alves
b551b144a7 remove unneeded setIsConnected call 2018-03-21 19:15:27 -07:00
Seth Alves
ed0778a68a remove unused json file 2018-03-21 17:07:31 -07:00
Seth Alves
4f20a87c6d review 2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00