Seth Alves
b66ff19595
prefer-avatar-finger-over-stylus setting now defaults to true
2017-03-15 09:51:30 -08:00
Anthony Thibault
495deba771
Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races
...
Fixes for race conditions in DebugDraw
2017-03-15 10:38:26 -07:00
Seth Alves
c28a027a6f
Merge pull request #9902 from sethalves/tablet-ui
...
Tablet ui
2017-03-15 09:37:42 -08:00
Seth Alves
ec5acf6035
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 09:36:39 -08:00
Seth Alves
dc82895feb
Merge pull request #9870 from Atlante45/fix/js-exceptions
...
Fix JS exception messages formatting
2017-03-15 09:32:04 -08:00
Seth Alves
94e2cd6e68
Merge pull request #9845 from AndrewMeadows/fix-rare-physics-crash
...
fix rare physics crash
2017-03-15 09:30:29 -08:00
Seth Alves
cde7d88c3e
Merge pull request #9900 from sethalves/tablet-ui
...
unmangle merge
2017-03-15 09:04:49 -08:00
Seth Alves
816b0b5cfd
unmangle merge
2017-03-15 09:02:32 -08:00
Seth Alves
c53b0dff93
Merge pull request #9891 from druiz17/tablet-xbox-fix
...
Allow the user to bring up the tablet when a message is open
2017-03-15 08:43:28 -08:00
Seth Alves
96a3e2a6d3
Merge pull request #9898 from ctrlaltdavid/21214
...
Load controller scripts in their own script engine
2017-03-15 08:42:20 -08:00
Seth Alves
563d59bda9
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
...
Tablet ui entity statistics
2017-03-15 08:40:52 -08:00
Seth Alves
df82c30e83
Merge pull request #9892 from hyperlogic/bug-fix/tablet-running-scripts-improvements
...
Tablet Running Scripts dialog fixes
2017-03-15 08:38:40 -08:00
Seth Alves
faa370f797
Merge pull request #9899 from sethalves/tablet-ui
...
Tablet ui
2017-03-15 08:32:29 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Vladyslav Stelmakhovskyi
181c7da51a
Fixed warnings
2017-03-15 14:55:53 +01:00
Seth Alves
7afe091c52
quiet warnings
2017-03-14 19:47:30 -07:00
Seth Alves
0785172398
quiet warnings
2017-03-14 19:01:13 -07:00
David Rowe
cb4bd58381
Load controller scripts in their own script engine
2017-03-15 14:31:13 +13:00
Seth Alves
08ad56d254
quiet warnings
2017-03-14 18:05:53 -07:00
Seth Alves
40b87171a9
quiet warnings
2017-03-14 17:49:39 -07:00
Zach Pomerantz
e6fbdf8f06
add isNoiseGateEnabled to Agent
2017-03-15 00:15:49 +00:00
Zach Pomerantz
b1e5e43faa
mv AudioNoiseGate to audio
2017-03-15 00:15:33 +00:00
Atlante45
a9658ce9fb
Revert "Trivial PR to trigger build"
...
This reverts commit a0befa7f95
2017-03-14 17:15:23 -07:00
Zach Pomerantz
f43706dfe1
clean AudioNoiseGate
2017-03-15 00:14:55 +00:00
Zach Pomerantz
0abcda86a8
mv AudioNoiseGate to audio
2017-03-15 00:14:55 +00:00
Brad Hefta-Gaub
a38ab4ff80
Merge pull request #9884 from Atlante45/old-stable
...
Merge Stable back into Master.
2017-03-14 16:59:41 -07:00
Seth Alves
3f142b7290
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-03-14 16:41:39 -07:00
Dante Ruiz
45829574c2
Allow the user to bring up the tablet when a message is open in the tablet
2017-03-15 00:02:42 +01:00
Anthony J. Thibault
3a788d31de
Tablet Running Scripts dialog fixes
...
* The "Currrently Running" section is now visible by default, this includes the "Reload All" and "Remove All" buttons
* The entire dialog is flickable/scrollable. We need to do this because the entire dialog is too tall to fit on the tablet.
* The keyboard now appears when the filter edit text has focus.
The content is scrolled in such away that the focus edit field, and the tree view are above the keyboard.
2017-03-14 15:38:53 -07:00
Seth Alves
08ee2fd43f
Merge pull request #9887 from druiz17/tablet-keyboard-focus
...
dialogs that are push onto the menu stack now have focus
2017-03-14 12:55:47 -08:00
Dante Ruiz
4c686eaa67
fix tablet menu stack focus issue
2017-03-14 21:20:41 +01:00
Atlante45
b14a4faf61
Guard against script loading before avatar
2017-03-14 10:54:22 -08:00
Vladyslav Stelmakhovskyi
e2a4011b05
Coloring implemented
2017-03-14 19:10:41 +01:00
Vladyslav Stelmakhovskyi
56d4bfe077
Servers stats added. TODO: coloring
2017-03-14 18:38:49 +01:00
Seth Alves
5b28f3a3c4
cleanups
2017-03-14 10:08:34 -07:00
Seth Alves
5a557c9fe6
Merge pull request #9865 from vladest/tablet-ui-graphics
...
Add Graphics preferences to Tablet
2017-03-14 08:32:55 -08:00
Brad Hefta-Gaub
a8d18adf83
Merge pull request #9872 from ZappoMan/fadeInWhenOpeningNoiseGate
...
code review changes
2017-03-14 09:26:14 -07:00
Vladyslav Stelmakhovskyi
d9ca8a826d
TabletEntityStatistics.qml refactored. Text now wrapped. TODO: coloring, server stats
2017-03-14 17:02:09 +01:00
Vladyslav Stelmakhovskyi
99c74cec41
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi
0accce5337
TabletComboBoxPreference.qml not needed anymore
2017-03-14 15:53:41 +01:00
Vladyslav Stelmakhovskyi
ee7dd458ca
Merge branch 'tablet-ui' into tablet-ui-graphics
2017-03-14 15:37:36 +01:00
Seth Alves
4a1be69be4
writeOBJToString
2017-03-14 07:11:38 -07:00
Seth Alves
c89a4c4786
Merge pull request #9874 from hyperlogic/bug-fix/toolbar-fade
...
Fix for visible empty toolbar when switching from desktop to HMD mode.
2017-03-14 05:33:54 -08:00
Seth Alves
f8a6a82371
Merge pull request #9881 from ctrlaltdavid/21197
...
Browse for avatar in Marketplace from tablet avatar settings dialog
2017-03-14 05:33:11 -08:00
Seth Alves
e0562e27d4
Merge pull request #9863 from ctrlaltdavid/21209
...
Port Avatar > Attachments to tablet
2017-03-14 05:32:18 -08:00
David Rowe
43687d4773
Tidying
2017-03-14 21:41:04 +13:00
David Rowe
d141d5b683
Add keyboard
2017-03-14 21:36:57 +13:00
David Rowe
f3a99a2437
Implement avatar browser for tablet avatar settings
2017-03-14 15:36:51 +13:00
Atlante45
9e6312ba0e
Make sit script more stable.
2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f
Put avatar in front of chair on situp to avoid infinite collisions
2017-03-13 18:06:32 -08:00
