Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 12:44:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
36231 commits 75 branches 59 tags 1.2 GiB
Commit graph

143 commits

Author SHA1 Message Date
howard-stearns
09d4a06ad4 LODManager-centric stats and preferences. 2015-12-16 15:30:48 -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
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