Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-14 14:46:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66534 commits 6 branches 1 tag 1.1 GiB
Commit graph

66534 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
34426bb033 FIxing the compilation on windows with math constants 2018-04-06 12:17:51 -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
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
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
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
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
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
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
John Conklin II
c8a0561e20
Merge pull request #12791 from sethalves/always-use-serverless-tutorial 
on first run, send user to serverless tutorial rather than checking for local sandbox
 2018-04-05 07:28:43 -07:00
NissimHadar
2fbe6f9393 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 18:39:05 -07:00
samcake
78053b8b48 Refix the normal map case foro translucents 2018-04-04 18:33:27 -07:00
Seth Alves
4b0d338e57 on first run, send user to serverless tutorial rather than checking for a local sandbox 2018-04-04 18:00:11 -07:00
NissimHadar
99a4bd65a0 Corrected message to user. 
Changed ::ReadWrite to ::WriteOnly when creating MD file.
 2018-04-04 17:12:46 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix 
Fix Y arrow translation handle issues
 2018-04-04 13:46:31 -07:00
Sam Gateau
4870ce1d76
Merge pull request #12771 from NissimHadar/addMDtoAutoTester 
Add .md creation to autoTester
 2018-04-04 12:30:11 -07:00
John Conklin II
c3cad62bff
Merge pull request #12774 from howard-stearns/RC66-commerce-workaround-for-broken-qt5.10 
Rc66 commerce workaround for broken qt5.10
 2018-04-04 11:39:44 -07:00
NissimHadar
235996911a Fixed gcc warning. 2018-04-04 11:38:14 -07:00
NissimHadar
bb0d4a66b6 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 11:03:56 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one 
Remove notifications and print outs when degrading LOD
 2018-04-04 10:35:05 -07:00
NissimHadar
7a6b071e46 Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester 2018-04-04 10:20:35 -07:00
Howard Stearns
3a428bc44f
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 
Fix 'Private' HMD preview texture enable/disable...again
 2018-04-04 10:03:18 -07:00
Zach Fox
752246d950
Merge pull request #12760 from zfox23/inspection_rightClickTweaking 
Inspection: Tweak mouse-right-click-to-inspect behavior
 2018-04-04 09:32:29 -07:00
Zach Fox
b641f87792
Merge pull request #12778 from zfox23/MS13792 
Prevent Context Overlay from flashing when briefly hovering over certified entity
 2018-04-04 09:31:33 -07:00