Elisa Lupin-Jimenez
eb1fb1a1e1
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-08-02 08:28:55 -07: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
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
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
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
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
46966b1132
switching from LZMA (default) to BZIP2 for NSIS compression
2017-07-31 16:19:34 -07:00
Menithal
6020154867
Removed some whitespaces to trigger new build
2017-07-31 22:49:11 +03:00
Elisa Lupin-Jimenez
b2161e433c
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-07-31 09:54:21 -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
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
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
Elisa Lupin-Jimenez
25d4d4dc93
Clara download working again, still can drag in Blocks zip
2017-07-28 15:13:24 -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
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
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
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
