Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +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
RebeccaStankus
f4ecd3dcd8 Working on initial/second launch 2019-09-27 09:15:39 -07:00
Sam Gateau
4d94cbe0d8 Pass 3rd of the hope to clean it up... 2019-09-27 00:29:10 -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
David Rowe
57649811d7 Update JSDoc of TabletProxy internal functions 2019-09-27 09:17:48 +12: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
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
David Rowe
8b2d9427bb Update description of the entities available to the Entities API 2019-09-26 10:54:12 +12:00
David Rowe
0cafae2422 EntityViewer JSDoc 2019-09-26 10:54:12 +12: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
Roxanne Skelly
434c63b7e3 BUGZ-1381 - domain server creates blank/undefined group when adding 
groups
 2019-09-25 14:14:29 -07:00
luiscuenca
d7fc4e905c
fix function on jsdoc 2019-09-25 14:02:43 -07:00
amer cerkic
73f14d812f addressing cr comments 2019-09-25 13:22:50 -07:00
Simon Walton
6ccfc37f27 Merge remote-tracking branch 'upstream/master' into connection-class-ignored-unused 2019-09-25 13:06:32 -07:00
luiscuenca
0aab2ed07f
Disable head look at when pointing 2019-09-25 12:37:24 -07:00
MiladNazeri
7d7024f5eb
Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings 
Dev 148/add mirror mode to settings
 2019-09-25 12:08:09 -07:00
Brad Hefta-Gaub
06c7a92c27
Merge pull request #16243 from Atlante45/fix/account-settings 
DEV-648: Add flag for account settings feature
 2019-09-25 11:20:14 -07:00
milad
aba6a28d54 updated camera modes 2019-09-25 11:05:32 -07:00
Brad Hefta-Gaub
068fb0e177
Merge pull request #16240 from ctrlaltdavid/BUGZ-577 
BUGZ-577: Implement Recording.setPlayerVolume()
 2019-09-25 10:31:57 -07:00
Simon Walton
6d7f711990 Remove typo that somehow got into a comment 2019-09-25 09:33:49 -07:00
milad
39d96b76a6 fixed help text 2019-09-25 08:41:38 -07:00
David Rowe
16c33ebbec Clarify frustum property values used by Entities.findEntitiesInFrustum() 2019-09-25 19:29:20 +12:00
Sam Gateau
3e3c4c2e70 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-24 18:58:29 -07:00
luiscuenca
7c4fe39918
Add point directional blending node to animation json 2019-09-24 18:24:27 -07:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
luiscuenca
ad79393e1f
Implement point at directional blend and API 2019-09-24 17:55:38 -07:00
Clement
5067729c52 Add flag for account settings feature 2019-09-24 17:40:34 -07:00
milad
103b10e2f9 restored modified file 2019-09-24 16:52:37 -07:00
milad
af5e01f96b restored modified file 2019-09-24 16:51:35 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
milad
677dbe59cc fixed qml typo 2019-09-24 16:47:07 -07:00