Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 18:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65183 commits 69 branches 56 tags 1.2 GiB
Commit graph

86 commits

Author SHA1 Message Date
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Elisa Lupin-Jimenez
73fde4333e new local reference to image model 2018-02-02 10:27:44 -08:00
Brad Davis
3ad6084b37 Fixing mannequin GLES KTX files 2018-01-23 12:24:53 -08:00
Brad Davis
a9b2cc3408 Fixing lighting shader and removing being of light 2018-01-18 15:25:22 -08:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Dante Ruiz
125eb9ce44 add new tablet model and adjust screen offset 2018-01-09 14:31:57 -08:00
Brad Davis
bd5af2b493 Working on android avatar rendering 2018-01-09 11:40:32 -08:00
Alan Z
6a2ee8c632 Change tablet model's screen 
Changed the texture for the model's screen to say: "Loading... If nothing happens shortly, re-open tablet"
 2017-10-18 10:54:18 -07:00
Stephen Birarda
1fb7b0df7a re-bake new default avatar to compress mesh 2017-10-09 10:57:34 -07:00
Stephen Birarda
78c5e84140 update to re-baked hipsFixed avatar 2017-10-09 10:33:35 -07:00
Stephen Birarda
198dbf83c3 fix name in mannequin FST 2017-10-09 10:33:34 -07:00
Stephen Birarda
429e037534 fix path to mannequin FBX from FST 2017-10-09 10:33:34 -07:00
Stephen Birarda
72b23a0fbb update default avatar to be better with oculus grab triggers 2017-10-09 10:33:34 -07:00
Stephen Birarda
8bc7ce6357 put back defaultAvatar_full.fst mode to 644 2017-06-09 13:55:57 -07:00
Stephen Birarda
0b05774059 change default avatar to new baked mannequin 2017-06-01 17:12:29 -07:00
Ryan Huffman
8b6dd2a835 Change default avatar to ball and stick avatar 2017-04-04 09:39:06 -07:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Ryan Huffman
8325c96c0c Update oculus hand controller tip labels 2016-12-20 18:01:53 -08:00
Ryan Huffman
0b2f60fb27 Update tutorial to use new trigger configuration for touch 2016-12-20 18:01:53 -08:00
Ryan Huffman
188bf600d1 Fix oculus touch labels in tutorial 2016-12-16 15:05:17 -08:00
Ryan Huffman
46251e805a Update oculus touch labels to be emissive 2016-12-16 15:05:17 -08:00
Ryan Huffman
46f5494af8 Fix emissive channel on touch models 2016-12-16 15:05:17 -08:00
Ryan Huffman
a1fea65aa5 Update right joystick mesh 2016-12-16 15:05:17 -08:00
Ryan Huffman
3df1819086 Fix right touch joystick 2016-12-16 15:05:17 -08:00
Ryan Huffman
cde558fb94 Update touch controller tips 2016-12-16 15:05:17 -08:00
Ryan Huffman
674bbe7de5 Add touch controller support to ControllerDisplay 2016-12-16 15:05:17 -08:00
Atlante45
8ebe92487a Update being of light model 2016-10-28 14:56:36 -07:00
Anthony J. Thibault
2193c5faad Integrated controller display from tutorial scripts + assets 2016-10-20 18:24:58 -07:00
Stephen Birarda
132d9c3486 replace the default avatar with the being of light 2016-04-22 13:48:30 -07:00
Anthony J. Thibault
506033a5d8 Remove old avatar-animation.json 2016-04-19 16:14:26 -07:00
Anthony J. Thibault
87cba810a7 remove away states from avatar-animation.json 
away.js: prefetch the kneel animation, so it is available when we need it.
 2016-04-12 15:37:31 -07:00
Leonardo Murillo
946a292cfb Updating defaultAvatar_full.fbx to fixed version 2016-04-01 11:49:45 -06:00
Anthony J. Thibault
d24a024726 MyAvatar: added standing and run landing animations 2016-02-05 17:53:50 -08:00
Anthony J. Thibault
8ca8550f26 MyAvatar: Standing Takeoff and In-Air Animations 
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.

CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
 2016-02-04 17:56:07 -08:00
Anthony J. Thibault
656608e2ff Fixes for away.js 2016-02-02 12:08:52 -08:00
Anthony J. Thibault
2936811484 Added takeoff animation, WIP 
Character controller still has some jump/in-air bugs.
 2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd Added inAir animations 2016-02-02 11:23:46 -08:00
Anthony J. Thibault
d743ea2c9b Changed urls from s3-us-west-1 to hifi-content.s3 2016-01-28 14:20:10 -08:00
Anthony J. Thibault
8710029604 Changed urls to http and updated hand poses. 2016-01-28 14:12:52 -08:00
Anthony J. Thibault
4e4627d039 avatar-animation.json: Updated standard animations 2016-01-27 17:08:49 -08:00
Anthony J. Thibault
7af20e90c8 Hooked up fly animation to json and Rig 2016-01-22 13:47:09 -08:00
Anthony J. Thibault
90516d95f2 Updated animations for left hand grasp 2016-01-14 16:22:58 -08:00
Anthony J. Thibault
51d678670d Updated grab animations for right hand 2016-01-14 12:57:30 -08:00
Anthony J. Thibault
c267d672d2 Updated hand grab animations 
Left hand is old squeeze hands poses
Right hand is new hydra grasp poses
 2016-01-14 08:57:27 -08:00