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
Seth Alves
2319006868 Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash 
Fix for crash when attempting to teleport while avatar was loading
 2017-08-02 10:00:13 -07:00
David Kelly
96500d897c Merge pull request #11057 from zfox23/contextOverlays_renderMOde 
Context Overlays - new render stuff. PREPARE FOR EDGE HIGHLIGHTING
 2017-08-02 09:28:53 -07:00
Dante Ruiz
8d69cd8999 Merge branch 'master' of github.com:highfidelity/hifi into bug-blank-tablet-switch 2017-08-02 16:36:17 +01:00
Dante Ruiz
05f1caab01 better solution to help and blank tablet issues 2017-08-02 16:35:58 +01:00
vladest
2d4396ac8e Merge branch 'master' into fix_toolbar_apps_switch 2017-08-02 16:34:49 +02:00
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02:00
Seth Alves
baad9f1af4 Merge pull request #11097 from druiz17/bug-entity-crash2 
Lock the script engine in EntityEditPacketSender
 2017-08-02 06:40:41 -07:00
Anthony J. Thibault
1b6feb63c8 Fix for crash when attempting to teleport while avatar was loading 
The fix had two parts.
  * Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
  * Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
 2017-08-01 18:40:43 -07:00
Melissa Brown
c83caaacf5 Merge pull request #11062 from rabelaiis/21479 
Make Xylophone mallets equipable, make the mallets provide haptic fee…
 2017-08-01 17:05:23 -07:00
David Kelly
588afaaa85 unused variable... 2017-08-01 16:59:42 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
David Kelly
762b409814 unused variable 2017-08-01 16:20:33 -07:00
David Kelly
479d6abc58 Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 16:18:20 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
Dante Ruiz
cca29e849b fix issue of tablet begin blank when switching between HMD and Desktop mode 2017-08-01 23:18:42 +01:00
Seth Alves
b9456ab7b6 Merge pull request #11081 from Menithal/21464 
Fixed Particle Editor Update event
 2017-08-01 15:11:33 -07:00
Seth Alves
184c3d855d Merge pull request #11061 from TurnMeUp-OG/21470 
Fix tablet focus issue when property menu is open and field is selected
 2017-08-01 15:10:26 -07:00
anshuman64
9bf4977e09 Merge pull request #11096 from humbletim/21487 
WL 21487: Fix Camera behavior in Mirror mode
 2017-08-01 14:59:06 -07:00
Brad Hefta-Gaub
0f374b5aa0 Merge pull request #11094 from marko8904/installer/nsis-compression 
switching from LZMA (default) to BZIP2 for NSIS compression
 2017-08-01 12:34:18 -07:00
Dante Ruiz
c22e08f3e8 loacked script engine in EntityEditPacketSender 2017-08-01 19:58:23 +01:00
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
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