Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
76832 commits 29 branches 0 tags 1.1 GiB
Commit graph

28724 commits

Author SHA1 Message Date
Wayne Chen
ca5ff3381b changing position of the mute warning setting 2019-03-11 16:02:18 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero 
Case 21639: RC81: Adding Hero support in simulation of avatars
 2019-03-11 14:13:49 -07:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra 
add getFlowData method to MyAvatar
 2019-03-08 17:45:11 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Shannon Romano
c3b8f6ed93
Merge pull request #15145 from roxanneskelly/StandaloneTags 
Case 21642 - verification dialog when user hits return in goto search
 2019-03-08 15:29:34 -08:00
Howard Stearns
1d52ed1524
Merge pull request #15146 from howard-stearns/do-not-scroll-under-letterbox 
do not scroll inventory items underneath modal dialog
 2019-03-08 15:27:44 -08:00
Howard Stearns
fac162c2bc
Merge pull request #15144 from howard-stearns/about-blockchain 
Change "about" blockchain from Elements to EOS
 2019-03-08 15:17:31 -08:00
luiscuenca
df32b61eaf remove unused variable 2019-03-08 16:01:18 -07:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81 
Case 21628: Fix text rendering on AMD/Mac
 2019-03-08 14:59:37 -08:00
luiscuenca
bfcb1a8391 Make methods thread safe 2019-03-08 15:57:25 -07:00
Shannon Romano
cc154be12d
Merge pull request #15090 from danteruiz/oculus-tracking-controllers 
Case 21167: When using Oculus HMD, continue to track hand position and movement when focus is off High Fidelity
 2019-03-08 14:56:56 -08:00
Thijs Wenker
60d46998ec
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings 
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
 2019-03-08 23:51:58 +01:00
Roxanne Skelly
b3f5d76d0f CR Fix 2019-03-08 14:37:15 -08:00
Howard Stearns
8791252acd do not scroll inventory items underneath modal dialog 2019-03-08 14:27:56 -08:00
Thijs Wenker
06e5927ee1 CR fixes 2019-03-08 23:07:01 +01:00
Roxanne Skelly
88a4b5c983 Case 21642 - verification dialog when user hits return in goto search 
text entry+return should throw up verification dialog for first time to
non-optimized domain
 2019-03-08 14:01:47 -08:00
Howard Stearns
24b08bd25d Change "about" blockchain from Elements to EOS 2019-03-08 13:59:16 -08:00
luiscuenca
4858f64810 get the colliding joints 2019-03-08 14:36:47 -07:00
Roxanne Skelly
70cc6594c7 CR fixes 2019-03-08 12:43:43 -08:00
luiscuenca
cbe920774f add getFlowData jsdoc 2019-03-08 12:45:29 -07:00
luiscuenca
cb6f573b35 Merge branch 'master' into flowAPIExtra 2019-03-08 12:43:02 -07:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
luiscuenca
a977bb6dc8 remove unuse variable 2019-03-08 12:39:57 -07:00
Roxanne Skelly
750dbfae21 Stand-alone Tags: Throw up popup for first unoptimized domain 
Throw up a popup in stand-alone builds when user attempts to go to
an unoptimized domain.
 2019-03-08 10:48:42 -08:00
luiscuenca
e8da6b5a0c add getFlowData 2019-03-08 10:36:58 -07:00
Shannon Romano
ef44218fe3
Merge pull request #15128 from roxanneskelly/case21315etc 
Case 21315, Case 21326, Case 21370
 2019-03-08 08:37:23 -08:00
Thijs Wenker
f2bca5d6c6 added the multiple root joints warning 2019-03-08 07:32:41 +01:00
Thijs Wenker
c35e4d15ab - warning grammar / no more texture folder content requirement for No textures assigned warning 
- resolved partial commit issue / Fix UNIX builds by removal of unused warning
 2019-03-08 03:36:56 +01:00
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
Thijs Wenker
bcd00f98d0 - added more warnings to the avatar doctor 
- read embedded fst texture mappings
 2019-03-08 03:36:56 +01:00
SamGondelman
af03fb5f85 try to fix text rendering on amd with transparency 2019-03-07 16:23:12 -08:00
Shannon Romano
343e2648bb
Merge pull request #15131 from danteruiz/destroy-modal-dialogs 
Case 15127: Esc key doesn't consistently set my avatar to 'Away' mode
 2019-03-07 16:06:33 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Shannon Romano
76958ffda2
Merge pull request #15102 from danteruiz/keyboard-for-web-entities 
Case 21144: Can't enter text in a Web Entity with the new keyboard
 2019-03-07 15:46:31 -08:00
Shannon Romano
ab08b56bd1
Merge pull request #15085 from danteruiz/keyboard-handle-scaling 
Case 21500: Keyboard handle appears huge when scaling down avatar
 2019-03-07 15:39:43 -08:00
danteruiz
d1e376de0e destroy modal dialogs that prevent interface from getting input 2019-03-07 14:29:38 -08:00
Roxanne Skelly
cce43357d0 Case 21315, Case 21326, Case 21370 
Case 21315 - Clicking on item picture from Inventor Items list does not
always display the Marketplace item page.
Case 21326 - See All Markets page is missing its footer and the two
Explore buttons no longer work
Case 21370 - QML Marketplace - For unavailable items (no more editions
for sale), marketplace item list 'buy' button is not disabled

Also, a few minor font sizing and other graphics tweaks
 2019-03-07 13:58:51 -08:00
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst 
Load flow bone data from FST file
 2019-03-07 12:48:36 -08:00
John Conklin II
abb61b7e90
Merge pull request #15124 from SamGondelman/shapes 
Case 21605: Fix shapes app and debugAvatarMixer
 2019-03-07 11:07:45 -08:00
Howard Stearns
ab8f6273ad
Merge pull request #15113 from howard-stearns/stock-to-master 
Stock to master
 2019-03-07 11:02:53 -08:00
Anthony Thibault
96a696203c
Merge pull request #15101 from amantley/bugAvatarHovers 
Fixed: Avatar hovers off ground while running
 2019-03-07 10:52:20 -08:00
danteruiz
9ca3805499 making requested changes 2019-03-07 10:27:16 -08:00
Roxanne Skelly
b38fc65372 Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-07 10:06:05 -08:00
SamGondelman
380df059ff fix shapes app 2019-03-06 18:18:39 -08:00
danteruiz
a0bd2f67ec fix stylus gizmo intersection 2019-03-06 17:20:36 -08:00
SamGondelman
96eb137df2 fix debugAvatarMixer.js 2019-03-06 15:53:25 -08:00
Howard Stearns
c6b2697b44 cleanup 2019-03-06 13:28:55 -08:00
Howard Stearns
8ebab88613 Merge branch 'master' of github.com:highfidelity/hifi into stock-to-master 2019-03-06 13:08:19 -08:00