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

62994 commits

This branch
This branch
All branches
Author SHA1 Message Date
nissim.hadar
1acf7bae20 Removed reference to BackgroundMode. 2018-01-06 23:24:28 -08:00
nissim.hadar
33cc17a52f Removing unused Background mode. 2018-01-06 02:27:49 -08:00
nissim.hadar
bac3d68ef4 Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-06 01:59:53 -08:00
nissim.hadar
d2ac27f1b8 Code clean-up 2018-01-06 01:48:58 -08:00
nissim.hadar
579aec7118 Only check for zone fields. 2018-01-06 01:37:23 -08:00
Nissim Hadar
d645163294 Fixed gcc warning. 2018-01-05 13:16:02 -08:00
Nissim Hadar
635fd2d0cf Use older C++ version for Ubuntu 2018-01-05 12:48:21 -08:00
Nissim Hadar
3963c0a5a1 Code review improvements. 2018-01-05 12:22:20 -08:00
Nissim Hadar
820d80eaad Reverted auto-tester. 2018-01-05 11:20:20 -08:00
Nissim Hadar
cf7d6a2eab Added correct use of legacy background combo. 2018-01-04 20:30:10 -08:00
Nissim Hadar
033aa11aa2 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2018-01-04 19:48:41 -08:00
Nissim Hadar
c10d2a5461 Added correct use of legacy background combo. 2018-01-04 19:48:25 -08:00
Nissim Hadar
adbc4d0c39 Removed background mode from code (still in the protocol). 2018-01-04 18:23:25 -08:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor 
defang accidental disable of MyAvatar's default motor
 2018-01-04 17:44:22 -08:00
Nissim Hadar
1e2413bade Removed unneeded file. 2018-01-04 16:01:22 -08:00
Nissim Hadar
e797a77262 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	interface/resources/qml/js/Utils.jsc
 2018-01-04 15:58:08 -08:00
Seth Alves
9e8e15d620
Merge pull request #12074 from AndrewMeadows/simulation-ownership 
fix bug preventing simulation ownership on localhost domain
 2018-01-04 15:48:54 -08:00
Andrew Meadows
fbe2dd8a41 remove unnecessary 'virtual' keyword 2018-01-04 14:46:16 -08:00
Andrew Meadows
13538006ec fix bug preventing sim owenrship on local domain 2018-01-04 14:46:16 -08:00
Stephen Birarda
22ced025cd
Merge pull request #12089 from Atlante45/fix/ice-servers 
Add Unused packet type back for ICE servers
 2018-01-04 15:15:27 -07:00
Atlante45
294a7ca3c6 Make sure the protocol signature still changes 2018-01-04 13:15:01 -08:00
Atlante45
d4a239731c Add Unused packet type back for ICE servers 2018-01-04 13:07:02 -08:00
Nissim Hadar
8bd2985f1f Simplified code. 2018-01-04 13:06:28 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener 
Remove legacy jurisdiction code
 2018-01-04 11:52:38 -08:00
Nissim Hadar
e8770ec204 TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light). 2018-01-04 11:30:02 -08:00
Nissim Hadar
5b7ef9a3d3 Minor cleanup. 2018-01-04 09:13:58 -08:00
Ryan Downe Karpf
eada0b1ff7
Merge pull request #11546 from vladest/tablet_home_paginate 
Tablet home paginate
 2018-01-03 18:12:32 -08:00
Ryan Downe Karpf
c1b94693c5
Merge pull request #12061 from druiz17/fix-actions-not-being-deleted 
Fix deleted action not being sent over the network correctly
 2018-01-03 18:11:06 -08:00
Ryan Downe Karpf
5a589350fe
Merge pull request #12077 from ctrlaltdavid/remove-filed 
Remove erroneous "filed" Overlay property
 2018-01-03 18:10:37 -08:00
Zach Fox
eafb198fd7
Merge pull request #12084 from zfox23/commerce_fixSecurityPicChange 
Fix Security Pic Change dialog after QML security changes
 2018-01-03 13:17:55 -08:00
Zach Fox
6f077f3a92 Fix Security Pic Change dialog after QML security changes 2018-01-03 11:28:39 -08:00
Sam Gateau
72503ce8ba
Merge pull request #12064 from SamGondelman/overlayFix 
Fix model overlays not disappearing on visibility change
 2018-01-03 11:08:24 -08:00
Zach Fox
681b5173cd
Merge pull request #12082 from MiladNazeri/Fix-GitIgnore 
Add .jsc and remove duplicate qmlc from ignore, and remove Utils.jsc binary that was created
 2018-01-03 09:34:14 -08:00
Zach Fox
33ae0948bb
Merge pull request #12080 from zfox23/commerce_myPurchasesLink 
Add a link to My Purchases from Wallet Home
 2018-01-02 17:33:02 -08:00
milad
63801ce802 add .jsc, remove duplicate qmlc, and remote Utils.jsc 2018-01-02 17:15:23 -08:00
Zach Fox
917db14879 Add a link to My Purchases from Wallet Home 2018-01-02 15:26:11 -08:00
Zach Fox
d0a3c299c9
Merge pull request #12076 from zfox23/commerce_fixMarketplacesInjectForLocal 
Fix marketplacesInject.js for local Metaverse
 2018-01-02 15:03:36 -08:00
David Rowe
7013f64714 Remove erroneous "filed" Overlay property 2018-01-03 10:37:37 +13:00
Clément Brisset
d6bc41db60
Merge pull request #12075 from highfidelity/stable 
Stable merge back into master
 2018-01-02 13:24:03 -08:00
Zach Fox
47a209dc4c Make things slightly better? 2018-01-02 13:11:00 -08:00
vladest
a84e585679 Merge 2018-01-02 21:49:00 +01:00
Zach Fox
25e76c668b Fix marketplacesInject.js for local Metaverse 2018-01-02 12:22:40 -08:00
Nissim Hadar
f67232e53b Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-02 10:47:26 -08:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api 
Google Poly API
 2018-01-02 10:28:17 -08:00
Nissim Hadar
22c5890812 Rebased. 2018-01-02 09:23:38 -08:00
Nissim Hadar
dad3a0d340 Fixed skybox inheritance. 2018-01-02 09:08:05 -08:00
Nissim Hadar
0764e80996 Corrected behaviour of skybox modes. 2017-12-30 18:19:42 -08:00
Nissim Hadar
fb59da5fb3 Reverted to old version of auto-tester. 2017-12-30 18:19:00 -08:00
Nissim Hadar
beb67bb5c8 Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2017-12-30 16:32:58 -08:00
Nissim Hadar
b68da182fd Merge branch 'QtImageCompare' of https://github.com/NissimHadar/hifi into keylightInheritance 2017-12-30 13:49:01 -08:00