Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69654 commits 25 branches 0 tags 1.1 GiB
Commit graph

28699 commits

Author SHA1 Message Date
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
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
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
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
John Conklin II
48002ee9fa
Merge pull request #13363 from Atlante45/new-master 
The last merge back
 2018-06-12 17:55:06 -07:00
Clément Brisset
91d7990d7a
Merge pull request #12854 from birarda/bug/hdr-format-static 
fix skybox bake assert on HDR_FORMAT static order initialization
 2018-06-12 17:19:27 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
Ryan Huffman
a558f71fcd Fix resoruces path URLs not working with Script.resolvePath 
Depending on the context, "/~/" means different things. The ScriptEngine
resolves this path to `/scripts`, but everywhere else it resolves to
`/resources`. This change forces us to expand those paths instead of
storing the "/~/" path, which will be incorrectly resolved once the
ScriptEnging is using it.
 2018-06-12 16:55:31 -07:00
SamGondelman
10a0f77d4c FINALLY fix transparent textures rendering wrong 2018-06-12 16:48:47 -07:00
Stephen Birarda
016a6dcd84 use ref for HDR_FORMAT to avoid static order 2018-06-12 16:31:57 -07:00
Simon Walton
9ae3411abe Have ~OctreeProcessor break cycle instead of using weak pointers 2018-06-12 12:32:27 -07:00
Gabriel
649ffbe259
Don't hide jump button while moving 2018-06-12 16:15:54 -03:00
Andrew Meadows
d31ee52d79 revert PR-13162 from RC68 2018-06-12 03:51:55 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Ryan Huffman
015c092e1c Update oven to only produce uncompressed ktx for cubemaps 2018-06-11 16:37:40 -07:00
Ryan Huffman
38df5d3db5 Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta 2018-06-11 16:17:56 -07:00
Sam Gondelman
e8ec32c7f8
Merge pull request #13340 from SamGondelman/modelTextures 
Try to fix ModelOverlay texture loading
 2018-06-11 16:09:10 -07:00
sabrina-shanman
d4d8f36e44 Change CharacterGhostObject to use base btGhostObject class instead of btPairCachingGhostObject 2018-06-11 15:40:39 -07:00
Simon Walton
99a8ecc6db Break simulation/entity-tree cycle 2018-06-11 13:52:44 -07:00
Simon Walton
5ae79bcc5e Use weak_ptr<EntityTree> for pointers back to parent 2018-06-11 13:05:42 -07:00
Sam Gateau
82eec46402
Merge pull request #13346 from jherico/fix/particle_shader 
Fix particle entity shader
 2018-06-11 12:10:47 -07:00
Stephen Birarda
b41c80f31e
Merge pull request #13221 from huffman/feat/oven-cli-texture-options 
Add more texture options to Oven CLI
 2018-06-11 12:01:56 -07:00
Ryan Huffman
fa22ea7630 Update ES to keep the backup that pushes file size over the limit 2018-06-11 11:58:50 -07:00
John Conklin II
6794fedf5b
Merge pull request #13337 from ctrlaltdavid/21887 
Don't save user location if not connected to domain
 2018-06-11 11:09:57 -07:00
sabrina-shanman
4c39d08358 Remove "Draw Collision Shapes" option from developer physics menu 2018-06-11 11:03:57 -07:00
sabrina-shanman
440c77905a Remove functionality for rendering collision meshes directly in the Model class 2018-06-11 11:03:57 -07:00
Stephen Birarda
10e34000aa
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains 
Domain-unreachable message remaining on slow connects
 2018-06-11 10:46:55 -07:00
Ryan Huffman
11a48915e2 Fix order of variable initialization in OctreePersistThread 2018-06-11 09:48:22 -07:00
Sam Gondelman
be28097279
Merge pull request #13339 from SamGondelman/avatarHash 
Possibly fix avatarHash crash
 2018-06-11 09:39:40 -07:00
Ryan Huffman
94069c964d Remove unused variable and log message in OctreePersistThread 2018-06-11 08:37:19 -07:00
Brad Davis
380137a660 Fix particle entity shader 2018-06-10 12:15:00 -07:00
Ken Cooke
16eefe7f14 Ensure self-sufficient headers 2018-06-09 19:44:12 -07:00
David Rowe
9338c217cd Fix memory leak when reloading scripts 2018-06-09 16:58:49 +12:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode 
Center of Gravity Leaning
 2018-06-08 17:53:55 -07:00
Stephen Birarda
9506e7edbe check for update for dev-builds, handle semantic version 2018-06-08 17:20:57 -07:00
Ryan Huffman
9afc9d19c5 Cleanup comments and process structure in OctreePersistThread 2018-06-08 16:22:11 -07:00
Ryan Huffman
d0af06939f Update persistInterval to use std::chrono in OctreePersistThread 2018-06-08 16:22:11 -07:00
Ryan Huffman
8f4f3db9ce Add octree backup file cleanup 2018-06-08 16:22:11 -07:00
Ryan Huffman
d476146a56 Move OctreePersistThread off GenericThread and add octree negotiation 2018-06-08 16:22:11 -07:00
Anthony J. Thibault
c3da4e74de Code review feedback 2018-06-08 16:22:00 -07:00
Ryan Huffman
2143bae100 Remove unused entity server backups 
The domain server now handles entity backups so this code is no longer
used.

