Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 00:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57853 commits 25 branches 0 tags 1.1 GiB
Commit graph

57853 commits

This branch
This branch
All branches
Author SHA1 Message Date
anshuman64
97b4fd4032 Merge pull request #11071 from vladest/fix_menu_landscape 
Fix Landscape mode, when menu pushed in Create mode
 2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
rabelaiis
f1d7ef76e7 Add the mallet js file 2017-08-01 23:41:16 +07:00
Scromie@turnmeupgames.com
9b28d546e0 Test plan 2017-08-01 12:32:27 +03:00
Brad Davis
bea91be521 Fix for potential crash in JS console 2017-07-31 17:50:30 -07:00
Marko Kudjerski
6855dcbacf use bzip2 compression only for PR builds (so that we internally benefit from faster builds) 2017-07-31 17:17:11 -07:00
Marko Kudjerski
ae31df426c remove vcredist_x64 after installation 2017-07-31 16:52:38 -07:00
Marko Kudjerski
46966b1132 switching from LZMA (default) to BZIP2 for NSIS compression 2017-07-31 16:19:34 -07:00
David Kelly
e630e2f7e3 Merge pull request #11090 from davidkelly/dk/contextOverlaySetting 
turn ContextOverlays completely off/on
 2017-07-31 15:26:22 -07:00
Marko Kudjerski
de97dfc9d7 install the bundled vcredist_x64 instead of relying on DLLs being setup by cmake directly in the install folder 2017-07-31 15:25:02 -07:00
David Kelly
b371c875c4 undo tab mapping to bring up tablet, for now 2017-07-31 14:46:26 -07:00
LaShonda Hopper
0b79809f54 [WL21389] PR1 Feedback: Small change missed last commit (details below). 
Until they're properly implemented, default the hedrons and polygons to
SHAPE_TYPE_ELLIPSOID within RenderableShapeEntity::computeShapeInfo.

Changes committed:
	modified:   libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
 2017-07-31 17:08:30 -04:00
David Kelly
43c8079f03 temporary inspectionMode setting to turn ContextOverlays completely off/on 2017-07-31 13:55:43 -07:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Menithal
6020154867 Removed some whitespaces to trigger new build 2017-07-31 22:49:11 +03:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
Chris Collins
5bdaa4daa1 Merge pull request #11087 from jherico/crash_null_entity_element 
Fix potential nullptr access in EntityTreeElement
 2017-07-31 09:15:52 -07:00
Liv Erickson
ed9ea17917 remove semi-colon 2017-07-31 08:02:18 -07:00
vladest
e30e0b1a5f Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption 2017-07-31 16:45:21 +02:00
rabelaiis
1f6b92a519 Vibrate only the controller that hits the key and decrease timeout so that the xylophone can be played faster 2017-07-31 17:27:49 +07:00
Matti Lahtinen
5fab6c37a3 Removed stray variable test 2017-07-31 08:56:04 +03:00
humbletim
b5f5a037f0 remove "grabbable: true" property from attachment Overlays 2017-07-30 16:25:56 -04:00
vladest
751f12df89 Merge branch 'master' into fix_opened_running_scripts 2017-07-30 19:25:55 +02:00
vladest
bb7110d81b Desktop Running scripts window now closed and as soon as Tablet opened, it will show Running Script. TODO: make Tablet opens automatically 2017-07-30 19:22:54 +02:00
Brad Hefta-Gaub
7785c11ee8 Merge pull request #11080 from jherico/fix_web_touch_emulation 
Fix web touch emulation
 2017-07-30 09:14:54 -07:00
Brad Hefta-Gaub
c88e5d1053 Merge pull request #11084 from jherico/fix_paths_warning 
Fix log warnings from non-notifiable properties
 2017-07-30 08:51:47 -07:00
Brad Davis
861b33a845 Fix potential nullptr access in EntityTreeElement 2017-07-29 17:22:25 -07:00
Brad Hefta-Gaub
3bd2464a01 Merge pull request #11086 from highfidelity/revert-11079-disable_web_touch_emulation 
Revert "Disable touch event emulation for tablet until we fix crash"
 2017-07-29 13:11:32 -07:00
Brad Hefta-Gaub
af2452eb64 Revert "Disable touch event emulation for tablet until we fix crash" 2017-07-29 13:06:07 -07:00
Brad Davis
17b06e8e12 Fix log warnings from non-notifiable properties 2017-07-29 11:54:39 -07:00
Brad Davis
7d18d2e017 Restore corrected touch event simulation 2017-07-29 08:51:51 -07:00
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