Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 05:56:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69919 commits 6 branches 1 tag 1.1 GiB
Commit graph

28773 commits

Author SHA1 Message Date
Stephen Birarda
dce9cb0404 fix case where TCP Vegas would not re-send lost ACK 2018-06-29 15:42:59 -07:00
Wayne Chen
9e3626cca3 returning false if there is no entity to connect to 2018-06-29 14:42:33 -07:00
luiscuenca
97a0edf026 spaces 2018-06-29 14:38:43 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
John Conklin II
d68815ba27
Merge pull request #13501 from danteruiz/fix-billboard-crash 
Fix web entity crash
 2018-06-29 12:02:31 -07:00
sabrina-shanman
e4377a6c95 Prevent type conversion in ~ResourceManager constant 2018-06-29 10:55:01 -07:00
Thijs Wenker
c6e264edac fix OSX build (Clang errors) for QA 2018-06-29 19:16:35 +02:00
sabrina-shanman
8cbe5e4541 Merge branch 'mac-shutdown-crash-frame-dtor' into fix-osx-crash-on-exit 2018-06-29 09:38:23 -07:00
Sam Gateau
3435e7ca87
Merge pull request #13499 from hyperlogic/bug-fix/space-process-resets-crash 
Guard against memory corruption in Space::processResets()
 2018-06-29 17:56:44 +02:00
Olivier Prat
de831ffea9 Switched shadow maps to sampler2DArrayShadow to try to fix on Mac 2018-06-29 16:55:33 +02:00
luiscuenca
2264425f9f Fix eyelid behaviour 2018-06-28 16:41:39 -07:00
Dante Ruiz
8c96597aba Merge branch 'master' of github.com:highfidelity/hifi into fix-billboard-crash 2018-06-28 16:25:52 -07:00
Dante Ruiz
847cad46ca fix billboard crash 2018-06-28 16:25:34 -07:00
Anthony J. Thibault
17f9a01fa2 Fix signed unsigned compare warning 2018-06-28 15:29:01 -07:00
Anthony Thibault
a5919ee3fa
Merge pull request #13497 from hyperlogic/bug-fix/script-engine-batchloader-memory-corruption-fix 
Fix memory corruption when running scripts using Script.require().
 2018-06-28 14:18:56 -07:00
Anthony J. Thibault
9772fc4e22 Guard against memory corruption in Space::processResets() 
Check the proxyID before reading from the _proxies vector and writing into the _owners vector.
 2018-06-28 14:04:59 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster 
The client should render "something" for an avatar even if mesh or identity is not available
 2018-06-28 12:12:16 -07:00
David Back
a8e231c5af floats .0f 2018-06-28 11:33:38 -07:00
Anthony J. Thibault
ac6fcf092c Fix memory corruption via lambdas that capture local variables by reference. 
The lambdas in ScriptEngine::fetchModuleSource() were referencing local stack variables by reference.
This could lead to un-expected results including memory corruption.
To workaround this issue the QTimer and QEventLoop variables are allocated on the heap and held onto by a shared_ptr.
This shared_ptr is passed to the lambda.

This will not result in cycles and should result in the QTimer and QEventLoop being destroyed when the BatchLoader
object they are connected to is deleted.
 2018-06-28 11:15:25 -07:00
David Back
f373880af7 Merge branch 'master' of https://github.com/highfidelity/hifi into zeroOutSpreads 2018-06-28 11:07:35 -07:00
Thijs Wenker
5029767493 InteractiveWindow scripting API 2018-06-28 19:04:08 +02:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve 
Fix audio device sometimes being on the wrong thread
 2018-06-28 09:59:00 -07:00
David Back
4f5a1bc340 zero out spread values for previous versions 2018-06-27 19:02:55 -07:00
John Conklin II
3f6be6d259
Merge pull request #13476 from luiscuenca/avatarClusterScaleFix 
Fix scaling avatar points twice
 2018-06-27 16:03:46 -07:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master 
move AddressManager to NodeList thread, make AccountManager safer
 2018-06-27 15:58:56 -07:00
John Conklin II
1f4346d221
Merge pull request #13427 from ctrlaltdavid/21897 
Stop desktop app window's QML source from running when window is closed
 2018-06-27 13:46:50 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892 
