Commit graph

171 commits

Author SHA1 Message Date
David Rowe
839303168e Fix missed capital 2016-02-27 11:20:31 +13:00
David Rowe
e8f349ec31 Fix up capitalization of labels and use of colons 2016-02-27 11:02:39 +13:00
Zach Pomerantz
ea8edb3744 Remove antialiasing from menus, default to on 2016-02-23 16:24:44 -08:00
Brad Hefta-Gaub
9066fb0622 Merge pull request #7145 from howard-stearns/lod-pid-removal
Lod pid removal
2016-02-20 10:29:42 -08:00
Howard Stearns
30b4eace95 Remove LOD PID-related preferences and the related toggling of preferences. 2016-02-19 11:52:07 -08:00
howard-stearns
30ae1950d2 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer 2016-02-18 11:35:41 -08:00
Howard Stearns
6d70584b5a Change name and use only when in HMD. 2016-02-16 18:09:56 -08:00
Howard Stearns
983a0ccb9b Change internal preference names so that old users pick up the new default values, and change name in dialog. 2016-02-16 18:00:39 -08:00
howard-stearns
20406a5a14 Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar. 2016-02-15 13:26:40 -08:00
howard-stearns
7057d5c40c Snap Turn avatar preference. (Still tied to Developer menu item.) 2016-02-15 12:38:40 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
Zach Pomerantz
84197e5eb2 Add persistent render engine configuration file 2016-02-11 10:00:44 -08:00
Seefo
0fad9b6755 Changed literals to follow coding standard 2016-01-29 20:07:45 -05:00
Seefo
ffa6687af3 Added setting dialogs for camera pitch and yaw 2016-01-29 19:34:57 -05:00
Zach Pomerantz
bed325d675 Add Graphics to general settings 2016-01-25 15:17:43 -08:00
Brad Davis
208d7c3cfc Killing the old preferences dialog 2016-01-22 19:24:38 -08:00
Brad Davis
71ae36f5c0 Button prefs and conditionally enabled prefs 2016-01-22 19:06:30 -08:00
Brad Davis
27fdb523cb Add directory & avatar browsing preferences 2016-01-22 17:30:10 -08:00
Brad Davis
2026821d9e Moving preferences to dependency mananger 2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506 First pass on preferences dialog
Conflicts:
	tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
howard-stearns
a37b9157bc simplify preferences 2016-01-04 15:00:54 -08:00
Howard Stearns
da27cacdec Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits 2015-12-16 20:56:33 -08:00
howard-stearns
23ffcdca3e big sweep 2015-12-16 17:01:14 -08:00
howard-stearns
09d4a06ad4 LODManager-centric stats and preferences. 2015-12-16 15:30:48 -08:00
Andrew Meadows
c3823de353 setClampedTargetScale()-->setTargetScaleVerbose() 2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211 properly scale avatar collision shape 2015-12-15 18:18:08 -08:00
howard-stearns
069199554c checkpoint 2015-12-15 16:07:37 -08:00
Brad Davis
645695d5d5 Moving sixense to external plugin 2015-12-10 10:44:23 -08:00
Stephen Birarda
4a0c6eebd8 change avatar URL when typing completed or accepted 2015-12-07 16:17:59 -08:00
Howard Stearns
a0a4f7d177 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-anim-graph-preference-change 2015-12-04 11:08:44 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents
Parents
2015-12-04 10:26:57 -08:00
howard-stearns
1b42c5a172 Make MyAvatar.get/setAnimGraphUrl take a url(!), and make setting it
actually do something.
2015-12-03 16:16:01 -08:00
Howard Stearns
4a8649c202 Change get/setRenderDistanceLow/HighLimit and avatarRenderDistanceHighLimit to get/setRenderDistanceInverseLow/HighLimit and avatarRenderDistanceInverseHighLimit. 2015-12-03 14:23:16 -08:00
Howard Stearns
861393910a Add an avatar LOD preference called "Minimum Avatar Display Distance" 2015-12-02 12:12:57 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Anthony J. Thibault
821264a031 Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states 2015-11-22 16:15:03 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Brad Hefta-Gaub
dc093159a1 make preferences dialog resizable 2015-11-18 17:54:51 -08:00
Anthony J. Thibault
11440f92f4 Removed rig animations
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
  But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Seth Alves
a78f2a9577 have avatar make use of SpatiallyNestable 2015-10-18 09:48:46 -07:00
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Atlante45
e9b7125894 Misc cleanup 2015-10-06 13:56:26 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Howard Stearns
8b701b8a5b Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec.
Takes effect when you save (if you have enabled the anim graph under developer->avatar).
An empty string gives you the default behavior.
2015-09-21 10:26:04 -07:00
Howard Stearns
6508d5943a textChanged has to do something 2015-08-25 11:29:27 -07:00