Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81621 commits 25 branches 28 tags 1.2 GiB
Commit graph

33695 commits

Author SHA1 Message Date
David Rowe
f944604120 Deprecate Toolbar API's addButton() and removeButton() methods 2019-10-12 10:10:27 +13:00
David Rowe
1715a86dba Fix typo in Assets JSDoc 2019-10-12 07:58:26 +13:00
David Rowe
e4bc3a7d9d Recording JSDoc 2019-10-12 07:58:13 +13:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Clement
3b21dfcd0a CR 2019-10-10 17:49:51 -07:00
Clement
390c7b14c9 Don't post account settings after pull 
Account settings would always get pushed after a pull even if they
hadn't changed
 2019-10-10 15:55:19 -07:00
Zach Fox
19acd76854 Modify InteractiveWindow positions in C++ instead of JS, resulting in huge speedup 2019-10-10 15:48:40 -07:00
Ken Cooke
8325ee2c8e
Merge pull request #16327 from kencooke/audio-device-sleep-wake 
DEV-1901: No audio in Interface when restoring from sleep
 2019-10-10 15:12:07 -07:00
Ken Cooke
ec67b67966 On waking from sleep/hibernate, restart the audio devices 2019-10-10 14:10:47 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
Brad Hefta-Gaub
1316f9b046
Merge pull request #16301 from dooglifeSF/drivekey_anim_triggers 
Drivekey anim triggers
 2019-10-09 18:25:10 -07:00
Maia Hansen
6b5f90f641
Merge pull request #16315 from jherico/qt_5.13 
Qt 5.13 changes
 2019-10-09 15:04:07 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change 2019-10-09 12:20:35 -07:00
dooglifeSF
85b681e70e switch abs() to fabsf() 2019-10-09 11:07:14 -07:00
dooglifeSF
2a1258968a Change macro to const float, use floats in control flow. 2019-10-09 10:10:45 -07:00
dooglifeSF
8a262a3d1a Merge branch 'master' into drivekey_anim_triggers 2019-10-09 07:37:38 -07:00
dooglifeSF
cfa7df7d1a Refactor the if-logic to remove complexity 2019-10-08 16:14:21 -07:00
Andrew Meadows
960646f117 skip delete entities not in the tree 2019-10-08 16:12:14 -07:00
Brad Davis
06871a707e Fix byteswap 2019-10-08 16:11:48 -07:00
Maia Hansen
ad863a1cef
Merge pull request #16313 from RebeccaStankus/controllerSignals 
Added flag to ensure mouse event signals are not connected twice
 2019-10-08 15:58:24 -07:00
dooglifeSF
2626f85f49 Handle multiple inputs, bias towards inputZ instead of inputX, and add a deadzone that matches xbox controller analog deadzone 2019-10-08 15:44:06 -07:00
Brad Davis
960cab9994 Qt 5.13 warnings & fixes 2019-10-08 15:40:13 -07:00
Howard Stearns
9d17c32ff4
Merge pull request #16309 from SimonWalton-HiFi/assignment-client-logging-for-paging 
DEV-2329: Identify Alerting requirements for Assignment Client reliable operation
 2019-10-08 15:35:22 -07:00
RebeccaStankus
458d3bfb48 Renamed variable and made it private 2019-10-08 13:47:06 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Shannon Romano
7aa28f29d2
Merge pull request #16224 from ctrlaltdavid/DOC-111 
DOC-110, DOC-111, DOC-167: JSDoc fixes and tidying
 2019-10-08 10:01:21 -07:00
Sam Gateau
6db302990c
Merge pull request #16297 from jherico/frame-capture 
DEV-632: New format for captured GPU frames
 2019-10-08 09:43:44 -07:00
Shannon Romano
e1de615cbe
Merge pull request #16261 from ctrlaltdavid/BUGZ-491 
BUGZ-491: Fix tablet.loadWebScreenOnTop()
 2019-10-08 09:05:33 -07:00
