Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:31:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58369 commits 75 branches 59 tags 1.2 GiB
Commit graph

58369 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Sam Gateau
2a75cde48a Merge pull request #11185 from samcake/blue 
Fixing the graphics setting for Ambient Occlusion
 2017-08-15 09:26:45 -07:00
Sam Gateau
d624413c14 Merge pull request #11189 from SamGondelman/line3DFix 
Fix drawInFront overlays only rendering in left eye
 2017-08-15 09:26:18 -07:00
David Kelly
c08fce967f forgot a warning 2017-08-15 08:58:16 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
Seth Alves
21cef482a5 Merge pull request #11190 from druiz17/fix-table-dialog 
Fixed unable to select items in a TreeView
 2017-08-14 17:05:42 -07:00
David Kelly
ef5863d169 warnings squashed 2017-08-14 16:24:50 -07:00
SamGondelman
194b7d6655 warning 2017-08-14 16:08:07 -07:00
Dante Ruiz
459f2c5cdc fixed tab issue 2017-08-14 16:03:12 -07:00
Dante Ruiz
99617600c4 fix selection issue for TreeView.qml 2017-08-14 15:58:28 -07:00
Zach Fox
823f2fb252 Merge pull request #11181 from cain-kilgore/skybox-changer 
WL 21447 - Create a Skybox Changer
 2017-08-14 15:08:03 -07:00
Zach Fox
ee4a07b10d Merge pull request #11187 from zfox23/context_removeWhenDeleting 
Remove context overlay (if present) when removing entity
 2017-08-14 15:06:20 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Cain Kilgore
e7a4bff705 Made Changes per Review, added js 2017-08-14 22:47:18 +01:00
Anthony Thibault
9af6f2683a Merge pull request #11083 from Menithal/experimental-face-expressions 
Opened up setForceFaceTrackerConnected
 2017-08-14 14:19:08 -07:00
druiz17
97aa92bc44 Merge pull request #11170 from cain-kilgore/web-browser-assets 
Added Assets for Web Browser MP Script
 2017-08-14 13:50:11 -07:00
David Kelly
170d2b186b url encode the base64 signature/key 2017-08-14 13:48:09 -07:00
Olivier Prat
c88082301e Small changes to respect coding rules 2017-08-14 22:43:39 +02:00
Zach Fox
c1d771842d Remove context overlay (if present) when removing entity 2017-08-14 13:37:50 -07:00
David Kelly
803a5c6690 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-14 13:15:04 -07:00
rick@ghostpunch.com
8d248f5ccd Remove the attempt to determine the maximum width of a PolyLineEntity's strokes 
using the _strokeWidths[] array, as the values don't seem to correspond with
reality. Use a flat 0.075M value for the maxium half of a stroke width instead.
 2017-08-14 15:59:21 -04:00
David Kelly
b4b592cc00 one key file with (for now) both public and private keys in there 2017-08-14 12:53:10 -07:00
Zach Fox
a5fc47fc4d Merge pull request #11186 from zfox23/commerce_jsonInventory 
Commerce: Use new JSON inventory format
 2017-08-14 11:59:01 -07:00
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -07:00
samcake
f86f22309b fix render.json 2017-08-14 11:31:40 -07:00
samcake
465e390f7b Redisable spectator cam from desktop 2017-08-14 10:49:08 -07:00
samcake
db1536c521 Reactivate watch dog exit 2017-08-14 10:47:58 -07:00
samcake
05b78b0df0 Just fixing the ao combo box field 2017-08-14 10:46:33 -07:00
Zach Fox
b3b118c5f7 Merge pull request #11180 from zfox23/commerce_useAsynchronous 
Commerce frontend now uses asynchronous API
 2017-08-14 09:58:51 -07:00
druiz17
d5644885fa Merge pull request #11177 from anshuman64/icon-rename 
Correct desktop icon name
 2017-08-14 08:55:17 -07:00
Olivier Prat
358373aeac Base gradient size edition works again on Elements enter domain event 2017-08-14 11:41:01 +02:00
Olivier Prat
92d5a0c552 Fixed non working fade invert parameter 2017-08-14 11:21:47 +02:00
Cain Kilgore
619da8c415 Merge branch 'skybox-changer' of https://github.com/CainFoool/hifi into skybox-changer 2017-08-14 05:12:26 +01:00
Cain Kilgore
28c81534c4 Updated Text at Top 2017-08-14 05:11:53 +01:00
Cain Kilgore
185c8da491 Changed 6 to six, cause wording. No functionality changes. 2017-08-12 18:52:54 +01:00
samcake
ff98dedbb2 Debugging the graphics fields activation 2017-08-11 18:10:44 -07:00
Anthony J. Thibault
cd57c0706a more warning fixes 2017-08-11 17:46:50 -07:00
Cain Kilgore
8c9f3ae977 Skybox Changer PR 2017-08-12 01:35:48 +01:00
Anthony J. Thibault
f72a94e195 warning fixes 2017-08-11 17:28:50 -07:00
David Kelly
f784bc42de Initial cut using RSA keys for now 2017-08-11 16:54:04 -07:00
Zach Fox
0835b7b8e6 Bugfix 2017-08-11 16:36:26 -07:00
Zach Fox
d8e5f7a067 Small improvements 2017-08-11 16:32:35 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
9120e678f1 Use asynchronous commerce API 2017-08-11 16:17:13 -07:00
Howard Stearns
56d57ea160 Merge pull request #11172 from howard-stearns/asynchronous-commerce 
Asynchronous commerce
 2017-08-11 15:55:45 -07:00
howard-stearns
d7f83a2fdf Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 15:53:53 -07:00
Zach Fox
46a33dd01a Merge pull request #11173 from zfox23/commerce_inventory 
Add Inventory to Commerce
 2017-08-11 15:50:06 -07:00
Anshuman Dewangan
3bc185e67c Correct desktop icon name 2017-08-11 15:37:55 -07:00
Anthony J. Thibault
b050d2c4c7 fix case on include for linux 2017-08-11 15:15:43 -07:00
Anthony J. Thibault
9e1218b4a4 Use k-dop collision to prevent hands from entering body. 2017-08-11 14:50:00 -07:00