Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-05 07:23:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66842 commits 6 branches 1 tag 1.1 GiB
Commit graph

66842 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
6ffdae0500 disable etc2/eac compression on 4.1 2018-04-06 15:38:29 -07:00
Sam Gateau
f996989a40
Merge pull request #12825 from AndrewMeadows/workload 
only add to physics simulation that when necessary
 2018-04-06 15:29:41 -07:00
Andrew Meadows
2cfb835b56 only add to physics simulation that when necessary 2018-04-06 15:26:33 -07:00
SamGondelman
5503c7909a fix materials not disappearing on deletion in certain cases 2018-04-06 15:18:21 -07:00
Sam Gateau
ae0af3ab62
Merge pull request #12823 from druiz17/fix-selection-api 
fix enableHighlightList  and disableHihglightList function for Selection API
 2018-04-06 15:13:15 -07:00
Cristian Luis Duarte
f556c8d3a7 Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-06 18:02:30 -03:00
Dante Ruiz
00713ab225 fix selection api 2018-04-06 14:00:50 -07:00
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
Alexander Ivash
25a44edfce fix conditional bindings 
note: unfortunately there is no way to understand whether the item was anchored as even not anchored item has some anchors
 2018-04-06 13:22:27 +03:00
Alexander Ivash
3ce00acd16 rebased to the master 2018-04-06 13:22:27 +03:00
Alexander Ivash
c34a6fd000 Fix styling issues - make TabletQueryDialog more consistent with TabletCustomQueryDialog 2018-04-06 13:22:27 +03:00
Alexander Ivash
91488bbbeb align combobox to accept/cancel buttons, otherwise stretch to buttons area 2018-04-06 13:22:22 +03:00
David Rowe
8d25a745f0 Fix Controller.getActions(), .getHardware(), and .getStandard() 2018-04-06 17:21:49 +12:00
SamGondelman
44ea5a2e84 add etc2/eac support 2018-04-05 18:59:22 -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
Alexander Ivash
995d678d20 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 02:51:22 +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
Alexander Ivash
9ec10bbb7e Make keyboard's 'raisedHeight' to include 'mirror text' height 
note: this is necessary becasue all the dialogs rely on 'raisedHeight', so without 'mirror text' they will use wrong keyboard geometry during calculations
 2018-04-06 00:18:19 +03: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