Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 06:00:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31604 commits 25 branches 0 tags 1.1 GiB
Commit graph

14010 commits

Author SHA1 Message Date
Anthony J. Thibault
69e463bbfd AnimDebugDraw Improvements 
* Now always works, regardless of whether or not Rig or AnimGraph animations
  are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
 2015-09-04 16:01:05 -07:00
Brad Hefta-Gaub
b63e15f2e9 fix a bug in bad PPS calculation 2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.) 
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
 2015-09-04 14:24:37 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Seth Alves
8c3bea6d0d Merge pull request #5713 from AndrewMeadows/flerovium 
fix collision shape of avatars
 2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa 
Post-process anti-aliasing effect
 2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
2eb3d90ac2 Merge pull request #5708 from howard-stearns/new-default-avatar-collision-sound 
Change default avatar collision sound
 2015-09-04 08:48:30 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Howard Stearns
c0fec44f32 Menu item to switch between threaded and not (without restart!). 2015-09-03 19:34:25 -07:00
Anthony J. Thibault
3716d5612b Merge branch 'master' into ajt/new-anim-system 2015-09-03 19:20:06 -07:00
Andrew Meadows
16dfc39f5f fix collision shape of avatars 2015-09-03 18:22:35 -07:00
Howard Stearns
41daea7d92 Merge pull request #5710 from sethalves/fix-stuck-avatars 
Fix stuck avatars
 2015-09-03 16:26:07 -07:00
Anthony J. Thibault
85cb503152 Made Enable Anim Graph menu option dynamic. 
It will load the anim graph when enabled and destroy
the anim graph when disabled.
 2015-09-03 14:46:44 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Howard Stearns
d53c1d0fba Change default avatar collision sound. 
Note that this only used when Interface.ini does not already have a setting, and the empty string is a valid setting.
To reset to default, either delete Interface.ini or the line in it that begins with collisionSoundURL=, or just set
Interface|Edit->Preferences->Avatar collision sound URL to
https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav
 2015-09-03 13:22:04 -07:00
Brad Davis
70ffe10057 Use a constant log file and rollover accumulated logs to a new file based on startup, time or size 2015-09-02 21:56:58 -07:00
Brad Hefta-Gaub
25673831c2 Merge pull request #5689 from jherico/lisa 
Adding 'web3d' overlay type
 2015-09-02 21:31:38 -07:00
Anthony J. Thibault
30264e9c3d Added animation debug draw items to menu. 
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
  Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
 2015-09-02 21:04:29 -07:00
Brad Davis
1f83d04423 Fix oculus crash on switching display plugin to something else 2015-09-02 18:28:43 -07:00
Brad Davis
b6ef2e314f Adding 'web3d' overlay type 2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub
b199e9e593 Merge pull request #5703 from jherico/marge 
Support HTML colors in overlays
 2015-09-02 17:58:44 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Anthony J. Thibault
46b3a7fd23 Improved default avatar.json state machine. 
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
 2015-09-02 17:28:06 -07:00
Howard Stearns
389e752b6e Merge pull request #5695 from AndrewMeadows/dysprosium 
avoid bad joints when computing avatar bounding capsule
 2015-09-02 15:58:42 -07:00
Brad Davis
54b7a063e2 Support HTML colors in overlays 2015-09-02 15:56:37 -07:00
Andrew Meadows
992bd5c9d2 fix sixense and vive rotation readings for palms 2015-09-02 11:37:36 -07:00
Andrew Meadows
eb78b39bea fix typo that broke build and remove warning 2015-09-02 11:31:05 -07:00
Anthony J. Thibault
4a749a0403 Updated MyAvatar to use animGraph from gist instead of local host. 2015-09-02 10:41:04 -07:00
Anthony J. Thibault
d151474446 Merge branch 'master' into ajt/new-anim-system 2015-09-02 10:00:36 -07:00
Andrew Meadows
b7d892cfcd Merge pull request #5691 from ctrlaltdavid/display-names-in-front 
Only render display names if in front of camera
 2015-09-01 19:59:06 -07:00
