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

28562 commits

Author SHA1 Message Date
SamGondelman
8058ad884e trying to fix overlay rotation 2019-02-25 09:53:33 -08:00
SamGondelman
37720e9daa fix nametag rotation 2019-02-22 16:53:03 -08:00
Shannon Romano
a63f3e76c8
Merge pull request #14972 from SamGondelman/billboard 
Case 21341: Fix billboard mode in secondary camera
 2019-02-22 13:01:09 -08:00
luiscuenca
3072ca43de Detailed picking if avatar is not null 2019-02-22 09:24:38 -07:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK 
AnimSplineIK node added to inverse kinematics
 2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp 
Cpp implementation of the Flow script
 2019-02-21 17:10:05 -08:00
amantley
3bf5c44f98 fixed build warnings 2019-02-21 16:24:46 -08:00
amantley
5cf8a963cd make spine2 rotation damping only happen in optimized code. the regular code is already damped 2019-02-21 15:41:16 -08:00
amantley
c9db426ce4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-21 14:36:13 -08:00
amantley
6323f49f26 changed the define variable to HIFI_USE_OPTIMIZED_IK 2019-02-21 14:36:05 -08:00
amantley
afed0b5442 review changes 2019-02-21 11:08:29 -08:00
Shannon Romano
f9e5ee0185
Merge pull request #14970 from danteruiz/quest-no-keyboard 
Case 21335: Use old tablet keyboard for quest
 2019-02-21 10:34:53 -08:00
SamGondelman
4fdf556d5d fix billboard mode in secondary camera 2019-02-21 10:29:21 -08:00
Angus Antley
b6bc467f4b added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel 2019-02-21 06:42:55 -08:00
amantley
f8a74efdc2 fixed build errors from jenkins 2019-02-20 17:59:45 -08:00
amantley
27bfe2f0fe changed name of pre processor variable 2019-02-20 15:14:12 -08:00
Dante Ruiz
bf8c671cd6 keyboard setting 2019-02-20 13:38:20 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake 
case 20058: Android - Handshake implementation
 2019-02-20 13:33:52 -08:00
Brad Davis
79369a0c83 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 10:40:49 -08:00
Shannon Romano
0b7bdb185e
Merge pull request #14949 from SamGondelman/wearables 
Case 21300, Case 21301: Group cull all entity descendants of avatars
 2019-02-20 10:29:40 -08:00
John Conklin II
97c7b01005
Merge pull request #14965 from danteruiz/stylus-pick-perf 
Case 21255: PickManager performance is slow when keyboard mallets are enabled
 2019-02-20 10:11:33 -08:00
Brad Davis
817c24dd0b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 09:51:03 -08:00
Brad Davis
122a246d2d Fix typo 2019-02-19 17:30:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal 
Case 21259: Pal textures don't change
 2019-02-19 17:14:15 -08:00
Brad Davis
518e480a8b Fix plugin activation 2019-02-19 17:00:50 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
luiscuenca
04e57d0dd1 No Rig pointer on Flow class, solve network animations and fixed bug 2019-02-19 17:45:46 -07:00
danteruiz
6bdf51a460 limit number of include items for mallets 2019-02-19 16:25:38 -08:00
danteruiz
d1c46e1cdc fixing tablet pointer issues 2019-02-19 14:48:17 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf 
Case 21271: Remove unnessary picks for quest
 2019-02-19 14:20:56 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
SamGondelman
2986ca20c5 Merge remote-tracking branch 'upstream/master' into pal 2019-02-19 11:31:40 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick 
Case 21291, Case 21292, Case 21293: Working on overlay bugs
 2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity 
Case 20920: Move Material Entity logic to render thread
 2019-02-19 10:59:51 -08:00
John Conklin II
0f8c36156b
Merge pull request #14952 from SamGondelman/textColor 
Case 21305: Fix text overlay color property
 2019-02-19 10:58:32 -08:00
Howard Stearns
d7d6ff53ca
Merge pull request #14765 from howard-stearns/artist-stocking-inventory 
Case 20657: artist stocking inventory
 2019-02-19 10:46:01 -08:00
danteruiz
4bbae1230d making requested chantges 2019-02-19 10:07:36 -08:00
SamGondelman
927e824610 fix missing color for text overlays 2019-02-18 16:14:07 -08:00
Angus Antley
748368bfda mid tweak on the wrist and position coeffs 2019-02-17 23:32:52 -08:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
85421cd6ee speed up stylus picks 2019-02-16 21:16:46 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
amantley
d78f253d24 code to generate pole vector from theta 2019-02-15 17:43:53 -08:00
Howard Stearns
e9b323a807 fix HFC symbol location at checkout, and the display of unavailable items 2019-02-15 16:56:31 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
SamGondelman
0f33d696d2 trying to fix pal colors 2019-02-15 16:12:36 -08:00
John Conklin II
4520236873
Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor 
Case 21012: Avatar Doctor
 2019-02-15 15:43:18 -08:00
Howard Stearns
f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory 2019-02-15 15:15:13 -08:00