Fix entity detaching from head joint not becoming visible
 2018-06-27 12:32:52 -07:00
John Conklin II
c1d949351e
Merge pull request #13399 from kitely/roll-log-on-startup 
Always roll hifi-log.txt when starting
 2018-06-27 12:32:20 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
70cab27c1a add a safeguard deleteLater for QNetworkReply 2018-06-27 11:41:37 -07:00
Stephen Birarda
24f92502b5 add warning output of error from AccountManager 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
John Conklin II
e7d5ea561b
Merge pull request #13469 from hyperlogic/safeLandingFix4 
Fix for landing on the roof of some domains.
 2018-06-27 10:23:35 -07:00
sabrina-shanman
4afb19e091 Remove assert in ~Frame causing shutdown crash on Mac in dev build 2018-06-27 09:59:48 -07:00
Seth Alves
01632ddd29
Merge pull request #13345 from ctrlaltdavid/21890 
Fix memory leak when reloading scripts
 2018-06-27 09:39:53 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
ea76def2b5 more white space errors 2018-06-26 17:18:35 -07:00
amantley
1fcaf16b0c removed editor auto format errors 2018-06-26 17:07:55 -07:00
amantley
7ecf8c24df Merge remote-tracking branch 'upstream/master' into glowingOrbMaster 
syncing with upstream master
 2018-06-26 16:44:34 -07:00
amantley
a89c2ea734 removed crust 2018-06-26 16:40:51 -07:00
luiscuenca
fe571e9638 Fix scaling model twice 2018-06-26 16:37:12 -07:00
Sam Gondelman
7fb2e535ff
Merge pull request #13468 from SamGondelman/secondaryShadows 
Disable shadows in secondary camera
 2018-06-26 15:45:44 -07:00
amantley
2b6d470467 Merge remote-tracking branch 'upstream/master' into glowingOrbMaster 
syncing with master
 2018-06-26 15:16:41 -07:00
amantley
46c70d948f Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn 2018-06-26 15:11:58 -07:00
amantley
fa1a9d04e0 everything working before trying to move otheravatar to interface 2018-06-26 13:18:26 -07:00
SamGondelman
97ee02811c disable shadows in secondary camera 2018-06-26 12:27:59 -07:00
Dante Ruiz
d8834af749 make requested changes 2018-06-26 11:53:45 -07:00
Dante Ruiz
17f4a27ceb Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2 2018-06-26 10:55:27 -07:00
Sam Gondelman
fbe54437b8
Merge pull request #13409 from humbletim/add-raypick-shapeID 
Include shapeID in RayPick results
 2018-06-26 10:25:39 -07:00
Seth Alves
dcebbada28 fix various crashes-upon-exits 2018-06-26 10:08:44 -07:00
John Conklin II
0c9f0cbe03
Merge pull request #13443 from samcake/punk 
report FIx from rc69 to master: Fix for the point light test flashing in HMD
 2018-06-26 08:28:03 -07:00
Angus Antley
232dc21c7b add orb code added to otheravatar.cpp 2018-06-26 06:38:09 +01:00
Angus Antley
b8dea4b869 adding changes to add the orb when an avatar is processed by the avatar mixer 
and when a new model is being loaded for an avatar.  The orb is removed
when the geometry has loaded.
 2018-06-26 06:27:18 +01:00
Andrew Meadows
ca70b865d3
Merge pull request #13452 from AndrewMeadows/avatar-entities-001 
fix physics deactivation of avatar-entities
 2018-06-25 16:18:01 -07:00
Simon Walton
b63515f42a Send multiple copies of domain check-in for greater resilience 
Also move domain-limit check to start of NodeList::sendDomainServerCheckIn().
 2018-06-25 14:36:50 -07:00
John Conklin II
0e2675e0d8
Merge pull request #13392 from roxanneskelly/roxie-bugfixes 
Remove debug logging message spam for avatar entities that have scripts
 2018-06-25 10:42:43 -07:00