David Rowe
1106d8fdfa Doc review 2019-10-08 21:15:16 +13:00
David Rowe
f224832d27 Merge branch 'master' into DOC-111 2019-10-08 20:44:13 +13:00
Simon Walton
f73a7c0883 Modified AC logging for paging requirements 2019-10-07 17:35:14 -07:00
Shannon Romano
32ebaed7d3
Merge pull request #16303 from ctrlaltdavid/DOC-188 
DOC-188: Steam JSDoc
 2019-10-07 17:05:20 -07:00
jennaingersoll
8d8449d8d7
Merge pull request #16166 from ctrlaltdavid/DOC-159 
DOC-159: File JSDoc
 2019-10-07 16:37:11 -07:00
Andrew Meadows
052a0c3ebe remove cruft, add comments, change variable name 2019-10-07 16:23:30 -07:00
jennaingersoll
47aa43f56a
Merge pull request #16251 from ctrlaltdavid/DOC-155 
DOC-155: EntityViewer JSDoc
 2019-10-07 15:45:42 -07:00
David Rowe
ffb73d5dbf Steam JSDoc 2019-10-08 11:22:19 +13:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
Andrew Meadows
5a81ed73fe don't allow null Physics::sessionUUID 2019-10-07 14:38:36 -07:00
Andrew Meadows
aef8ac6bf0 make SpatialParentFinder base class pure virtual 2019-10-07 14:38:36 -07:00
Andrew Meadows
99d0579007 remove updateEntitiesInternal(), make updateEntities() virtual 2019-10-07 14:38:36 -07:00
Andrew Meadows
9557ba80c9 all delete pass through EntitySimulation::prepareEntityForDelete() 2019-10-07 14:38:36 -07:00
Andrew Meadows
03db88009f simplify add/removal to EntitySimulation 2019-10-07 14:38:36 -07:00
Andrew Meadows
c8e875ff72 remove cruft 2019-10-07 14:35:28 -07:00
Andrew Meadows
72ba94f2cd unravel more spaghetti into PhysicalEntitySimulation 2019-10-07 14:35:28 -07:00
Andrew Meadows
86c60204fd move entity Action serialization to PhysicalEntitySimulation 2019-10-07 14:35:28 -07:00
Shannon Romano
5bbe271c7a
Merge pull request #16299 from ctrlaltdavid/DOC-187 
DOC-187: Mat4 JSDoc
 2019-10-07 09:11:32 -07:00
Brad Davis
d69a83a2f2 fix warnings 2019-10-04 18:20:10 -07:00
Zach Fox
5e7bb4be91
Merge pull request #16221 from zfox23/handleHrefBetter 
DEV-611: Ensure that entities with the link property set can be clicked in Desktop and VR modes
 2019-10-04 17:36:56 -07:00
Shannon Romano
921cec872b
Merge pull request #16300 from hyperlogic/bug-fix/mat4-forward-right-up-fixes 
Fix for Mat4.getForward, getRight and getUp
 2019-10-04 17:00:43 -07:00
David Rowe
70577b8f34 Remove "not working" warnings in anticipation of fix 2019-10-05 12:13:57 +13:00
dooglifeSF
387f0a3f10 add isInput* and isNotInput vars for use in json, and edit json to use them 2019-10-04 15:28:35 -07:00
jennaingersoll
aab66a2675
Merge pull request #16266 from ctrlaltdavid/DOC-107 
DOC-107: Fix description of entity acceleraton property and deprecate
 2019-10-04 15:17:21 -07:00
Shannon Romano
85c79e7931
Merge pull request #16246 from ctrlaltdavid/BUGZ-711 
BUGZ-711: Clarify frustum property values used by Entities.findEntitiesInFrustum()
 2019-10-04 15:05:52 -07:00
Brad Davis
243120b95c Even better frame capture 2019-10-04 14:57:39 -07:00
Anthony J. Thibault
521f64f152 normalize axes returned by Mat4.getForward getUp and getRight 2019-10-04 14:10:28 -07:00
Shannon Romano
24dc4b19ae
Merge pull request #16285 from SimonWalton-HiFi/domain-server-logging-for-paging 
DEV-2292: Alerting requirements for domain-server failure cases
 2019-10-04 14:01:56 -07:00
