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
74022 commits 29 branches 0 tags 1.1 GiB
Commit graph

74022 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Back
b5ec04a534 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns 2018-11-13 10:35:57 -08:00
Howard Stearns
ad7266062d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 10:33:27 -08:00
David Back
047708bedb Merge branch 'master' of github.com:dback2/hifi into entityListColumns 2018-11-13 10:24:02 -08:00
Simon Walton
df2bc6ba5c Remove unused function 2018-11-13 10:18:30 -08:00
NissimHadar
2011e7b94c Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-13 10:12:52 -08:00
NissimHadar
14dfb35fad Merge branch 'MAC' of https://github.com/NissimHadar/hifi into MAC 2018-11-13 10:12:38 -08:00
NissimHadar
234a46bd43 Evaluate results even if Interface crashed midway. 2018-11-13 10:12:06 -08:00
NissimHadar
c7e0cb1757 Moved downloader deletion to after completion of download. 2018-11-13 10:11:22 -08:00
John Conklin II
85e5c1d6ef
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations 
Send avatar-joint translations at world scale
 2018-11-13 10:04:30 -08:00
Howard Stearns
545b85bc9d Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging 2018-11-13 09:55:54 -08:00
Howard Stearns
fc62700587 Merge branch 'no-url-logging' of github.com:howard-stearns/hifi into no-url-logging 2018-11-13 09:55:09 -08:00
Simon Walton
8af3bf3748 Add new dependency class (ResourceRequestObserver) to Oven 2018-11-13 09:45:18 -08:00
Seth Alves
7ffba9d987
Merge pull request #14204 from ctrlaltdavid/M12661 
Fixes for collisionless entities
 2018-11-13 09:42:07 -08:00
Seth Alves
1611525220
Merge pull request #14028 from ElderOrb/FB12459 
Improve keyboard raising logic for web views
 2018-11-13 09:41:04 -08:00
Seth Alves
e5114c9b43
Merge pull request #14283 from ctrlaltdavid/M14836 
Make tablet page indicators clickable to scroll tablet
 2018-11-13 09:38:43 -08:00
Seth Alves
4ac719a87f
Merge pull request #14298 from ctrlaltdavid/M17640 
Fix Goto app cards staying highlighted if move off dialog while dragging
 2018-11-13 09:32:24 -08:00
Seth Alves
969776e476
Merge pull request #14312 from ctrlaltdavid/M18577 
Add option to start up at home location
 2018-11-13 09:29:37 -08:00
NissimHadar
81d07b695f Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC 2018-11-13 08:41:05 -08:00
NissimHadar
e378a1b79c Added missing CR 2018-11-13 08:39:52 -08:00
NissimHadar
fc832bff58 Merge branch 'master' of https://github.com/highfidelity/hifi into MAC 2018-11-13 08:27:23 -08:00
Gabriel Calero
e9fe0c85f2 Fix merge 2018-11-13 11:03:46 -03:00
Gabriel Calero
3d4893aba2 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-11-13 10:43:36 -03:00
Alexander Ivash
b16efb2afb set minimum shoulder width to 25 cm (based on discussion with Tony) 2018-11-13 19:06:10 +05:30
Alexander Ivash
3a62184afd specify min/max/stepsize 2018-11-13 19:06:09 +05:30
Alexander Ivash
95c51c2ffa unfocus spinboxes on finishing editing 2018-11-13 19:05:20 +05:30
Alexander Ivash
37bb3586ea show spinbox suffix in separate control to: disallow editing it & allow to pass validator 2018-11-13 19:05:16 +05:30
Alexander Ivash
a9ff1f4ecd add onscreen keyboard into 'Calibration' tab of Settings=>Controls dialog 2018-11-13 19:03:50 +05:30
David Rowe
e12833da23 Fix entities not loading when Interface doesn't have focus 
Reverts https://github.com/highfidelity/hifi/pull/14286
 2018-11-13 14:50:02 +13:00
David Back
b3ccce9a3f merge follow-up 2018-11-12 17:30:21 -08:00
Howard Stearns
7da440a886
Merge pull request #14385 from howard-stearns/inventory-icons-again 
new inventory icons, and align message waiting light in items tab
 2018-11-12 17:05:06 -08:00
David Back
c5023b1086 Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders 2018-11-12 17:03:07 -08:00
Howard Stearns
c520e9de35
Merge pull request #14384 from roxanneskelly/Case19808 
Case19808 - Sys tray need to remove wallet and market --> inventory
 2018-11-12 17:02:34 -08:00
Ryan Huffman
a787f55506 Remove dead code and cleanup JS styling for entity properties redesign 2018-11-12 16:50:45 -08:00
Ryan Huffman
a020a09e8c Remove redundant dimensions in default entity properties 2018-11-12 16:50:45 -08:00
Ryan Huffman
25df605459 Update the styling for the Entity Properties window 2018-11-12 16:50:45 -08:00
Sam Gondelman
f68706e72f
Merge pull request #14252 from gcalero/enable_aec_by_default 
Enabled AEC by default (bug 19210)
 2018-11-12 16:15:33 -08:00
sabrina-shanman
93c7578f54 Convert hfm::Serializer to use hifi-namespaced types 2018-11-12 16:12:21 -08:00
sabrina-shanman
5b6e2aae5a Remove/move some unused serializer imports 2018-11-12 16:12:21 -08:00
sabrina-shanman
8e0fb0f9c4 Remove unused alternate read functions in FBXSerializer 2018-11-12 16:12:21 -08:00
sabrina-shanman
f971294d6d Make HFMSerializer return a smart pointer to an HFMModel 2018-11-12 16:12:21 -08:00
sabrina-shanman
5a9af5b2c3 Correct the folder location in the FBXSerializer header/source top comment 2018-11-12 16:12:21 -08:00
sabrina-shanman
baa8cdb054 Remove combineParts from the Serializer interface 2018-11-12 16:12:21 -08:00
sabrina-shanman
0cbe0bd266 Add missing copyright comment and header guard to OBJSerializer.h 2018-11-12 16:12:20 -08:00
sabrina-shanman
00f2b4eeb9 Make the existing model serializers based on HFMSerializer 2018-11-12 16:12:20 -08:00
sabrina-shanman
0271f7d334 Create the HFMSerializer interface class 2018-11-12 16:12:20 -08:00
sabrina-shanman
83cc90ace0 Re-name GLTFReader to GLTFSerializer and do the same for other model readers 2018-11-12 16:12:20 -08:00
Jeff Clinton
ab8ba2daad
Merge pull request #14230 from amantley/shoulderSpaceFix 
Hand Azimuth improvement
 2018-11-12 16:00:26 -08:00
Simon Walton
6ee837d47c OctreeDataUtils - use new json from DS also; allow upload of large domains 2018-11-12 15:43:09 -08:00
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY 
Case 18436: consistent handling of CapsuleShape dimensions
 2018-11-12 15:25:42 -08:00
amantley
f2f4a55c19 removed cruft 2018-11-12 15:07:14 -08:00