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

62938 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruce Brown
a1c3ad360f Merge branch 'master' of https://github.com/highfidelity/hifi 2018-01-04 18:42:52 -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
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
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
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
Bruce Brown
dfe31bc791
Add files via upload 2018-01-02 11:52:12 -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
Bruce Brown
1d79a21655
Add files via upload 2017-12-29 15:51:11 -08:00
Atlante45
aec5ab5921 CR 2017-12-29 12:46:52 -08:00
Atlante45
06e2f394f9 Update Octree server stats to handle single server 2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5 Remove legacy jurisdiction code 2017-12-29 12:46:52 -08:00
Bruce Brown
8d602e3669
Add files via upload 2017-12-29 12:43:59 -08:00
Bruce Brown
6d0cac83c4
Add files via upload 2017-12-29 12:28:31 -08:00
Bruce Brown
0eacac60c1
Add files via upload 
add more mmidi message types to be exposed to javascript
 2017-12-29 11:05:37 -08:00
Bruce Brown
31238e2d66
Update Midi.cpp 2017-12-29 10:49:51 -08:00
Bruce Brown
b3ac4de1e6
Update Midi.h 2017-12-29 10:45:58 -08:00
Bruce Brown
fa10578293
Add files via upload 2017-12-29 10:40:59 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
vladest
afc3082593 Cleanup. Errors checks 2017-12-28 13:16:51 +01:00
vladest
35fee739c5 Use buttons index 2017-12-27 23:50:15 +01:00
Elisa Lupin-Jimenez
84933131c4 changed api key variable name 2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez
a428eb5b75 added const to several parameters 2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez
01c1032540 fixed constant names, added another URL check 2017-12-27 10:51:58 -08:00
Elisa Lupin-Jimenez
03f06aadf4 keyword filters case insensitive now 2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez
e1b344e36d handles empty json object return 2017-12-26 10:50:10 -08:00
Elisa Lupin-Jimenez
3e10d3b436 Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api 2017-12-26 10:18:51 -08:00
vladest
ffcccacfa5 Selection consistency #2 2017-12-25 23:46:06 +01:00
vladest
ec591c4da0 Merge branch 'master' into tablet_home_paginate 2017-12-25 20:15:26 +01:00
vladest
cb7472c270 Selection consistency #1 2017-12-25 20:14:31 +01:00
Brad Hefta-Gaub
3d02955c5d
Merge pull request #12029 from SamGondelman/webOverlay 
Fix >20 web entities crash
 2017-12-24 17:10:39 -08:00