Anthony J. Thibault
328a485ad1 Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed. 2018-06-25 10:38:53 -07:00
Andrew Meadows
5e2a08b3c2 handle deactivation of avatar entities differently 2018-06-25 10:37:54 -07:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12:00
Simon Walton
dafd97b6f4 Duplicate domain check-ins after timeouts 2018-06-22 18:21:32 -07:00
Simon Walton
3775bdc335 Move PacketType::AvatarIdentityRequest so as to not break ICE 2018-06-22 17:20:43 -07:00
Simon Walton
269d803812 New approach to tracking no-identity duration 2018-06-22 16:42:37 -07:00
Sam Gateau
7b4b6bc3b8 Same fix as the point lighting flashing for rc69 in master 2018-06-22 14:59:37 -07:00
samcake
df3d689098 Try mono threaded and profiled 2018-06-22 14:59:37 -07:00
John Conklin II
b7069fff71
Merge pull request #13382 from SamGondelman/particleFix 
Fix Particle Entities
 2018-06-22 13:27:11 -07:00
Sam Gondelman
44a7d04b2a
Merge pull request #13426 from SamGondelman/avatarPriority 
Highest loading priorities for avatars and attachments
 2018-06-22 11:22:10 -07:00
SamGondelman
d37a8bcd72 more jsdoc updates 2018-06-22 10:13:18 -07:00
Sam Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
Simon Walton
6796af4b6a Move sendAvatarIdentityRequest() to a more logical location 2018-06-21 15:00:51 -07:00
John Conklin II
4088035b3b
Merge pull request #13411 from sabrina-shanman/crash-delete-cube 
Fix crash when deleting objects in serverless mode
 2018-06-21 14:39:07 -07:00
Sam Gondelman
afc64a18a1
Merge pull request #13362 from SamGondelman/modelTextures 
Fix transparent textures rendering wrong sometimes
 2018-06-21 14:23:49 -07:00
Sam Gateau
dea3f91c0b
Merge pull request #13421 from AndrewMeadows/fix-mac-nan-crash 
fix crash on Mac when watching someone else turn with HMD
 2018-06-21 11:55:39 -07:00
SamGondelman
8f411ad6c8 CR 2018-06-20 16:13:10 -07:00
sabrina-shanman
59833d8f28 Do not use boolean for variable definitions. Use bool instead. 2018-06-20 15:54:19 -07:00
Andrew Meadows
4424a8df11
Merge pull request #13303 from highfidelity/workload 
workload project part 1
 2018-06-20 15:39:01 -07:00
Cristian Luis Duarte
3837952418 Android - Add a clear method on pending downloads and use it when going background 2018-06-20 18:29:04 -03:00
sabrina-shanman
c039d20304 Fix objects snapping back when selected 2018-06-20 13:55:38 -07:00
SamGondelman
8014f61243 loading priorities for avatars and attachments 2018-06-20 12:29:28 -07:00
Simon Walton
d638bdd986 First pass at requesting ID for unknown data 
Keep list of AvatarData that was created from a
data packet without a matching ID. If items get
old enough send an ID request and remove them.
 2018-06-20 12:21:39 -07:00
Dante Ruiz
f891c37ac8 fix particle entity 2018-06-20 10:59:19 -07:00
David Rowe
764e00d9cf Stop desktop app window's QML source from running when window is closed 2018-06-20 15:48:40 +12:00
Dante Ruiz
3d4f164a9f fixing web entity and whitespace cleanup 2018-06-19 16:53:36 -07:00
Clement
2bf7db6952 setStereoInput always returns true to not break old scripts 2018-06-19 16:37:11 -07:00
Dante Ruiz
694c272424 fixed text entity 2018-06-19 16:27:10 -07:00
Andrew Meadows
92e98438d3 remove cruft 2018-06-19 16:22:10 -07:00
Andrew Meadows
17a0dd574a remove debug cruft 2018-06-19 14:36:57 -07:00
Andrew Meadows
b557717dab to avoid NaN: don not rely on glm::angle(quat) UYKWYAD 2018-06-19 14:27:27 -07:00
SamGondelman
de5fcccc7b proper reporting of nan values in get 2018-06-19 14:22:24 -07:00
Dante Ruiz
568ba6f777 fixing shape entity 2018-06-19 14:14:16 -07:00
SamGondelman
12a5d8b550 quiet ubuntu warnings, particle properties show radians 2018-06-19 12:51:35 -07:00
Simon Walton
5bf075457c Add avatar identity request packet 2018-06-19 10:21:30 -07:00
Andrew Meadows
44c3620b6e remove cruft 2018-06-18 17:45:58 -07:00
Atlante45
4a4c0d132e Make stereo interface async 2018-06-18 17:26:29 -07:00
Atlante45
29ff47c6fb Ensure audio devices are made on the right thread 2018-06-18 16:28:52 -07:00
sabrina-shanman
67c605c10a Do not use ownership tracking in serverless mode in PhysicalEntitySimulation 2018-06-18 16:12:38 -07:00
humbletim
dc5c5c20df raypick partIndex commit 
include shapeID for accessing proper material index