Anthony J. Thibault
e3f799d039 Fix for Mat4.getForward, getRight and getUp 
It should match the results from the same methods on the Quat class.
 2019-10-04 13:59:38 -07:00
David Rowe
6e6d438d36 Tidying 2019-10-05 09:34:31 +13:00
David Rowe
a56f82c1ba Mat4 JSDoc 2019-10-05 09:27:31 +13:00
Simon Walton
db14cdbd22 Tweak 'critical' status for some logging 2019-10-04 09:56:35 -07:00
Shannon Romano
5d20baa4d0
Merge pull request #16291 from luiscuenca/fixBlinkAsync 
DEV-2202: Apply same random factors to both eyes blink
 2019-10-04 09:26:19 -07:00
Brad Davis
cc1be64850 Fixing build issues 2019-10-04 09:20:02 -07:00
Brad Davis
3c6e98f16b New format for captured GPU frames 2019-10-04 08:34:06 -07:00
Simon Walton
d5d1c08da0 Adjust some of the logging 2019-10-03 16:50:24 -07:00
Roxanne Skelly
607828d630
Merge pull request #16273 from roxanneskelly/dev1836 
DEV-1836 - handle urls in the form 'hifi://<domain>:<port>
 2019-10-03 16:01:46 -07:00
luiscuenca
f7a5895cf3
Apply same random factors to both eyes blink 2019-10-03 14:42:58 -07:00
Simon Walton
59b41e29f4 Call out DS DS logging critical for Lilypad 2019-10-03 12:15:45 -07:00
Zach Fox
5f1c389d1c DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes 2019-10-03 09:45:23 -07:00
Shannon Romano
37f18e2e5e
Merge pull request #16269 from SimonWalton-HiFi/asset-scripting-wait-for-init 
DEV-1898: Make Assets.initializeCache() script i/f blocking
 2019-10-03 09:31:21 -07:00
Roxanne Skelly
fb8a0e3aee handle urls in the form of <domain>:<port>/path 2019-10-02 16:40:27 -07:00
Ryan Huffman
6fc03637b5
Merge pull request #16274 from amerhifi/master 
dev- 470: Audio device rename and reduction of audio output spam
 2019-10-02 09:18:22 -07:00
Roxanne Skelly
9af7b904ab CR related fixes 2019-10-01 17:04:07 -07:00
amer cerkic
c0a852d68c updated audio wording and removed audio defaul spamming. 2019-10-01 16:55:37 -07:00
Anthony Thibault
f8167e04d0
Merge pull request #16272 from hyperlogic/bug-fix/stuck-in-network-idle-role 
Fix for avatars that are stuck in idle pose for observers
 2019-10-01 16:48:26 -07:00
Roxanne Skelly
0589cb360a Merge branch 'master' of https://github.com/highfidelity/hifi into dev1836 2019-10-01 15:38:02 -07:00
Roxanne Skelly
d0cb489247 DEV-1836 - handle urls in the form 'hifi://<domain>:<port> 2019-10-01 15:34:39 -07:00
Anthony J. Thibault
1068637d39 Fix for avatars that are stuck in idle pose for observers 
The problem can occur because the default constructor for the NetworkAnimState does not initialize the blendTime member.
This can cause the avatar to remain stuck in an idle pose for observers when blendTime happens to be randomly initialzied to a large negative floating point value.
To fix this we explicitly initialize it to FLT_MAX.