Anthony J. Thibault
7b4cb8655c First pass integration of new anim system into rig. 2015-09-01 17:57:01 -07:00
Stephen Birarda
e5a10e3174 resolve conflicts on merge with upstream/master 2015-09-01 17:07:32 -06:00
Howard Stearns
8cf71f285d Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-01 16:03:40 -07:00
Andrew Meadows
a7d57d7c60 cleanup whitespace 2015-09-01 14:31:47 -07:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Stephen Birarda
33f6933544 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-01 14:36:16 -06:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Andrew Meadows
7410baedf0 merge highfidelity/master into andrew/copernicium 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
	libraries/animation/src/Rig.cpp
	libraries/animation/src/Rig.h
 2015-09-01 11:08:01 -07:00
Anthony J. Thibault
2401e6cc4b Merge branch 'master' into ajt/new-anim-system 2015-09-01 10:58:38 -07:00
David Rowe
2b17eafef4 Only render display names in front of camera 2015-09-01 10:24:50 -07:00
Seth Alves
7b6d267c06 Merge pull request #5675 from AndrewMeadows/darmstadtium 
remove PhysicsEntity class
 2015-09-01 10:06:01 -07:00
Andrew Meadows
bdcc68ce36 fix bug: allow IK to iterate more than once 
also changed name of parentTransform to be rootTransform
for more correctness
 2015-09-01 09:51:14 -07:00
Andrew Meadows
fba7478c52 remove menu items for legacy IK options 2015-09-01 09:51:14 -07:00
Andrew Meadows
bb63267e30 fix hand IK rotations or all models 2015-09-01 09:45:14 -07:00
Anthony J. Thibault
0d98ab3365 Normalize scale on AnimSkeleton bind pose. 2015-08-31 17:27:23 -07:00
Anthony J. Thibault
9786954585 Added support for onDone and onLoop triggers. 2015-08-31 12:13:05 -07:00
Stephen Birarda
de2bfd0d0d some QThread cleanup and fix in Socket 2015-08-31 11:30:31 -07:00
Stephen Birarda
fa0abe2972 resolve conflicts on merge with upstream/master 2015-08-31 10:51:12 -07:00
Anthony J. Thibault
54aa0677f6 Merge branch 'master' into ajt/new-anim-system 2015-08-31 10:47:50 -07:00
Raffi Bedikian
59a758b5ec Add AA state to RenderContext and Menu 2015-08-30 20:38:05 -07:00
Anthony J. Thibault
9d983e0614 Bug fix to AnimNode::setSkeletonModel and AnimNodeLoader. 
Also updated avatar.json to test nested graphs under a SM.
 2015-08-28 17:16:32 -07:00
Seth Alves
752c787f0b Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-28 12:50:31 -07:00
Brad Davis
b7dd47efcb Merge pull request #5674 from birarda/master 
cleanup of some warnings
 2015-08-27 23:34:43 -07:00
Ryan Huffman
4dadfb8ea6 Merge pull request #5668 from ctrlaltdavid/20648 
Auto refresh entities list upon display of Entities tab
 2015-08-27 21:50:11 -07:00
Anthony J. Thibault
19e91bb392 Added basic interpolation support to AnimStateMachine 2015-08-27 21:26:31 -07:00
Anthony J. Thibault
3286a32afc Initial version of AnimStateMachine. 
No interpolation support, but basic avatar.json is working
with two states and two transitions between them.
 2015-08-27 20:41:53 -07:00
