Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81074 commits 71 branches 56 tags 1.2 GiB
Commit graph

81074 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shannon Romano
3d813b525e
Merge pull request #16230 from MattHardcastle/add-notarize-script 
[INFRA-196] Add mac notarization script
 2019-09-30 11:56:40 -07:00
luiscuenca
02d889ba6e
account for point target validity 2019-09-30 11:35:00 -07:00
dooglifeSF
5cfa1cb5ba Merge branch 'master' of https://github.com/highfidelity/hifi into sit_variants_and_fidgets 2019-09-30 09:38:45 -07:00
Sam Gateau
9b8d159873 remove unused variable 2019-09-30 09:24:37 -07:00
Sam Gateau
c8663f7fe6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-30 09:18:23 -07:00
sabrina-shanman
f773bdeca2 Remove unused variable 2019-09-30 09:07:42 -07:00
Shannon Romano
447bccf240
Merge pull request #16262 from ctrlaltdavid/BUGZ-573 
BUGZ-573: Fix loadOtherBase in tablet.gotoWebScreen() not working
 2019-09-30 09:06:09 -07:00
Sam Gateau
8c9cf7bddd Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-27 19:01:19 -07:00
sabrina-shanman
b4c50b3f48 Remove unused parameter from getReweightedDeformers 2019-09-27 17:46:12 -07:00
sabrina-shanman
cd94dc15f9 Add CollectShapeVerticesTask 2019-09-27 17:14:09 -07:00
David Rowe
3d667b4a21 Deprecate tablet.gotoWebScreen()'s loadOtherBase parameter 2019-09-28 11:30:57 +12:00
David Rowe
07d8013e21 Don't display "CLOSE" and "BACK" buttons at top of Blocks screen 2019-09-28 11:30:57 +12:00
David Rowe
cd6d9b57c4 Fix Blocks script displaying a blank page 2019-09-28 11:30:56 +12:00
Brad Davis
f550d6c4fb More warnings 2019-09-27 15:46:52 -07:00
Brad Davis
8724106685 Trying to fix mac build: 2019-09-27 14:55:42 -07:00
Sam Gateau
ecd940e0e6 Addressing warnings 2019-09-27 14:01:00 -07:00
Howard Stearns
f513b65e9d
Merge pull request #16256 from SimonWalton-HiFi/supress-repeated-socket-logging 
BUGZ-1543: Suppress repeated socket logging
 2019-09-27 12:45:17 -07:00
Sam Gateau
57f8095506 Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script 2019-09-27 12:00:45 -07:00
Shannon Romano
d342f3efcd
Merge pull request #16257 from kencooke/android-clang-warnings-fix 
Fix Android clang warnings due to unused compiler flags
 2019-09-27 09:25:44 -07:00
Sam Gateau
25bcc31b72 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-27 09:24:25 -07:00
Brad Davis
403499bf32 Cleaning up android build warnings 2019-09-27 09:19:52 -07:00
Shannon Romano
7e74753a71
Merge pull request #16255 from luiscuenca/lookAtFixes 
BUGZ-1599: Free camera fixes
 2019-09-27 09:16:30 -07:00
Sam Gateau
4d94cbe0d8 Pass 3rd of the hope to clean it up... 2019-09-27 00:29:10 -07:00
sabrina-shanman
2077da6f37 Create ReweightDeformersTask 2019-09-26 17:06:41 -07:00
Sam Gateau
24cc302a8b second pass of cleaning on the code to make it ready for merge 2019-09-26 16:56:00 -07:00
Simon Walton
93a1cbdcf9 Use direct initialization instead of copy initialization for atomics 2019-09-26 16:45:29 -07:00
Andrew Meadows
f3aa534327
Merge pull request #16239 from AndrewMeadows/cleanup-mortal-entities 
BUGZ-1510: don't forget to cleanup expired mortal entities
 2019-09-26 16:20:27 -07:00
Simon Walton
f17a1c17f3 Only print Qt event-queue size on change of error code 2019-09-26 15:46:11 -07:00
Ken Cooke
97dab24a69 Fix Android clang warnings due to unused compiler flags 2019-09-26 15:45:26 -07:00
luiscuenca
ea23a82f33
Make mouse pitch less sensitive 2019-09-26 15:14:47 -07:00
luiscuenca
1b064a0ebe
Fix Q key on first person cam. Let camera control flying Y axis 2019-09-26 14:29:01 -07:00
Shannon Romano
1e67f1e914
Merge pull request #16249 from roxanneskelly/bugz1381 
BUGZ-1381 - domain server creates blank/undefined group when adding groups
 2019-09-26 12:28:39 -07:00
Simon Walton
85c9f4d95f Use the FCDEBUG mechanism to throttle udt::Socket log-spam 2019-09-26 12:10:59 -07:00
Sam Gateau
675dbc3f7f Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-26 12:06:09 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Simon Walton
bbf43050b1
Merge pull request #16244 from SimonWalton-HiFi/connection-class-ignored-unused 
BUGZ-1503: Don't move unused Connection class upon address change
 2019-09-26 11:42:50 -07:00
Ken Cooke
6e54ff30bd Bugfix 2019-09-26 11:36:23 -07:00
dooglifeSF
a6bedf7174 Merge branch 'master' into sit_variants_and_fidgets 2019-09-26 11:23:37 -07:00
Ken Cooke
3f686be7ab Add all Objective-C sources in CMakeLists.txt 2019-09-26 10:50:00 -07:00
Ken Cooke
ae62b96f67 On Mac OS, disable App Nap to prevent audio glitches while running in the background 2019-09-26 08:52:35 -07:00
Sam Gateau
ba11c3e702 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-25 17:54:21 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
Amer
1e94a82ee6
Merge pull request #16196 from amerhifi/dev469 
DEV-469: Default Audio device
 2019-09-25 16:28:00 -07:00
Sabrina Shanman
6234c83a24
Merge pull request #16253 from sabrina-shanman/instancing_deprecated 
Add hfm::Shape::transformedExtents. Deprecate hfm fields.
 2019-09-25 16:14:47 -07:00
sabrina-shanman
af460d7f5f Add hfm::Shape::transformedExtents. Mark select hfm fields as 
deprecated.
 2019-09-25 16:11:48 -07:00
Howard Stearns
d507c06a3b
Merge pull request #16250 from Atlante45/fix/account-settings 
DEV-648: Limit the amount of account settings pull retries
 2019-09-25 15:55:08 -07:00
dooglifeSF
0fa7220750 tilt head down slightly to minimize crazy eyes 2019-09-25 15:27:11 -07:00
Atlante45
ff3f26eeae Limit the amount of account settings pull retries 2019-09-25 14:55:44 -07:00
dooglifeSF
a8fa3a136c emote revisions, json tuning 2019-09-25 14:47:07 -07:00
dooglifeSF
54ce9be9df Merge branch 'master' of https://github.com/highfidelity/hifi into emotes_revisions_per_feedback 2019-09-25 14:45:28 -07:00