Howard Stearns
6508d5943a
textChanged has to do something
2015-08-25 11:29:27 -07:00
Howard Stearns
74fd640f16
Restore the ability to change avatars from the edit.js marketplace button.
2015-08-21 16:49:07 -07:00
Howard Stearns
f00d3c037d
whitespace
2015-08-13 17:36:03 -07:00
Howard Stearns
63608d8012
Undo avatar choice if the whole preferences dialog is cancelled.
2015-08-13 15:55:43 -07:00
Howard Stearns
7d4c96cc29
avartar => avatar
2015-08-13 14:53:12 -07:00
Howard Stearns
a8a064990f
apperance => appearance
2015-08-13 14:42:37 -07:00
Howard Stearns
62941c0914
Remove dead code.
2015-08-13 12:39:30 -07:00
Howard Stearns
ea834609c2
Kill the AvatarAppearanceDialog and rewire necessary parts of PreferencesDialog.
2015-08-13 10:33:31 -07:00
Bradley Austin Davis
a60e669d3d
Merge branch 'master' into plugins
2015-07-24 13:38:18 -04:00
Anthony J. Thibault
01c740f415
cleaning up plugin architecture, fixed hand controllers
2015-07-17 17:19:49 -07:00
Anthony J. Thibault
060f6c19a6
almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly
2015-07-16 18:16:59 -07:00
David Rowe
6c6e3eb758
Rename and refactor eye deflection slider
2015-07-16 14:05:34 -07:00
Anthony J. Thibault
56e7af081e
input plugin architecture, fixed sixense
2015-07-15 18:50:44 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
David Rowe
f47cff1332
Remove duplicate method call
2015-06-25 15:41:27 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Brad Davis
7f2552c690
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
2015-05-16 22:38:15 -07:00
David Rowe
5832259643
Add preferences slider for webcam eyelid closing threshold
2015-05-11 17:11:52 -07:00
Seth Alves
de9e74a725
put max-octree-pps in Application rather than in the Octree
2015-05-11 12:01:13 -07:00
Seth Alves
83748096ef
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
2015-05-11 11:37:53 -07:00
Bradley Austin Davis
5e821b4447
Updating plugins
2015-05-07 22:32:28 -07:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
ZappoMan
174e9f2133
more tweaks to preferences UI
2015-04-14 12:38:29 -07:00
ZappoMan
9262585bab
first cut at moving avatar appearance into separate dialog box
2015-04-14 10:38:22 -07:00
ZappoMan
0bc1b02895
improvements to tracking model names
2015-04-03 17:24:53 -07:00
ZappoMan
1a463a0256
more work on improved avatar UI adding model names and backward compatible support
2015-04-03 17:03:22 -07:00
ZappoMan
aaf191b6dc
first cut at new avatar preferences UI
2015-04-03 14:31:43 -07:00
ZappoMan
da9a8e8a97
CR feedback
2015-04-01 09:27:58 -07:00
ZappoMan
d68143675a
first simple pass at using marketplace windows in preferences
2015-03-31 16:24:27 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
ZappoMan
6189926105
add type hint to FST in model packager
2015-03-27 13:23:29 -07:00
ZappoMan
619428c325
move LOD FPS settings to Preferences
2015-03-24 13:32:22 -07:00
ZappoMan
a89691fc66
switch GLCanvas back to being owned by Application
2015-02-25 12:11:35 -08:00
Ryan Huffman
a8999964f6
Cleanup dpi scaling comments
2015-02-18 16:21:51 -08:00
Ryan Huffman
9550339a2a
Move preferences dialog font scaling to UIUtil
2015-02-18 13:34:01 -08:00
Ryan Huffman
ab542c3599
Update DPI scaling to not update default fonts
2015-02-18 12:21:10 -08:00
Ryan Huffman
a5b737314d
Add auto-scale to preferences dialog
2015-02-18 11:44:15 -08:00
Stephen Birarda
30afadc7b7
fixes for new settings API
2015-02-04 10:53:05 -08:00
Stephen Birarda
11f3161029
resolve conflicts on merge with upstream/master
2015-02-04 10:38:05 -08:00
Atlante45
27459ba861
Settings update
2015-02-03 12:27:30 -08:00
Atlante45
647a935eaa
Remove app->getAvatar
2015-01-29 15:16:40 -08:00
Atlante45
4ef87b9919
Merge branch 'master' of https://github.com/highfidelity/hifi into android
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
interface/src/ui/Stats.cpp
libraries/audio-client/src/AudioClient.cpp
libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
Stephen Birarda
f885dc229b
final fixes for Audio includes in Interface
2015-01-21 12:31:10 -08:00
Stephen Birarda
0eced09f1d
intial removal of Audio to audio-client
2015-01-21 11:49:06 -08:00
Atlante45
cdb0c22207
interface/ui uses new settings
2015-01-19 22:49:27 -08:00
Atlante45
c2b7ff1b54
Totally removed Application's setting memember
2015-01-18 19:10:30 -08:00
Atlante45
8933da7bc7
Moved SpeechRecognizer out of Menu
...
Added it in the DM
2015-01-18 06:50:34 -08:00