add raypick shapeID test script
 2018-06-18 18:22:30 -04:00
John Conklin II
9ace80c709
Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars 
RC69: avatars collide again (again)
 2018-06-18 15:21:47 -07:00
John Conklin II
a47038d81f
Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id 
Add main & render thread ids to crashpad annotations
 2018-06-18 15:21:04 -07:00
Sam Gateau
56a1137f7b
Merge pull request #13312 from SamGondelman/overlayPipelines 
Fix layered overlay rendering and highlight
 2018-06-18 14:35:03 -07:00
Andrew Meadows
a18ba36dd2 merge 'master' into 'workload' 2018-06-18 13:40:08 -07:00
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07:00
SamGondelman
0d34689320 spread variables jsdoc 2018-06-18 12:33:36 -07:00
SamGondelman
93fe0c60fa correctly update bounding box based on radius and other properties 2018-06-18 11:26:09 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
John Conklin II
87d26a9d86
Merge pull request #13304 from sabrina-shanman/btghostraytest 
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
 2018-06-18 10:22:17 -07:00
Elisa Lupin-Jimenez
b255cf0ba9
Merge pull request #13389 from AndrewMeadows/misc-001 
crash fixes, removing unnecessary writes, and misc cleanup
 2018-06-18 09:19:22 -07:00
Oren Hurvitz
0cb77362e8 Always roll hifi-log.txt when starting. 
Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.
 2018-06-17 13:44:14 +03:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +12:00
SamGondelman
7771661948 fix particle spread properties 2018-06-15 17:35:49 -07:00
Seth Alves
3c081c4bf8
Merge pull request #13377 from danteruiz/fix-double-scripts-on-reload 
prevent having more than one instance of a script running after reloading the script
 2018-06-15 17:17:35 -07:00
Roxanne Skelly
5bc7694ed6 Merge branch 'master' of https://github.com/highfidelity/hifi into roxie-bugfixes 2018-06-15 16:46:09 -07:00
Roxanne Skelly
f6c624dcc3 Remove logging messages for behaviors that are expected. 
Attached entities with scripts are now being sold on the marketplace
(rWatch) and are now being worn by various users.  Because of this, it's
now common for the 'removing entity scripts' case to be hit in code for
every update, which causes debug log messages every 60 seconds for each
entity entity with a script.

Repro: Have an avatar wear rWatch.  With a second instance of interface,
turn on verbose logging while the first avatar is local.  See debug logging
60 times a second.

Fix: Given attached entities with scripts are happening, it's not an
exceptional case and should probably not be logged.
 2018-06-15 16:31:09 -07:00
SamGondelman
9ea65950d5 particles: threadsafe, cleanup, rework initialized logic 2018-06-15 15:45:06 -07:00
SamGondelman
0b79e9f6c7 whoops 2018-06-15 15:13:29 -07:00
Sam Gondelman
225a98129a
Merge branch 'master' into modelTextures 2018-06-15 15:09:32 -07:00
Andrew Meadows
4880492d05 protect against bad menu pointer 2018-06-15 14:49:46 -07:00
Andrew Meadows
cdce598c35 protect against misuse of Sysmem::setSubData() 2018-06-15 14:49:07 -07:00
John Conklin II
2483c45f40
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly 
Remove functionality for rendering collision models directly in the Model class
 2018-06-15 14:46:40 -07:00
