Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 03:07:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
66405 commits 71 branches 56 tags 1.2 GiB
Commit graph

66405 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
60f4c6788f Added creation of tests outline .MD file. 2018-04-10 23:04:56 -07:00
NissimHadar
8e063a600b Added recursive creation of MD files. 2018-04-10 20:16:36 -07:00
Seth Alves
d8f0cfa89a
Merge pull request #12797 from druiz17/update-bake-tool 
update python bake tool
 2018-04-10 10:20:38 -07:00
Sam Gondelman
d781cf43ee
Merge pull request #12775 from Cristo86/android_jump 
Android Control - jump and view sensitivity
 2018-04-09 17:32:57 -07:00
Cristian Luis Duarte
1242446c52 Cleanup controller code 2018-04-09 19:57:55 -03:00
Clément Brisset
c62a701a2d
Merge pull request #12838 from highfidelity/RC66 
RC66 merge back to master
 2018-04-09 13:17:12 -07:00
John Conklin II
4dcab95b40
Merge pull request #12828 from Atlante45/fix/skybox-baking 
Fix skybox baking
 2018-04-09 11:55:51 -07:00
John Conklin II
890a63afb4
Merge pull request #12833 from ElderOrb/FB14015_RC66 
Close 'goto' app on pressing 'forward' / 'backward' buttons
 2018-04-09 11:42:17 -07:00
John Conklin II
d281d7b2cb
Merge pull request #12819 from Atlante45/fix/location-hostname 
Fix location.hostname
 2018-04-09 09:42:41 -07:00
John Conklin II
be3d5d03cc
Merge pull request #12808 from ElderOrb/FB13962_RC66 
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
 2018-04-09 09:42:00 -07:00
Alexander Ivash
faddc556d7 FB14015 - Go To app does not close when selecting forward and back arrows on desktop 2018-04-07 17:57:22 +03:00
Clement
6e7f8a2ef6 Fix value collision for baking version 2018-04-06 17:24:16 -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
Clement
dea5382991 Fix location.hostname 2018-04-06 13:19:07 -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
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
Stephen Birarda
1ff7939735 move file ~ expansion from AddressManager to DomainHandler 2018-04-06 11:05:17 -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
Stephen Birarda
a2250a2a6d write an install info ini file to the installation dir 2018-04-05 18:52:07 -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
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
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
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
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
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
Cristian Luis Duarte
1a967e45a6 Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity 2018-04-04 21:54:12 -03:00
NissimHadar
99a4bd65a0 Corrected message to user. 
Changed ::ReadWrite to ::WriteOnly when creating MD file.
 2018-04-04 17:12:46 -07:00