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

57937 commits

This branch
This branch
All branches
Author SHA1 Message Date
anshuman64
e11388f7f7 Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal 
Add a "dominant hand changed" signal
 2017-07-28 15:17:50 -07:00
Elisa Lupin-Jimenez
25d4d4dc93 Clara download working again, still can drag in Blocks zip 2017-07-28 15:13:24 -07:00
Stephen Birarda
ce35b83f61 make Paths available to desktop and tablet QML context 2017-07-28 15:13:23 -07:00
Brad Hefta-Gaub
dd310b8661 Merge pull request #11076 from birarda/bug/blank-create-tabs 
fix blank create tabs in HMD
 2017-07-28 15:07:17 -07:00
Brad Davis
d42052a299 Fix overlay event handling thread issues 2017-07-28 14:56:21 -07:00
Stephen Birarda
17dd028ec7 make Paths available to desktop and tablet QML context 2017-07-28 14:23:18 -07:00
Brad Hefta-Gaub
c200d40862 Merge pull request #11063 from nimisha20/patch-2 
Updating with the latest dependency info
 2017-07-28 13:30:28 -07:00
Chris Collins
9ec45a414a Merge pull request #11074 from highfidelity/RC-49-591-HOTFIX 
Build 49.1 Hotfix: Crash in overlays and Oculus HMD
 2017-07-28 12:59:55 -07:00
LaShonda Hopper
cc4fbc97cd [WL21389] PR1 Update based on code review discussion & feedback (details below). 
* Removed some left overs from prior approach.
* Moved _collisionShapeType & getShapeType override from ShapeEntityItem to
  RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903)
* Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID
** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909

Note(s):
* Retested and the cylinder behaves as expected along with the Box & Sphere shapes
  save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048)
* Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to
  ellipsoid behavior given default change.

Changes Committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.h
	modified:   libraries/entities/src/ShapeEntityItem.cpp
	modified:   libraries/entities/src/ShapeEntityItem.h
	modified:   libraries/shared/src/ShapeInfo.cpp
 2017-07-28 15:59:17 -04:00
anshuman64
defc76c9cf Merge pull request #11075 from jherico/tablet_scripting_crash 
Fix tablet button crash
 2017-07-28 11:57:27 -07:00
Brad Davis
aaff098e35 Fix tablet button crash 2017-07-28 11:32:05 -07:00
Brad Davis
3d0c13915a Fix tablet button crash 2017-07-28 11:20:57 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi 
Midi support for Entities
 2017-07-28 10:51:43 -07:00
Elisa Lupin-Jimenez
7ce31f3f69 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-07-28 10:21:11 -07:00
Elisa Lupin-Jimenez
fcaebda04c troubleshooting Blocks injection 2017-07-28 10:21:03 -07:00
Brad Davis
deca748d47 Prevent deadlocks from Overlays update logic recursing into other Overlays calls 2017-07-28 09:51:39 -07:00
utkarshgautamnyu
f407bf6f5a Merge pull request #11064 from highfidelity/bug/6513 
Enabled multiple selection and deletion in Asset Browser
 2017-07-28 09:46:34 -07:00
Chris Collins
20513ccf83 Merge pull request #11069 from jherico/overlay_deadlocks 
Prevent deadlocks from Overlays update logic recursing into other Overlays calls
 2017-07-28 09:25:26 -07:00
Andrew Meadows
3ec9640ea1 fix calculation of walk motor for HMD 2017-07-28 09:22:47 -07:00
vladest
45934cb53e Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode 2017-07-28 18:04:29 +02:00
Chris Collins
ac8e8dd9d5 Merge pull request #10987 from SamGondelman/hmd59Crash2 
Fix crash when putting on HMD for Qt 5.9
 2017-07-28 09:00:18 -07:00
Brad Hefta-Gaub
3e1174a4ca Merge pull request #11070 from kencooke/master 
Merge pull request #10987 from SamGondelman/hmd59Crash2
 2017-07-28 08:27:28 -07:00
Chris Collins
4684b388c7 Merge pull request #10987 from SamGondelman/hmd59Crash2 
Fix crash when putting on HMD for Qt 5.9
 2017-07-28 07:41:07 -07:00
Brad Davis
bb57504498 Prevent deadlocks from Overlays update logic recursing into other Overlays calls 2017-07-27 19:39:22 -07:00
David Rowe
c1d179eba1 Add "dominant hand changed" signal 2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube 
update EntityItem bounding cube when on changed dimensions
 2017-07-27 18:21:06 -07:00
Anthony J. Thibault
6c2b6674bb load and save shoulderConfig to settings. 2017-07-27 17:33:54 -07:00
Andrew Meadows
6b386000db initialize 'success' and use for return value 2017-07-27 17:11:13 -07:00
nimisha20
55e23a3106 Update BUILD.md 2017-07-27 16:57:08 -07:00
rabelaiis
119b10886f Merge branch 'master' of git://github.com/highfidelity/hifi into 21479 2017-07-28 06:29:10 +07:00
rabelaiis
8b7a29c3f3 remove putils reference 2017-07-28 06:22:29 +07:00
burtsloane
e557f759b5 Update Midi.cpp 2017-07-27 16:17:23 -07:00
Chris Collins
042c32a6b3 Merge pull request #11047 from highfidelity/RC-49-591 
Beta Release 49 - Includes up to Developer Release 6915
 2017-07-27 16:02:58 -07:00
utkarshgautamnyu
1beec26003 Update TabletAssetServer.qml 2017-07-27 15:55:55 -07:00
utkarshgautamnyu
a6a4bd5923 Update AssetServer.qml 2017-07-27 15:55:30 -07:00
utkarshgautamnyu
07fc9a6dc3 Indentation fixes 2017-07-27 14:53:49 -07:00
utkarshgautamnyu
4680911264 Enabled multiple selection and multiple deletion in asset browser 2017-07-27 14:47:30 -07:00
jmo
003c483ec6 stray tabs changed to spaces, and long comment split to multiple lines 2017-07-27 15:21:58 -06:00
Elisa Lupin-Jimenez
d4a7e9188a Removed extraneous print statements 2017-07-27 13:33:53 -07:00
nimisha20
f7add1f6c6 Updating with the latest dependency info 2017-07-27 13:17:42 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
Brad Hefta-Gaub
3aca1e1d84 Merge pull request #11004 from highfidelity/express_custom_install 
Added a page in installer for express/custom installation
 2017-07-27 13:14:56 -07:00
Brad Davis
7e474202bd Move hosting for quazip back to hifi S3 2017-07-27 13:02:43 -07:00
Brad Davis
90a6f03c48 Fix warnings in Qt 59 / VS 2017 build 2017-07-27 13:02:22 -07:00
Anthony J. Thibault
bcb4cc32d2 another clang error fix 2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7 clang build error fix 2017-07-27 10:08:35 -07:00
Elisa Lupin-Jimenez
1c640cf37b Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-07-27 10:00:17 -07:00
anshuman64
bcb819206b Merge pull request #11037 from sethalves/bug-camera-mode-mods 
use Qt menu hotkeys to drive camera-mode changes
 2017-07-27 09:44:53 -07:00
Anthony J. Thibault
8f5c41af2d changed _controllerPoseMap from unordered_map to map 2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00