Philip Rosedale
df60453344
Merge pull request #5462 from ctrlaltdavid/20574
...
CR for 20574 - Use single file robot model as fallback for full avatar models
2015-08-05 08:55:00 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
David Rowe
f943dc8492
Use single file robot model as fallback for full avatar models
...
Fixes having only a skeleton with no head if an invalid full model file
is configured.
2015-07-29 19:34:05 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Seth Alves
6e5aca6da4
merge from upstream
2015-07-27 16:52:36 -07:00
Andrew Meadows
73ac941230
remove unused legacy Shapes from Model and friends
2015-07-27 11:15:33 -07:00
Seth Alves
8ac06c4059
remove friend class from Avatar
2015-07-27 08:48:16 -07:00
Seth Alves
57eb798d63
Merge branch 'master' of github.com:highfidelity/hifi into rig
2015-07-23 09:46:41 -07:00
David Rowe
3362358dcd
Remove unused postLighting variable from Avatar and MyAvatar
...
Fixes Leap and Hydra laser pointers not displaying.
Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
2015-07-22 17:50:55 -07:00
Seth Alves
7c8d52cbd1
back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer
2015-07-22 13:41:31 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Brad Davis
35f7307f30
More header cleanup
2015-07-18 22:15:50 -07:00
Stephen Birarda
e5722098f6
resolve conflicts on merge with upstream/master
2015-07-17 11:06:01 -07:00
ZappoMan
d5a6e87a02
remove naked gl from Avatar::calculateDisplayNameTransform()
2015-07-15 16:34:23 -07:00
Stephen Birarda
859122db5d
update signature of callbacks for avatar packets
2015-07-13 13:32:46 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Atlante45
e1b5a3c204
Fix display name transform
...
They now have a fixed pixel size and ar pixel aligned
2015-06-18 15:23:51 +02:00
Atlante45
47634a48a6
Make renderDisplayName const
2015-06-18 15:22:49 +02:00
Sam Gondelman
72cc070f0a
enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot
2015-06-11 18:24:32 -07:00
ZappoMan
139855f487
handle remove attachment case
2015-06-10 16:13:17 -07:00
ZappoMan
e0adb8e38a
render avatar attachments as model payload items
2015-06-09 12:57:04 -07:00
Atlante45
d3eaa4755c
Partial fix to billboards
2015-06-08 16:43:38 +02:00
Brad Hefta-Gaub
8b120ea8cd
Merge pull request #5029 from huffman/avatar-batches
...
Team Teaching - Avatar batches
2015-06-03 09:06:10 -07:00
Ryan Huffman
c4dbf6dae8
Update Avatar rendering to use batches
2015-06-02 17:06:41 -07:00
ZappoMan
4ce27f1483
first cut at rendering avatars as individual model items
2015-06-02 16:54:47 -07:00
Ryan Huffman
874f722504
Remove unused Avatar::Pointer typedef
2015-05-29 08:51:37 -07: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
ea6b620d8a
Add declarations for avatar payload functions
2015-05-27 14:53:49 -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
f972e84d6c
Move avatar renedering to Scene
2015-05-27 12:40:26 -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
ZappoMan
20ceb72d92
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-26 15:01:26 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Andrew Meadows
7cd9023e23
build Avatar shape on SkeletonModel load
2015-04-24 13:26:26 -07:00
Sam Gateau
9b63739a72
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
2015-03-31 17:35:34 -07:00
Andrew Meadows
2fad4153a9
remove unused Avatar::getBoundingRadius()
2015-03-12 16:34:27 -07:00
Andrew Meadows
feafa0a60b
remove old Ragdoll and avatar interactions
2015-03-11 14:29:03 -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
Seth Alves
5d4ef8d5b8
initial flailing
2015-03-03 14:30:26 -08:00
Brad Hefta-Gaub
b118912708
Merge pull request #4361 from samcake/temp0
...
evolve the Transform stack away from the legacy GL to the brand new shader way
2015-03-03 11:43:01 -08:00
Sam Gateau
d8ebb0c5b9
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-02-26 14:19:23 -08:00
David Rowe
21f12c1d6c
Use cache ID when rendering talk bubble sphere
2015-02-26 13:50:43 -08:00
Sam Gateau
04a39275ef
Trying to setup correctly the projection matrix for all the different cases...
2015-02-23 16:47:43 -08:00
Sam Gateau
90bff36fd3
trying to ge the shadow to render correctly
2015-02-22 18:48:48 -08:00
Ryan Huffman
5c3cae471b
Fix avatar billboards all rendering as the same billboard
2015-02-20 09:48:04 -08:00
