Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 04:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65359 commits 71 branches 56 tags 1.2 GiB
Commit graph

65359 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
806e077387
Merge pull request #12609 from Atlante45/new-master 
Merge RC65 back into master
 2018-03-09 08:47:12 -08:00
Atlante45
69fb830480 Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-08 17:23:17 -08:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes 
tablet scale and position changes
 2018-03-08 15:36:06 -08:00
John Conklin II
fe0d354d26
Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys 
RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
 2018-03-08 15:30:19 -08:00
NissimHadar
6026044526
Merge pull request #12558 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-03-08 15:04:19 -08:00
John Conklin II
260715d616
Merge pull request #12580 from elisa-lj11/RC65-blocks-image-bug 
Fixed blocks importer textures being interpreted as image entities
 2018-03-08 13:33:41 -08:00
Zach Fox
22f18dbf56 Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd 2018-03-08 13:12:13 -08:00
John Conklin II
c5514f5120
Merge pull request #12570 from dback2/RC65 
Redo entity scale handles to fix scaling into avatars causing undesirable physics/dimensions
 2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-08 12:16:36 -08:00
NissimHadar
a703b5a3b5 Added check to correct crashing when selecting ambient occlusion from menu. 2018-03-08 12:15:26 -08:00
NissimHadar
d1b87b3116 Added missing avatar shadows. 2018-03-08 12:14:42 -08:00
Zach Fox
a479439b23
Merge pull request #12572 from zfox23/sendMoney_connectionInstructions 
Show Connection instructions in Send Money when 0 connections
 2018-03-08 11:20:23 -08:00
Brad Hefta-Gaub
d2e264ab32
Merge pull request #12583 from samcake/punk 
Fix Local lights not showing anymore
 2018-03-08 10:31:58 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android 
Android Tip
 2018-03-08 10:18:35 -08:00
John Conklin II
1341774450
Merge pull request #12482 from SimonWalton-HiFi/declare-metatype 
Add a Q_DECLARE_METATYPE in TextureCache.
 2018-03-08 09:37:06 -08:00
John Conklin II
3e9e55c3db
Merge pull request #12591 from zfox23/RC65_fixUncertifiedPurchases 
Don't default unknown Marketplace item types to 'Entity'
 2018-03-08 09:36:28 -08:00
David Back
554c37d14b removed undefined event checks in scaling 2018-03-07 19:34:08 -08:00
David Back
9681f0eb77 restore old scale math, disable avatar collisions while scaling 2018-03-07 18:20:26 -08:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
Zach Fox
a0eb7e0712 Don't default unknown Marketplace item types to 'Entity' 2018-03-07 15:01:12 -08:00
John Conklin II
fcb2f358f8
Merge pull request #12579 from SimonWalton-HiFi/RC65 
Fix for avatar record only replaying once
 2018-03-07 14:55:03 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials 
Material reflection
 2018-03-07 14:29:31 -08:00
Elisa Lupin-Jimenez
2987c90f96 fixed syntax for ubuntu 2018-03-07 13:48:35 -08:00
SamGondelman
0aacdcd558 docs 2018-03-07 13:34:48 -08:00
Elisa Lupin-Jimenez
9ae2da7e4b fixed logic for texture files/non-models 2018-03-07 13:18:36 -08:00
John Conklin II
7381bb0d7e
Merge pull request #12447 from birarda/feat/oven-no-dock-bounce 
use QCoreApplication for Oven when headless version is used
 2018-03-07 12:56:25 -08:00
John Conklin II
e0a11271bf
Merge pull request #12573 from birarda/bug/domain-settings-metaverse 
fix for getSetting QVariant ref in DomainServer
 2018-03-07 12:11:45 -08:00
John Conklin II
84c9016e2a
Merge pull request #12548 from Atlante45/fix/ds-consolidate-crash 
Prevent crash during long backup web requests
 2018-03-07 12:11:04 -08:00
David Back
2047437893 Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65 2018-03-07 10:30:18 -08:00
Elisa Lupin-Jimenez
28589094c2 hopefully fixed mac/ubuntu builds 2018-03-07 10:18:40 -08:00
Dante Ruiz
2d448d7208 tablet scale and position changes 2018-03-07 10:02:35 -08:00
Brad Hefta-Gaub
9595049e01
Merge pull request #12582 from thoys/fix/JSDOCtypo 
fix JSDOC typo rule -> role
 2018-03-07 07:50:07 -08:00
Bradley Austin Davis
3f762c7900
Merge pull request #12519 from gcalero/android_experimental_joystick_fixed 
Android - Make the virtual pad (joystick) position fixed. Change assets.
 2018-03-06 20:06:35 -08:00
Bradley Austin Davis
36d02389d9
Merge pull request #12499 from gcalero/android_bubble_fix 
Set bubble default state off for android.
 2018-03-06 20:04:59 -08:00
Elisa Lupin-Jimenez
c6e5f4c9c8 zip file drags don't auto add model textures 2018-03-06 19:24:09 -08:00
samcake
923c81ae28 Swap order of the ZoneRendererJob with DrawLocalLights to fix the local lights 2018-03-06 17:38:27 -08:00
Thijs Wenker
866bec0b34 rule -> role 2018-03-07 02:36:07 +01:00
Cristian Luis Duarte
4f0cecefc3 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:03:39 -03:00
Cristian Luis Duarte
bde2ba9272 Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed 2018-03-06 22:02:23 -03:00
Gabriel Calero
243e79df4a Fix merge of radar.js 2018-03-06 21:59:59 -03:00
Elisa Lupin-Jimenez
251e4a3127 Fixed blocks importer textures being interpreted as image entities 2018-03-06 16:44:23 -08:00
Simon Walton
17c12fde9c Fix for HandshakeRequest logic 2018-03-06 16:32:04 -08:00
NissimHadar
d72f46ec3e Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 16:24:53 -08:00
NissimHadar
05e9aa52c9 Moved can-cast-shadow checkbox to behaviour section. 2018-03-06 16:22:54 -08:00
Zach Fox
04a230c20f
Merge pull request #12491 from ElderOrb/FB12523 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
 2018-03-06 16:19:39 -08:00
Clément Brisset
fdc054c86b
Merge pull request #12577 from Atlante45/new-master 
RC65 merge back into master
 2018-03-06 16:17:27 -08:00
Atlante45
edeed95ccc Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master 2018-03-06 15:33:12 -08:00
NissimHadar
dbf1be5de3 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-06 15:22:40 -08:00
David Back
47e8e26255 CR indent fixes 2018-03-06 14:05:24 -08:00
Gabriel Calero
a2327ea0cf Merge branch 'android' into android_bubble_fix 2018-03-06 19:03:53 -03:00