Stephen Birarda
1d6f43e0d0 cleaned up some warnings 2015-08-27 18:26:55 -07:00
Andrew Meadows
d3f06af892 remove PhysicsEntity class 2015-08-27 18:22:12 -07:00
Stephen Birarda
43d2c0653d return correct ATP url from upload dialog 2015-08-27 16:06:54 -07:00
Stephen Birarda
549c514400 fix upload leak, return error for failed load 2015-08-27 15:12:08 -07:00
Stephen Birarda
46990184d6 AssetUploadDialogFactory constructor should be private 2015-08-27 15:07:15 -07:00
Stephen Birarda
777e6c3c2d use existing AssetUploadDialogFactory ref 2015-08-27 15:03:13 -07:00
Stephen Birarda
e3e529c4e5 resolve conflicts on merge with origin/protocol 2015-08-27 14:52:29 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -07:00
Stephen Birarda
59775e5756 actually add the additional error to the dialog 2015-08-27 14:40:12 -07:00
Stephen Birarda
26757eae7a immediately show permission denied error if applicable 2015-08-27 14:37:44 -07:00
Stephen Birarda
f238c1b167 include the extension in upload confirmation 2015-08-27 14:29:42 -07:00
Howard Stearns
b3a919a5ca Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-27 13:46:12 -07:00
Howard Stearns
2429134b37 Lock both myavatar activities, not one. 2015-08-27 13:44:19 -07:00
David Rowe
c9d799f5e0 Auto refresh entities list upon display of Entities tab 2015-08-27 13:32:00 -07:00
Seth Alves
e97e7de19c Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-27 13:19:15 -07:00
Howard Stearns
96c74ebbd5 Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations. 
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
 2015-08-27 12:25:40 -07:00
Stephen Birarda
229015a5da don't allow asset-server upload if no server present 2015-08-27 12:21:38 -07:00
Stephen Birarda
16eee10cab repairs to permission error for asset-server upload 2015-08-27 12:13:20 -07:00
Stephen Birarda
c212ef5734 fix PacketReceiver cleanup, return permission error for upload 2015-08-27 12:01:24 -07:00
Stephen Birarda
b3bd94c8db show a QMessageBox if not connected to asset-server 2015-08-27 11:37:27 -07:00
Stephen Birarda
f92ee597e5 fix width of asset upload dialog to fit ATP url 2015-08-27 11:32:03 -07:00
Brad Hefta-Gaub
79a9694d4a Merge pull request #5648 from ctrlaltdavid/20663 
Clean Interface.ini after a crash
 2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612 Merge pull request #5649 from larsnaesbye/master 
Move i18n to own dir, update FA
 2015-08-27 10:46:29 -07:00
Stephen Birarda
513cae0d40 thread the AssetUpload so it doesn't take over main 2015-08-27 10:23:02 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -07:00
Stephen Birarda
c277584f2e Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload 2015-08-27 09:17:25 -07:00
Seth Alves
435863d1f0 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-26 17:33:59 -07:00
Anthony J. Thibault
b7a9b54628 Better AnimDebugDraw rendering 2015-08-26 16:42:08 -07:00
Stephen Birarda
5b5941fea2 move asset upload to AssetUploadDialogFactory 2015-08-26 16:30:09 -07:00
Howard Stearns
8e3d8cd31c Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 16:08:42 -07:00
Howard Stearns
475331a97d Sprinkle locks everywhere. 2015-08-26 16:08:07 -07:00
Ryan Huffman
4105b7369c Remove AssetScriptingInterface 2015-08-26 15:55:29 -07:00
Ryan Huffman
59b32751f0 Cleanup AssetScriptingInterface 2015-08-26 15:54:02 -07:00
Brad Davis
270f2f7a3b Fixing framerate limit, moving vsync to 2d plugin 2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Seth Alves
d2eb3108d5 Merge pull request #5644 from howard-stearns/eye-correction-application 
eye correction correction
 2015-08-26 14:46:48 -07:00
Ryan Huffman
aed1ba31c4 Fix bugs in Menu.cpp 2015-08-26 12:26:24 -07:00
Ryan Huffman
aa7d8678e1 Merge branch 'protocol' of github.com:birarda/hifi into atp-server 2015-08-26 12:26:11 -07:00
Howard Stearns
0e18395fd0 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-08-26 12:04:28 -07:00
Howard Stearns
54877cdd47 Use GenericThread, and use usleep instead of QTimer (which is incompatible with GenericThread). 2015-08-26 11:59:12 -07:00