Andrew Meadows
670e07bbf5 fix crash for computing inertia for btBvhTriangleMeshShape 2018-06-15 14:31:51 -07:00
Andrew Meadows
551bfac85e fix crash mode for Animation::_geometry access before ready 2018-06-15 14:30:59 -07:00
Andrew Meadows
be0899c41d remove unnecessary writes to appease Xcode's static analyzer 2018-06-15 11:44:22 -07:00
Andrew Meadows
5a3350950b check pointer validity before dereference 2018-06-15 11:43:52 -07:00
Andrew Meadows
93ac70ead4 avoid crash in inertia calculation of btBvhTriangleMeshShape 2018-06-15 10:28:12 -07:00
Andrew Meadows
d0baa2d2a1 fix typos in simulation ownership documentation 2018-06-15 10:28:00 -07:00
Andrew Meadows
6331395a89 remove crash mode in invokable methods 2018-06-15 10:27:35 -07:00
sabrina-shanman
79fd3cb181 Rename createVisibleRenderItemSet() to createRenderItemSet() in Model class 2018-06-14 15:49:40 -07:00
sabrina-shanman
b2ec7f78c1 Remove signaling and render code for collision models in RenderableModelEntityItem and EntityTreeRenderer 2018-06-14 15:49:40 -07:00
sabrina-shanman
3c4050884e Remove straggler ifdef in Model class 2018-06-14 14:40:22 -07:00
Dante Ruiz
8b4b95f890 prevent have more than one instance of a script after reloading script 2018-06-14 14:00:40 -07:00
Zach Fox
3c681554de Fix MS13202: Don't save incomplete list of scripts to Settings while reloading scripts 2018-06-14 13:50:30 -07:00
John Conklin II
1b91ee555a
Merge pull request #13323 from kencooke/audio-mp3-decode 
Support MP3 files as sound assets
 2018-06-14 13:37:05 -07:00
sabrina-shanman
baf0df05cd Remove unnecessary 'this->' in rayTest parent function call 2018-06-14 13:16:46 -07:00
Anthony J. Thibault
84601446bf Add main thread id & machine fingerprint to crashpad annotations 2018-06-14 12:57:30 -07:00
Ken Cooke
15163d7125 CR: warnings use qCWarning() instead of qCDebug() 2018-06-14 09:44:58 -07:00
John Conklin II
d66ed07061
Merge pull request #12901 from kitely/fix-banning-users 
Fixed banning users
 2018-06-14 09:33:28 -07:00
SamGondelman
5ac7ced306 cleanup renderable model entity item, fix crash on reload, fix different transparent bug 2018-06-13 17:14:52 -07:00
Stephen Birarda
883c758722
Merge pull request #13144 from huffman/fix/remove-entity-server-backups 
Remove old entity backups and OctreePersistThread refactoring
 2018-06-13 15:25:46 -07:00
sabrina-shanman
82fddfc31f Remove unused constant in Model.cpp 2018-06-13 13:03:07 -07:00
Ryan Huffman
2b49d84a22 Add better error logging in Octree::writeToJSONFile 2018-06-13 12:57:06 -07:00
Ryan Huffman
c2f08dfdba Update Octree to atomically persist data 2018-06-13 12:24:09 -07:00
Ryan Huffman
b8f987f02e
Merge pull request #13359 from huffman/fix/script-resources-load 
Fix resources path URLs not working with Script.resolvePath
 2018-06-13 12:19:46 -07:00
Ryan Huffman
6b159d6124 Remove redundant read of octree data on startup 2018-06-13 11:54:20 -07:00
SamGondelman
c4670322ab Merge remote-tracking branch 'upstream/master' into modelTextures 2018-06-13 11:53:31 -07:00
Clément Brisset
11d84e780d
Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta 
Add uncompressed KTX files to baked texture output
 2018-06-13 11:49:41 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers 
handle semantic version numbers in interface/sandbox update
 2018-06-13 11:16:56 -07:00
Stephen Birarda
765850eee1
Merge pull request #13365 from huffman/fix/bake-texture-crash 
Fix crash in image baking due to undefined mip format
 2018-06-13 10:44:07 -07:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags 
Scripted Blendshapes and Procedural Face Movement Flags
 2018-06-13 10:32:59 -07:00
Sam Gondelman
e25c6c5316
Merge pull request #13356 from gcalero/show_jump_button 
Don't hide jump button while moving
 2018-06-13 09:52:30 -07:00
Ryan Huffman
569f7dc308 Fix crash in image baking due to undefined mip format 
A recent change caused formatMip to no longer be specified. This causes
an issue deeper in the code when generating mips, causing a
Q_UNREACHABLE to be hit.
 2018-06-13 08:33:22 -07:00