Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-20 11:45:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81700 commits 25 branches 28 tags 1.2 GiB
Commit graph

81700 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Zach Fox
b0adf1ef02 Almost done with init screen 2019-10-07 20:29:18 -04:00
Shannon Romano
32ebaed7d3
Merge pull request #16303 from ctrlaltdavid/DOC-188 
DOC-188: Steam JSDoc
 2019-10-07 17:05:20 -07:00
David Rowe
570abba3ce SpeechRecognizer JSDoc 2019-10-08 13:04:52 +13:00
Zach Fox
a23bee19e8 Controls screen done 2019-10-07 19:52:22 -04:00
dante ruiz
7c15500b77 adding log file and fixing config file for mac 2019-10-07 16:46:23 -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
Ryan Huffman
bab1a902a5 Add serverless content back to launcher builds 2019-10-07 15:44:57 -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
3155ffe07e remove useless unreachable code 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
Zach Fox
643dd21f86 Merge branch 'master' of github.com:highfidelity/hifi into frictionIteration 2019-10-07 13:22:08 -04:00
dante ruiz
e1a3b24a6d Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher 2019-10-07 09:15:18 -07:00
dante ruiz
c3c283c3ed fixing auto updater fpor mac 2019-10-07 09:14:39 -07:00
Shannon Romano
3db915c432
Merge pull request #16275 from dooglifeSF/sit_variants_and_fidgets 
Sit variants and fidgets
 2019-10-07 09:14:38 -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
Simon Walton
f020ab83c8
Merge pull request #16295 from SimonWalton-HiFi/ess-send-stats 
DEV-2309: Report ESS stats to domain server
 2019-10-06 01:48:27 -07:00
Brad Davis
b2bcf54b5b Removing frame converter 2019-10-04 19:52:55 -07:00
Brad Davis
d69a83a2f2 fix warnings 2019-10-04 18:20:10 -07:00
Sam Gateau
d714cc6da6 FIxing some stuff ? 2019-10-04 17:55:37 -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
Ryan Huffman
f912268129 Update qt launcher to disable inputs when making requests 2019-10-04 16:43:58 -07:00
David Rowe
70577b8f34 Remove "not working" warnings in anticipation of fix 2019-10-05 12:13:57 +13:00
Simon Walton
67d80cdd15 Add per-Node & ESS-specific stats 2019-10-04 15:38:05 -07: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
f797f714bd
Merge pull request #16298 from luiscuenca/addisSeatedAPImethod 
DEV-2011: Add MyAvatar::isSeated API method
 2019-10-04 15:06:46 -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
Ryan Huffman
a661d62959 Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher 2019-10-04 14:37:38 -07:00
Ryan Huffman
cd453791e2 Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher 2019-10-04 14:37:29 -07:00
dante ruiz
0afbad6557 cmake improvments 2019-10-04 14:30:34 -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
luiscuenca
07080f0138
Clarify jdocs 2019-10-04 13:47:20 -07:00