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

57804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
52bebf621d Merge pull request #11079 from jherico/disable_web_touch_emulation 
Disable touch event emulation for tablet until we fix crash
 2017-07-29 08:28:37 -07:00
Menithal
734330dc06 Fixed Particle Editor Update event 
Particle Editor was agressively refreshing when ever a particle was be
ing up dated

Added a flag check to make sure the particle was always using the latest
version
 2017-07-29 15:48:31 +03:00
vladest
3c9ab36416 Remove already already implemented fix 2017-07-29 12:00:41 +02:00
vladest
0333849aa8 Merge branch 'master' into fix_menu_landscape 2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07:00
Chris Collins
cfd9f8b64e Merge pull request #11077 from jherico/overlay_event_crashes 
Fix overlay event handling thread issues
 2017-07-28 15:56:09 -07:00
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
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
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
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
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
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
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
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
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
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
rabelaiis
dd76c30de5 Make Xylophone mallets equipable, make the mallets provide haptic feedback, fix a closing bracket bug stopping the xylophone from working and clean up code according to coding standards 2017-07-27 17:31:30 +07:00
Chris Collins
ef67029837 Merge pull request #10912 from amvmoody/21374 
WL 21374: Allow lights/particles to be dragged by icon
 2017-07-26 22:07:36 -07:00
Chris Collins
853101fcbc Merge pull request #10928 from 1P-Cusack/21362 
Add point and thumb up gestures to the Vive.
 2017-07-26 22:07:14 -07:00
anshuman64
2e7f62cbb3 Merge pull request #11058 from nimisha20/patch-1 
Update BUILD_WIN.md
 2017-07-26 17:50:33 -07:00
anshuman64
560cccb0df Remove nmake troubleshooting step 2017-07-26 17:01:45 -07:00
anshuman64
081d8fbec4 More changes 2017-07-26 17:00:48 -07:00
nimisha20
c57660c82d Update BUILD_WIN.md 2017-07-26 16:52:00 -07:00
Stephen Birarda
c6e640eba8 Merge pull request #11052 from highfidelity/bug/2157 
added additional collision types to asset browser and new model dialog
 2017-07-26 16:51:52 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4 use ctrl rather than alt to activate camera-mode shortcuts 2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods 2017-07-26 15:54:57 -07:00
Zach Fox
1336a59b6c Stupid bracket 2017-07-26 15:14:58 -07:00