This also fixes a bug where, if the entity server went down while
writing the persist file, it would leave a lock file behind. When
starting up the next time it would try to recover from the last backup.
Because the entity server no longer gets any backup rules, and the way
it searches for backups, it would end up finding the lock file and
treating it as the most recent backup. This meant that the
models.json.gz file was replaced with an empty file.
 2018-06-08 16:17:30 -07:00
Seth Alves
a2399ea1f6 keep small masses from introducing NaN into bullet's calculations 2018-06-08 16:07:01 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers 
add SHA to PR/master version, add build_type (stable/master/pr/dev)
 2018-06-08 14:44:22 -07:00
Simon Walton
740ccd3495 Merge branch 'master' into memcheck-fixes 2018-06-08 14:21:57 -07:00
Sam Gondelman
c7f05d96b4
Merge pull request #13309 from Cristo86/android_crashes_domains 
Android - Double Click crash and dev-mobile crash with Pixel XL
 2018-06-08 13:36:53 -07:00
Ryan Huffman
3e65e0b0cd Update processImage to not compress by default 2018-06-08 13:21:47 -07:00
Ryan Huffman
24182d3451 Remove compression variables & functions in image.cpp 2018-06-08 12:14:52 -07:00
Ryan Huffman
faafd26d2a Add uncompressed KTX files to baked texture output 2018-06-08 11:39:47 -07:00
Sam Gondelman
4e649d2498
Merge pull request #13276 from SamGondelman/resource 
Protect against null resource
 2018-06-08 11:35:04 -07:00
SamGondelman
a7d75b121f fix avatarHash crash 2018-06-08 11:20:41 -07:00
Simon Walton
131a57248b NLPacket local ID could be used uninitialized (according to valgrind) 2018-06-08 10:27:03 -07:00
amantley
dabcd4c234 fixed bracket spacing in HeadData.h 2018-06-08 10:19:33 -07:00
Sam Gateau
7f8af47075
Merge pull request #13326 from SamGondelman/green 
Fix models starting as green boxes
 2018-06-08 10:09:53 -07:00
David Back
e8aece4c11
Merge pull request #13315 from dback2/avatarFeet 
Fix default avatar feet
 2018-06-08 10:00:43 -07:00
Ken Cooke
c69b006eac Fix compiler warnings 2018-06-08 06:29:30 -07:00
amantley
b1c578ecaa fixed white space in head.cpp 2018-06-07 22:13:53 -07:00
David Rowe
8e1e93abb0 Don't save user location if not connected to domain 2018-06-08 15:04:01 +12:00
amantley
3f58202667 updated the AvatarMixerPacketVersion to ProceduralFaceMovementFlagsAndBlendshapes in PacketHeaders.cpp 2018-06-07 17:41:12 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes 
synching with upstream master
 2018-06-07 16:20:11 -07:00
amantley
22f2583556 removed debug print statement in AvatarData.cpp 2018-06-07 16:17:33 -07:00
Ken Cooke
318c30373f Fix compiler warnings 2018-06-07 15:45:46 -07:00
amantley
67fc7b90b5 fixed get and set semi nibble to deal with 16 bits 2018-06-07 15:43:21 -07:00
David Back
9a7e199528
Merge pull request #13270 from dback2/cloneables 
Use version from JSON on domain restore
 2018-06-07 15:15:43 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
Ken Cooke
da63ad53f2 Fix compiler warnings 2018-06-07 14:49:05 -07:00
howard-stearns
df0ecb44a8 fix crash setting model texture 
(cherry picked from commit b152bf02af4eb17cf5c169ca9c577154c83901f7)
 2018-06-07 13:21:45 -07:00
Alexander Ivash
da92ff993f terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME 2018-06-07 13:12:35 -07:00
SamGondelman
c18602d22e fix models starting as green boxes 2018-06-07 13:03:56 -07:00
amantley
97831e61f0 removed stray comments 2018-06-07 12:54:46 -07:00
John Conklin II
66b66d5248
Merge pull request #13311 from ElderOrb/FB14390 
terminate thread if it didn't complete during MAX_SCRIPT_QUITTING_TIME
 2018-06-07 11:22:57 -07:00
John Conklin II
be9938013f
Merge pull request #13271 from Cristo86/android_joystick_jumps_fix 
Fix joystick and view control bug that makes it bounce
 2018-06-07 11:18:26 -07:00
John Conklin II
277758cd03
Merge pull request #13275 from luiscuenca/fixNoAvatarMaterials 
Check for null material pointer in CauterizedModel
 2018-06-07 09:41:03 -07:00
Sam Gateau
146732a20f
Merge pull request #13317 from jherico/feature/mac_resources 
Use binary resources on OSX
 2018-06-07 09:38:00 -07:00
John Conklin II
2b6fdb6b69
Merge pull request #13217 from Atlante45/fix/ds-memory 
Fix uploaded content archives taking too much memory
 2018-06-07 09:37:41 -07:00
Ken Cooke
a9b3d93260 Fix compiler warnings 2018-06-07 08:37:48 -07:00
Ken Cooke
41f3d81443 Include boilerplate MIT License in comments 2018-06-07 08:21:31 -07:00
Ken Cooke
bc4d900f7d Support MP3 files as sound assets 2018-06-07 06:57:06 -07:00
Ken Cooke
22ca20e33a Add MP3 decoder 2018-06-07 06:54:51 -07:00