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
81195 commits 71 branches 56 tags 1.2 GiB
Commit graph

81195 commits

This branch
This branch
All branches
Author SHA1 Message Date
luiscuenca
d4a74f798c
aimToBlendValues to static function 2019-10-01 10:15:16 -07:00
RebeccaStankus
3167dc9a35 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-01 09:59:14 -07:00
RebeccaStankus
0dfb234089 Finished UI, ready for CR 2019-10-01 09:58:44 -07:00
Anthony Thibault
c2690eb39d
Merge pull request #16268 from luiscuenca/limitRotationWhileSeated 
DEV-2125: Rotation while seated do not trigger re-centering
 2019-10-01 09:33:02 -07:00
Simon Walton
95248c7ccd Add <future> header for Android 2019-09-30 23:43:06 -07:00
Simon Walton
595b473be7 Make AssetScriptingInterface::initializeCache() blocking 2019-09-30 17:55:24 -07:00
luiscuenca
7c55cee1f0
Limit rotation while seated to not trigger recentering 2019-09-30 17:37:14 -07:00
dooglifeSF
c780f8ad08 Merge branch 'master' into sit_variants_and_fidgets 2019-09-30 17:18:48 -07:00
luiscuenca
0fac1e134f
Allow avatar look at when in first person camera 2019-09-30 16:43:02 -07:00
Shannon Romano
2896cde447
Merge pull request #16265 from Atlante45/feat/shutdown-annotation 
DEV-2223: Add shutdown annotations for crash reporting
 2019-09-30 16:38:23 -07:00
Shannon Romano
e8f1eecc5b
Merge pull request #16258 from samcake/yellow 
DEV-1815: Investigating rendering issues with opacity map and adding tools to debug resource caches
 2019-09-30 16:36:24 -07:00
Ken Cooke
de5da65757 Use NSActivityUserInitiated instead of NSActivityBackground 2019-09-30 15:48:01 -07:00
Anthony Thibault
7ee5b8e229
Merge pull request #16252 from dooglifeSF/emotes_revisions_per_feedback 
Emotes revisions per feedback
 2019-09-30 15:46:50 -07:00
Clement
0401015441 Connect aboutToQuit 2019-09-30 15:18:47 -07:00
David Rowe
be3947f6a7 Fix description of entity acceleraton property and deprecate 2019-10-01 11:16:15 +13:00
RebeccaStankus
6658e6377c Adding 1 simplifiedUI constant import 2019-09-30 15:06:31 -07:00
RebeccaStankus
0f1190df8b Trying to make QML UI work second launch 2019-09-30 15:03:58 -07:00
Atlante45
a4c857315a Add shutdown annotations for crash reporting 2019-09-30 14:54:17 -07:00
Sam Gateau
1e2cab52b9 FIx an error, bad copy paste leading to a bug 2019-09-30 12:55:04 -07:00
RebeccaStankus
9a03058e88 Trying to make QML UI work 2019-09-30 12:09:22 -07:00
Shannon Romano
95b219475d
Merge pull request #16260 from jherico/warnings 
BUGZ-1596: Cleaning up android build warnings
 2019-09-30 11:58:21 -07:00
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
RebeccaStankus
b98d106a3b mend 2019-09-30 10:39:35 -07:00
RebeccaStankus
b25c874e5f More work on second launch UI 2019-09-30 10:38:11 -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
RebeccaStankus
68f52584cf Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-30 09:19:15 -07:00
Sam Gateau
c8663f7fe6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-30 09:18:23 -07:00
RebeccaStankus
44d9610048 Working on UI 2019-09-30 09:17:51 -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
David Rowe
3b9884c76f Fix build warning 2019-09-28 11:42:25 +12: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
David Rowe
c79581e93f Update JSDoc 2019-09-28 10:19:29 +12:00
David Rowe
bbf6d3f595 Remove unused code 2019-09-28 10:19:00 +12:00
Brad Davis
8724106685 Trying to fix mac build: 2019-09-27 14:55:42 -07:00
David Rowe
2e2d3df26f Fix loadWebScreenOnTop() 2019-09-28 09:38:19 +12:00
David Rowe
e9d138a961 Rename internal function to distinguish signatures and reflect function 2019-09-28 09:29:27 +12: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
RebeccaStankus
de4e8b9cc4 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-09-27 09:16:26 -07:00