Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-16 07:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
a55a30f87f Fix 'Path' label when adding a place name 2017-11-08 14:00:43 -08:00
David Rowe
c5c1ead400 Fix GOTO dialog's connection status and location not always updating 2017-11-09 10:51:21 +13:00
Ryan Huffman
c77942c542 Fix domain settings not showing label when first setting a placename 
This occurs because previously we only created the input elements if you
have a domain id when the page loads. Because you can now have a domain
id assigned after the page initially loads, we need to always create the
input.
 2017-11-08 13:36:03 -08:00
Zach Fox
38fde43009 ...simplify your life 2017-11-08 13:19:47 -08:00
Ryan Huffman
3a9c364837 Fix domain server label not handling spaces correctly 2017-11-08 13:09:42 -08:00
vladest
02625a6e28 Remove script from engine 2017-11-08 21:53:42 +01:00
Zach Fox
7995f50fab Fix seeding 2017-11-08 12:52:53 -08:00
Zach Fox
3190fe1f32 Use keyfilepath instead of cached public keys 2017-11-08 12:30:48 -08:00
Sam Gateau
114a45a089
Merge pull request #11742 from samcake/orange 
Fix avatar attachment tearing
 2017-11-08 12:29:46 -08:00
vladest
6685b74c2a Remove checking of empty model url and add sanity for checking modelUrl field existing 2017-11-08 21:23:50 +01:00
samcake
af1180255e fixes from code review 2017-11-08 11:45:40 -08:00
Ryan Huffman
393b55424f Fix Create-new-domain-id not saving in DS settings 2017-11-08 11:37:22 -08:00
samcake
75ce61c3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-08 11:30:53 -08:00
Zach Fox
72fa0823ba Logic changes 2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc Frontend changes 2017-11-08 10:25:11 -08:00
Zach Fox
bd0c87ddad Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_seedingFrontend 2017-11-08 10:14:59 -08:00
vladest
5e32298183 Rework as script=only solution 2017-11-08 18:43:59 +01:00
Ken Cooke
addcb51ed9 Change slider label from "master gain" to "master volume" 2017-11-08 07:50:35 -08:00
vladest
72c4f5761a Merge branch 'master' into fix_sriptslog_multiply_window 2017-11-08 14:04:09 +01:00
Olivier Prat
350993bef0 Merged with origin 2017-11-08 13:55:38 +01:00
Olivier Prat
bbcb0b2d9b Fixed highlight in stereo mode, including HMD (testing on simulator) 2017-11-08 13:49:18 +01:00
Olivier Prat
f996435ac8 Merge branch 'master' of git://github.com/highfidelity/hifi into highlight 2017-11-08 11:41:21 +01:00
Olivier Prat
39604363ea Optimized performance of bloom by reducing blur resolution and merging some downsampling passes with blur passes 2017-11-08 11:38:20 +01:00
Olivier Prat
91d8435a99 Merge branch 'master' of git://github.com/highfidelity/hifi into bloom 2017-11-08 08:17:55 +01:00
David Rowe
0d21e0be11 Delete old, no longer used file 2017-11-08 17:14:17 +13:00
David Rowe
055470296d Move current location in GOTO dialog and add placeholder text to input 2017-11-08 17:13:40 +13:00
luiscuenca
8c5f97f3d1 More corrections 2017-11-07 20:25:24 -07:00
Sam Gateau
3ef9ce0af6
Merge pull request #11732 from NissimHadar/hazeMaskFix 
Haze mask fix
 2017-11-07 17:37:24 -08:00
luiscuenca
536bf6f81d Corrections 2017-11-07 18:34:33 -07:00
samcake
0718763ed1 Adjust syntax 2017-11-07 17:31:15 -08:00
luiscuenca
ee3900be4f Corrections 2017-11-07 18:26:41 -07:00
David Rowe
ebe5d51ee8 Label models.json.gz paths in server Content tab with operating system 2017-11-08 14:25:10 +13:00
Elisa Lupin-Jimenez
1ceec17405 missed an fbx block 2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez
9a09ffe12f removed old fbx code 2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez
e37010565f changed fileDialog return value to be compatible with musvis 2017-11-07 16:55:07 -08:00
Luis Cuenca
6fb47eef85
Merge branch 'master' into case7587 2017-11-07 17:19:39 -07:00
luiscuenca
332cb48a41 Lasers and teleport scale with avatar 2017-11-07 16:57:55 -07:00
samcake
91030a0057 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-07 15:55:59 -08:00
Atlante45
8a903c8b12 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-11-07 14:26:25 -08:00
Ryan Downe Karpf
071c7154fe
Merge pull request #11715 from highfidelity/RC-58 
RC58
 2017-11-07 14:21:13 -08:00
Seth Alves
0edf056b78
Merge pull request #11755 from MidnightRift/patch-1 
Fix controllerDispatcherUtils file path
 2017-11-07 13:22:18 -08:00
samcake
6481e0f713 Address cauterized cluster matrices issue 2017-11-07 12:52:23 -08:00
Zach Fox
8f54c106f6 Could it be this simple? 2017-11-07 12:12:27 -08:00
Zach Fox
f248eb5518 Change wallet home when 0 transactions 2017-11-07 11:30:09 -08:00
samcake
5ca3113709 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-11-07 10:42:28 -08:00
Elisa Lupin-Jimenez
89a9269982 synced up 2017-11-07 10:37:55 -08:00
Clément Brisset
85efe5265d
Merge pull request #11724 from ctrlaltdavid/21580 
Fix serverScripts not being able to see entities in parent/child tree
 2017-11-07 10:36:20 -08:00
Seth Alves
7c6b5081d6
Merge pull request #11725 from luiscuenca/case8270 
8270 Changing avatars while sitting - restore animations
 2017-11-07 09:55:06 -08:00
Seth Alves
e22926eb89
Merge pull request #11762 from ctrlaltdavid/21594 
Speed up entity list update after deleting entities
 2017-11-07 09:34:47 -08:00
Seth Alves
ce7d0c324b
Merge pull request #11761 from ctrlaltdavid/21593 
Don't move or rotate entities if Alt or Meta keys are pressed
 2017-11-07 09:33:21 -08:00