Additionally, a debug print has been added to help diagnose this issue if it occurs again.
 2019-10-01 14:28:10 -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
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
David Rowe
be3947f6a7 Fix description of entity acceleraton property and deprecate 2019-10-01 11:16:15 +13: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
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
Sam Gateau
c8663f7fe6 Merge branch 'master' of github.com:highfidelity/hifi into yellow 2019-09-30 09:18:23 -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
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
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
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
David Rowe
57649811d7 Update JSDoc of TabletProxy internal functions 2019-09-27 09:17:48 +12: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
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
David Rowe
8b2d9427bb Update description of the entities available to the Entities API 2019-09-26 10:54:12 +12:00
Atlante45
ff3f26eeae Limit the amount of account settings pull retries 2019-09-25 14:55:44 -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
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
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
David Rowe
16c33ebbec Clarify frustum property values used by Entities.findEntitiesInFrustum() 2019-09-25 19:29:20 +12:00
Sam Gateau
0d9cd69d94 SImplifying Page.js, and adding a REsourceInspector 2019-09-24 18:10:57 -07:00
Clement
5067729c52 Add flag for account settings feature 2019-09-24 17:40:34 -07:00
Clement
96b58756b1 Add flag for account settings feature 2019-09-24 16:50:10 -07:00
Simon Walton
4f11e46b5e Don't move Connection class to changed address until it's used 2019-09-24 16:39:59 -07:00
amer cerkic
9daf670678 Merge branch 'master' into dev469 2019-09-24 15:38:07 -07:00
Andrew Meadows
50f0c90519 don't forget to cleanup expired mortal entities 2019-09-24 14:00:21 -07:00
David Rowe
2fe24b39db Code review 2019-09-25 07:50:56 +12:00
Sam Gateau
69ccc47bda Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-23 18:59:20 -07:00
David Rowe
b174e002a9 Implement Recording.setPlayerVolume() 2019-09-24 12:52:51 +12:00
amerhifi
fbc68e7f69 removed clang format issue, removed old attempt at getting defaults to startup correctly 2019-09-23 15:07:04 -07:00
Shannon Romano
48c55d05c7
Merge pull request #16210 from Atlante45/feat/account-settings 
DEV-544: Add account settings to the AccountManager
 2019-09-23 13:00:23 -07:00
Sam Gateau
3c2809b9ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-21 08:52:13 -07:00
Sam Gateau
4480d56433 Rendering just the overlay layer and improving the resoruceCache inspector to sort 2019-09-20 19:00:03 -07:00
Clement
1924dad51b CR changes 2019-09-20 13:30:08 -07:00
Shannon Romano
bd488f0196
Merge pull request #16144 from luiscuenca/addLookAtThirdCamera 
DEV-391: Keyboard Input Controls Camera Not Avatar Orientation
 2019-09-20 13:03:03 -07:00
Anthony Thibault
fecef584c9
Merge pull request #16226 from danteruiz/fix-snap-html-issue 
BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page
 2019-09-20 12:39:01 -07:00
Shannon Romano
22dffa5ce8
Merge pull request #16217 from Atlante45/fix/flush-timer 
BUGZ-489: Make sure the flush timer is not spawned too early
 2019-09-20 12:35:39 -07:00
amer cerkic
64f14dd6ba fixing selection issues 2019-09-20 11:32:57 -07:00
Sabrina Shanman
460eaf523a
Merge pull request #16202 from AndrewMeadows/trace-stats-for-workload 
DEV-594: add trace stats for workload region sizes
 2019-09-20 10:37:45 -07:00
dante ruiz
fe2a4c3600 fix fix-snap-html-issue 2019-09-19 18:20:08 -07:00
luiscuenca
365aa1bf03
Add jdoc to camera modes and fix variable namings 2019-09-19 17:30:01 -07:00
Sam Gateau
ee5de175eb Better monitoring of the resource loading in flights 2019-09-19 16:56:55 -07:00
amerhifi
7fbce46e30 fixing android build, I removed a function thinking it was unused. also added android ifdef guards for name since default does to exist on that device. Simplified getting a default device 2019-09-19 15:57:38 -07:00
David Rowe
605d272392 Merge branch 'master' into DOC-111 2019-09-20 10:25:21 +12:00
David Rowe
9d9317c50d Miscellaneous fixes and typos 2019-09-20 10:19:45 +12:00
amerhifi
8d7c28fe83 fixed audio switching issues. removed risky access to properties. adressing comments 2019-09-19 14:19:43 -07:00
Clement
282aa70db3 Sync settings on logout/shutdown 2019-09-19 13:45:34 -07:00
luiscuenca
279e25ca70
Merge master 2019-09-19 13:21:49 -07:00