Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-14 09:49:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72813 commits 17 branches 0 tags 1.1 GiB
Commit graph

72813 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
1c8ce3da9d
Merge pull request #14015 from NissimHadar/addDailyTests 
Add automated daily tests
 2018-10-19 15:07:00 -07:00
Brad Davis
2687c024eb Fix light color / serialization 2018-10-19 14:47:02 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest 
Disable user hand controllers if they are too far away or not moving.
 2018-10-19 14:02:32 -07:00
Sam Gateau
388b31acf7
Merge pull request #14169 from SamGondelman/highlight 
Fix highlight not working after HMD switch
 2018-10-19 11:58:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape 
Move blendshape buffers to render thread
 2018-10-19 11:55:44 -07:00
Brad Hefta-Gaub
7d69951a83
Merge pull request #14241 from gcalero/gradle_memory_properties 
Setup a higher memory limit for android build
 2018-10-19 11:19:05 -07:00
Brad Hefta-Gaub
b281c090e3
Merge pull request #14012 from alexiamandeville/controlImageUpdate 
Adding handshake control to image in Controls Reference
 2018-10-19 11:15:11 -07:00
John Conklin II
9750cc2416
Merge pull request #14173 from sethalves/fix-linux-build 
fix build on clang 7
 2018-10-19 11:13:43 -07:00
John Conklin II
81fbb5a332
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab 
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
 2018-10-19 10:33:14 -07:00
Roxanne Skelly
955f27fee5 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTrayIcons 2018-10-19 09:40:10 -07:00
Flame Soulis
1a883b5a32 Added HifiAbout (used in interstitialPage.js) 2018-10-19 09:04:22 -04:00
Flame Soulis
3307ee7ef7
Merge pull request #2 from highfidelity/master 
10/19/2018 - Update Merge
 2018-10-19 05:09:23 -04:00
NissimHadar
9c16e4ee32 Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-10-18 20:08:06 -07:00
John Conklin II
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth 
Clean up elbow smoothing code
 2018-10-18 19:16:32 -07:00
John Conklin II
7c4733a31d
Merge pull request #14053 from ElderOrb/FB17835 
make extracted from resources avatarbookmarks.json writable
 2018-10-18 18:29:02 -07:00
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix 
More reliable "Create Entities as Grabbable" settings persistence.
 2018-10-18 18:26:48 -07:00
John Conklin II
3210a4ec39
Merge pull request #14109 from zfox23/purchasesNoSnap 
Fix MS18154: Don't snap to cards in My Purchases
 2018-10-18 18:24:23 -07:00
John Conklin II
bbccd0ff73
Merge pull request #14120 from zfox23/MS18609_snapShareBugs 
Fix MS18609: Various Snapshot sharing bugs
 2018-10-18 18:21:23 -07:00
John Conklin II
9ccdf74235
Merge pull request #14179 from roxanneskelly/sysTraySubmenus 
Sys tray submenus
 2018-10-18 17:56:48 -07:00
John Conklin II
86cc612d73
Merge pull request #14185 from howard-stearns/keyboard-vs-submit 
make room for keyboard and help in SendAsset
 2018-10-18 17:53:52 -07:00
John Conklin II
b2e84a8f3b
Merge pull request #14191 from howard-stearns/new-rez-images 
new images for My Purchases rez tutorial
 2018-10-18 17:50:30 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full 
go to error-room when failing to connect to a full domain
 2018-10-18 17:49:35 -07:00
John Conklin II
18df79a8a6
Merge pull request #14211 from amantley/crazylegs 
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
 2018-10-18 17:48:26 -07:00
John Conklin II
addae51976
Merge pull request #14215 from ctrlaltdavid/M19308 
Hide mini tablet immediately upon near grabbing an entity
 2018-10-18 17:47:17 -07:00
John Conklin II
3916b8e9d2
Merge pull request #14224 from roxanneskelly/Case19395Master 
Fix for Case 19395
 2018-10-18 17:24:40 -07:00
NissimHadar
702e09b4bc Added no login option. 2018-10-18 16:43:50 -07:00
NissimHadar
fb0a7274bf Initially disable Installer URL 2018-10-18 16:41:48 -07:00
John Conklin II
1f06c87580
Merge pull request #14096 from Zvork/mipgen 
Added generateTextureMipsWithPipeline function in gpu::Batch
 2018-10-18 16:06:28 -07:00
John Conklin II
40a48777dc
Merge pull request #14231 from ctrlaltdavid/M16205a 
Fix lasers going through tablet to drawInFrontOverlays
 2018-10-18 15:36:29 -07:00
John Conklin II
0e6f4f3a60
Merge pull request #14142 from ctrlaltdavid/M16440 
Fix audio overlay not working while in edit apps
 2018-10-18 15:32:41 -07:00
Gabriel Calero
a9b9f48335 Setup a higher memory limit for android build 2018-10-18 17:20:30 -03:00
Wayne Chen
6cf9608c97 adding fade in and fade outt in interstitial for progress 2018-10-18 13:12:04 -07:00
David Rowe
490c085eb8 Merge branch 'master' into M16440 
# Conflicts:
#	scripts/system/controllers/controllerModules/hudOverlayPointer.js
#	scripts/system/controllers/controllerModules/inVREditMode.js
 2018-10-19 09:06:33 +13:00
David Rowe
9b4c5e1685 Fix OSX/Linux warnings 2018-10-19 08:20:21 +13:00
Alexander Ivash
64f67d5eb7 update imports for utilities / all other qml files found 2018-10-18 22:03:50 +03:00
NissimHadar
4c6185d139 Set the "--no-updater" flag so that the "Update Available" pop-up won't... 2018-10-18 11:51:04 -07:00
NissimHadar
206c14b938 Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-10-18 11:11:21 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
Alexander Ivash
a4987e494a update imports 2018-10-18 21:05:20 +03:00
Wayne Chen
aa8da5ade8 Adding potential fix for showing audio stats - depends on PR#13401 2018-10-18 21:05:20 +03:00
Alexander Ivash
d4286636c8 repurpose qmlscratch into 'controls gallery' launcher 2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853 rename stylues-uit => stylesUit & controls-uit => controlsUit 
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
 2018-10-18 21:05:20 +03:00
Andrew Meadows
6558d539e4 adjust simulation bid priority by props changed 2018-10-18 10:33:02 -07:00
Andrew Meadows
9bfa4a5267 remove unhelpful/wrong TODO comment 2018-10-18 10:33:02 -07:00
Andrew Meadows
1a685d2409 set script-triggerd sim ownership priority correctly 2018-10-18 10:33:02 -07:00
Andrew Meadows
ce81ab1f9d don't edit restricted properties unless sim ownership possible 2018-10-18 10:33:02 -07:00
Andrew Meadows
bb51079284 move some bid-prep logic from EntityMotionState to EntityItem 2018-10-18 10:33:02 -07:00
r3tk0n
90bf723317 Fix unsubscribing from message channel in teardown() 2018-10-18 10:31:39 -07:00
Andrew Meadows
0b34524ba0 minimimze time holding locks on tree in editEntity() 2018-10-18 10:31:27 -07:00
Andrew Meadows
21654ba77c cleanup access to sessionID 2018-10-18 10:31:27 -07:00