Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 12:51:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66624 commits 75 branches 59 tags 1.2 GiB
Commit graph

66624 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
02422ba538
Merge pull request #12820 from birarda/bug/store-serverless-with-tilde 
RC66 - move file ~ expansion from AddressManager to DomainHandler
 2018-04-06 13:31:01 -07:00
Andrew Meadows
39fcb762a7 fix compile warning on linux 2018-04-06 13:19:24 -07:00
Clement
dea5382991 Fix location.hostname 2018-04-06 13:19:07 -07:00
Andrew Meadows
c12ae9f3f0
Merge pull request #12821 from samcake/workload 
Workload: FIxing the compilation on windows with math constants
 2018-04-06 13:15:08 -07:00
John Conklin II
fe5e797a24
Merge pull request #12816 from SamGondelman/web66 
RC66: Possible fix for QML texture leak
 2018-04-06 13:08:50 -07:00
samcake
34426bb033 FIxing the compilation on windows with math constants 2018-04-06 12:17:51 -07:00
Cristian Luis Duarte
bd6f0fd59e Make view/rotation control independent of touchUpdate events rate 2018-04-06 16:17:28 -03:00
John Conklin II
f6721d4ad0
Merge pull request #12802 from birarda/client-only-installer-name 
66 fix - installer changes for client only name and clean install
 2018-04-06 11:53:22 -07:00
Zach Fox
0c48ccefa4 Clean up failResponse to make it better 2018-04-06 11:41:17 -07:00
samcake
25dc986be0 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-04-06 11:30:53 -07:00
Sam Gateau
876082713e
Merge pull request #12815 from AndrewMeadows/workload-010 
workload: add/remove entities to physics simulation according to workload boundaries
 2018-04-06 11:30:36 -07:00
Andrew Meadows
a9f5b57681 merge 'master' into 'workload-010' 2018-04-06 11:11:06 -07:00
Andrew Meadows
da48a5af20 fix compile errors and add PhysicsBoundary.cpp file 2018-04-06 11:10:23 -07:00
Stephen Birarda
1ff7939735 move file ~ expansion from AddressManager to DomainHandler 2018-04-06 11:05:17 -07:00
Zach Fox
af5a68b282 Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError 2018-04-06 10:58:32 -07:00
samcake
026e335c1a Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-04-06 10:52:38 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
John Conklin II
c8d109854b
Merge pull request #12800 from huffman/fix/entity-lock 
Remove lock file recovery in entity server
 2018-04-06 10:04:34 -07:00
John Conklin II
55154b670a
Merge pull request #12801 from sethalves/fix-serverless-sharable 
fix -- don't tell steam about serverless domain urls
 2018-04-06 10:04:03 -07:00
John Conklin II
384b0a0f41
Merge pull request #12804 from birarda/new-serverless-tutorial 
update to serverless tutorial with RC66 fixes
 2018-04-06 10:03:03 -07:00
SamGondelman
d38dadaf58 possible fix for qml texture leak 2018-04-06 09:34:00 -07:00
Andrew Meadows
ed1761945c add/remove entities to physics using workload output 2018-04-06 07:22:05 -07:00
Andrew Meadows
b96a4ed4be add Space::getRegion(id) 2018-04-06 07:20:53 -07:00
Stephen Birarda
a2250a2a6d write an install info ini file to the installation dir 2018-04-05 18:52:07 -07:00
Andrew Meadows
89b8ce2b01 merge samcake/workload into AndrewMeadows/workload 2018-04-05 18:07:17 -07:00
samcake
a5ee211dbf Dirty attempt to capture the owner typefor a payload 2018-04-05 18:04:35 -07:00
Stephen Birarda
2e3db99f7e update to serverless tutorial with RC66 fixes 2018-04-05 17:17:00 -07:00
Stephen Birarda
16335a3b4b only remove selected components on clean install, leave wallet 2018-04-05 17:09:38 -07:00
Alexander Ivash
557b7ded66 fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear) 
Signed-off-by: Alexander Ivash <elderorb@gmail.com>
 2018-04-06 03:00:44 +03:00
Andrew Meadows
f26255a936
Merge pull request #12806 from samcake/workload 
Workload: Splitting the creation of the Workload engine from the setup
 2018-04-05 16:16:19 -07:00
samcake
c5b88d55ab Spliting the creation of the Workload engine from the setup and configuration, changing the output from region tracker 2018-04-05 16:05:40 -07:00
Stephen Birarda
55a3dc3a49 make client/server only installers have special naming 2018-04-05 13:55:37 -07:00
Howard Stearns
ad191defb8
Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError 
Prevent Interface from crashing when a Snapshot upload fails
 2018-04-05 13:51:33 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Sam Gateau
c329b8605a
Merge pull request #12798 from AndrewMeadows/workload-009 
workload: stubbed prototype job for feedback to physics
 2018-04-05 13:31:00 -07:00
Zach Fox
ac2721fe6a Logging improvements 2018-04-05 13:04:09 -07:00
Seth Alves
148007435e update comment 2018-04-05 13:01:31 -07:00
Andrew Meadows
8035dde5dd fix Windows warnings 2018-04-05 12:54:43 -07:00
Seth Alves
1de878eb9c fix logic 2018-04-05 12:43:03 -07:00
Seth Alves
81ba875ad2 currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version 2018-04-05 12:39:49 -07:00
Andrew Meadows
4f0980b94b hook up prototype PhysicsBoundary job 2018-04-05 12:11:57 -07:00
Andrew Meadows
d9ab166aac initial PhysicsBoundary job implementation 2018-04-05 12:10:46 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07:00
Ryan Huffman
010356709d Remove lock file recovery in entity server 
* We no longer make backups at the ES, so there is no backup to
  recover from if we crash during persist to disk.
  * When loading the most recent backup we look for files that match our
  backup rules. If we have no backup rules we end up grabbing
  everything.
  * Because we grab everything, we are at risk of grabbing the lock file
  and treating it as a backup. In the case where we crash on persist, we
  end up replacing the models.json.gz file with the lock file (!!).

This commit makes a small change to not do the recovery on startup. In a
future update we will remove the backup-related code on the ES
altogether.
 2018-04-05 11:52:31 -07:00
Zach Fox
8e46ebf83b Prevent Interface from crashing when a Snapshot upload fails 2018-04-05 11:27:26 -07:00
Sam Gateau
c27971eeed
Merge pull request #12792 from NissimHadar/addMDtoAutoTester 
Minor changes to autoTester
 2018-04-05 11:08:14 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003 
cleanup around simulation-ownership
 2018-04-05 10:58:45 -07:00
Dante Ruiz
66f78ea2c7 update bake tool 2018-04-05 10:39:27 -07:00
NissimHadar
b19fcc340d Start test steps from 1 (not from 0). 2018-04-05 10:01:29 -07:00
John Conklin II
3bc764a020
Merge pull request #12793 from samcake/rc66-normalmaps 
RC66: Fixing the shader pipelines used for translucent  with normal maps
 2018-04-05 07:49:35 -07:00