Anthony J. Thibault
047614b2eb
New left and right grab animations.
2015-10-29 16:18:39 -07:00
Andrew Meadows
d02fe784a9
css and cfg filetypes are text in .gitattributes
2015-10-20 13:58:44 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -07:00
Thijs Wenker
9d2ae661e1
removed some XML from start-script button which possible caused an error before
2015-10-14 21:10:52 +02:00
Thijs Wenker
c585647f10
ScriptEditor Improvements:
...
- fixed run icon
2015-10-14 21:00:50 +02:00
Andrew Meadows
22786dea7d
cleanup
2015-10-12 13:35:26 -07:00
U-GAPOS\andrew
f01847de14
experimental HMD hips tracking
2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258
initial hip translation from IK
...
works for 2D 3rd person but probably not well for HMD
2015-10-12 11:39:54 -07:00
Anthony J. Thibault
0cebeb7fe9
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
...
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
2015-10-07 15:32:10 -07:00
Brad Hefta-Gaub
521aaa0998
Merge pull request #5974 from Atlante45/extra_debug
...
Remove extra debug
2015-10-01 14:42:45 -07:00
Atlante45
b37bf2b1b6
Remove extra debug
2015-10-01 13:18:22 -07:00
Andrew Meadows
b192d0a9cd
make neck IK target type same as head
2015-09-29 17:39:17 -07:00
Anthony J. Thibault
fc9b270951
Merge branch 'master' into tony/gangsta-lean
2015-09-25 11:36:58 -07:00
Anthony J. Thibault
20d784ba39
Threshold based walking while in HMD.
...
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.
While this occurs the avatar should play the appropriate walking animations.
2015-09-24 17:54:32 -07:00
Andrew Meadows
17e3e9394f
allow head translation for 3rd person screenie IK
2015-09-24 12:38:46 -07:00
Anthony J. Thibault
a454584496
Updated default avatar-animation.json
2015-09-23 10:59:52 -07:00
Andrew Meadows
7060befd1c
Merge pull request #5862 from howard-stearns/user-specified-animation-graph
...
user-specified animation graph
2015-09-22 10:48:28 -07:00
samcake
910038cf82
Merging
2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
dc9c774eb5
merge model part quads and triangles together to reduce the number of draw calls
2015-09-21 13:09:43 -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
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
eb67254e54
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 16:54:14 -07:00
Howard Stearns
26f63a44fc
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-08 15:30:22 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -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
Leonardo Murillo
232fd72e53
Revert "Address bar now closes when you click outside of it"
2015-09-01 16:32:29 -06:00
Seiji Emery
e0f6db2152
Coding style
2015-08-28 16:36:44 -07:00
Seiji Emery
c704fb7b12
Fixed to follow signal naming conventions, and added null check
2015-08-28 11:01:30 -07:00
Seiji Emery
9353eaf35a
Added signal to detect + close address bar when user clicks outside of it
2015-08-28 10:33:30 -07:00
Sam Gateau
8ea8eea08d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-08-28 08:13:10 -07:00
Stephen Birarda
80cf7b6c76
resolve conflicts on merge with upstream/master
2015-08-27 14:50:04 -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
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
Sam Gateau
4f7b857130
Merge
2015-08-27 10:01:39 -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
Brad Davis
0aaa07a2de
Remove items from the QML version of the menu when they are removed from the main menu
2015-08-25 19:05:29 -07:00
Ryan Huffman
dc5d5cbb63
Add asset server ping to stats
2015-08-25 15:06:40 -07:00
Lars Christensen
324f592719
updated FontAwesome to v4.4
2015-08-25 01:55:52 +02:00
Sam Gateau
5a8e20ec77
merging
2015-08-21 16:34:13 -07:00
Howard Stearns
dc75b238a8
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
...
And update with current code.
2015-08-18 15:35:37 -07:00
Seth Alves
551f0aaba3
show how many times per second Application::idle is called
2015-08-18 01:41:17 -07:00
ericrius1
3910cb0d69
Merge branch 'master' into polyLineInProgress
2015-08-07 10:12:02 -07:00
Sam Gateau
95682e6270
Introducing the Normal fitting algorithm for better normal in the deferred buffer
2015-08-05 17:17:00 -07:00
ericrius1
b2753507dc
cleanup of comments and dead code
2015-08-03 09:35:47 -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
Brad Davis
914b47069b
Working on line height
2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282
Working on line spacing
2015-07-17 14:19:39 -07:00
Bradley Austin Davis
c5e0298f8d
Working on mac sizing
2015-07-17 12:22:38 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
David Rowe
daf34053a8
Tweak button positions
2015-07-09 10:15:28 -07:00
