Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27179 commits 76 branches 59 tags 1.2 GiB
Commit graph

765 commits

Author SHA1 Message Date
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
ZappoMan
a0e51469d3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-28 12:36:34 -07:00
Ryan Huffman
8002014dcd Add <memory> to AvatarData for _ptr 2015-05-27 15:13:25 -07:00
Ryan Huffman
21b5e26dc9 Move AvatarData typedefs to AvatarData.h 2015-05-27 14:52:48 -07:00
Seth Alves
bfa0e9c234 recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 14:44:23 -07:00
Seth Alves
ba0467aafe Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…" 2015-05-27 14:10:45 -07:00
Ryan Huffman
389d5556f5 Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer 2015-05-27 12:36:55 -07:00
Eric Levin
eb0f35e041 removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 11:44:37 -07:00
Andrew Meadows
2f4162f447 cleanup of AvatarManger API 2015-05-19 16:53:30 -07:00
Andrew Meadows
f86c419988 stubbery for collidable avatars 2015-05-19 14:15:26 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Andrew Meadows
5a388a0c14 Merge pull request #4722 from birarda/avatar-mixer-debug 
add option to display AvatarData receive stats with display name
 2015-04-29 10:00:24 -07:00
Stephen Birarda
61b4025526 remove the uneeded curly braces for default ctor 2015-04-29 09:33:23 -07:00
Stephen Birarda
c52426385d code review comments for #4713 2015-04-28 18:28:05 -07:00
Stephen Birarda
f2dcacffd0 show avatar data receive rate by default with display name 2015-04-28 18:27:42 -07:00
Eric Levin
342d3576c9 Added ability to check if an avatar is within specified range of a position from javascript 2015-04-28 14:46:39 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation 
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
 2015-04-13 23:57:08 +01:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
d4461f1ecb put avatars and embedded-webserver and entities logging into their own QLoggingCategory 2015-04-06 16:22:54 -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
Philip Rosedale
53970cb530 Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix 
fix bug in default avatars
 2015-03-27 14:54:35 -07:00
ZappoMan
1821683453 fix bug in default avatars 2015-03-27 14:44:35 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Atlante45
3a11ed0574 Account for stereo audio in recorder 2015-03-17 16:40:26 +01:00
Atlante45
b0fd28beeb Typo 2015-03-17 16:40:25 +01:00
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Andrew Meadows
a1a12465da able to update avatar controller in PhysicsEngine 2015-03-12 16:36:41 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00
Andrew Meadows
9ad88c3793 Referentials do math using meters 2015-02-26 13:42:08 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
David Rowe
d704af21ac Generalize "faceshift" data handling to "facetracker" 
DDE face tracking data is now broadcast to other avatars.
 2015-02-18 12:41:54 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
a4752aaab0 use external project glm in avatars 2015-02-13 10:22:09 -08:00
Stephen Birarda
e47333a808 specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00