Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 14:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
71060 commits 6 branches 1 tag 1.1 GiB
Commit graph

71060 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
c876cda89d
Merge pull request #13826 from ctrlaltdavid/M17615 
Disable Vive teleport button if transitioning from direction button
 2018-08-20 14:05:45 -07:00
Simon Walton
217e4efdda Fix regex for web i/f single-node kill 2018-08-20 13:43:48 -07:00
luiscuenca
dc0fbcca59 Include avatar entities on recordings 2018-08-20 13:10:36 -07:00
sabrina-shanman
9c36519e87 Fix cross-platform build error in ColliisonPick.cpp (binding to temporary) 2018-08-20 12:42:23 -07:00
Simon Walton
a891b74fac Reset SafeLanding in all cases 
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
 2018-08-20 12:31:21 -07:00
luiscuenca
c564119edc Keep attachments when playing back recordings 2018-08-20 11:58:19 -07:00
Andrew Meadows
3068865a6c fix MyAvatar collision bug at transitions b/w meshes 2018-08-20 11:42:28 -07:00
SamGondelman
05ff99a1d2 working on blendshapes 2018-08-20 11:40:25 -07:00
sabrina-shanman
813290aad8 Do filtering with copy vector in CollisionPick::filterIntersections 2018-08-20 11:23:22 -07:00
John Conklin II
3f92430bb6
Merge pull request #13369 from SimonWalton-HiFi/check-pfx-file 
Don't sign a production Windows installer if there's no key file
 2018-08-20 11:14:00 -07:00
Liv Erickson
5ffe539360 change to tutorial audio file from mono to stereo files 2018-08-20 11:11:03 -07:00
sabrina-shanman
444224a11a Fix ignoring elements in CollisionPick::filterIntersections 2018-08-20 11:07:52 -07:00
luiscuenca
d9b136cf5d Read resources from other than the main directory 2018-08-20 11:06:51 -07:00
sabrina-shanman
74f482b361 Revert "Convert entityIntersections/avatarIntersections lists in" 
This reverts commit aa4a6b2eae.
 2018-08-20 10:15:28 -07:00
Sam Gateau
adc8a39c87 Merge branch 'master' of github.com:highfidelity/hifi into punk 2018-08-20 09:32:42 -07:00
sabrina-shanman
2a182a0033 Revert "Do not create a reference to a shared pointer in CollisionPick.cpp" 
This reverts commit 130cb70a52.
 2018-08-20 09:24:07 -07:00
Ryan Huffman
ead0126365
Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities 
MS17562: CreateApp - newly created Entity rotation should be zero
 2018-08-20 09:07:38 -07:00
luiscuenca
50cc68c63e Recording app doesn't record old attachments 2018-08-19 12:43:06 -07:00
Sam Gateau
60765902fb Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-08-18 15:04:43 -07:00
Alexander Ivash
9f92ff5de9 fix for duplicating wearables on saving 
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
 2018-08-18 16:38:35 +03:00
Alexander Ivash
3bcd6f4a25 take 'relayParentJoints' into account during wearables comparison 2018-08-18 16:33:30 +03:00
Alexander Ivash
877bce23d2 explicitely specify localRotations on joint change, otherwise it will be updated by engine 2018-08-18 16:32:31 +03:00
John Conklin II
c8addd0581
Merge pull request #13730 from Cristo86/android_friends_main 
Android - Friends in home screen menu
 2018-08-17 16:58:45 -07:00
sabrina-shanman
51940898d9 Do not implicitly convert size of vector to bool in CollisionPick::filterIntersections 2018-08-17 16:23:31 -07:00
David Rowe
26576fa760 Fix Vive left/right buttons not disabling teleport 2018-08-18 09:34:16 +12:00
sabrina-shanman
6081d63f53 Use std::vector::insert for merging CollisionPickResults 2018-08-17 14:23:02 -07:00
sabrina-shanman
e3c39020dc Exit early from CollisionPick::filterIntersections on empty blacklist 2018-08-17 14:23:02 -07:00
sabrina-shanman
2933038d04 Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum 2018-08-17 14:22:42 -07:00
Cristian Luis Duarte
ccb5bae4b6 Android - People - Code review 2018-08-17 14:24:04 -03:00
John Conklin II
aa6ed008e1
Merge pull request #13835 from AndrewMeadows/less-avatar-flicker 
fix for vanishing other avatars
 2018-08-17 09:06:50 -07:00
Cristian Luis Duarte
4851b44de1 Android - People - Hide actions panel after remove 2018-08-16 19:39:44 -03:00
sabrina-shanman
b65572725d Merge branch 'master' into stt_performance 2018-08-16 14:44:58 -07:00
Andrew Meadows
90429f07cb don't forget to use enqueue the Transaction 2018-08-16 14:38:32 -07:00
David Rowe
5328b48acc Make Vive snap turn buttons lock teleport, also 2018-08-17 09:09:11 +12:00
David Rowe
bf733ded0f Handle Vive controller not being available at start-up 2018-08-17 09:08:28 +12:00
Cristian Luis Duarte
a3927f4d4c Android - People - Remove fragments and stack related logs 2018-08-16 17:31:31 -03:00
Cristian Luis Duarte
99760e2b40 Android - People - Better navigation after logged in prevents log in screen to appear after pressing back 2018-08-16 17:29:25 -03:00
John Conklin II
0c0ecd18c9
Merge pull request #13827 from amantley/newJumpWalkMotions 
Replacing jump_takeoff.fbx and jump_land.fbx animations to fix transition to fly bug
 2018-08-16 13:26:37 -07:00
John Conklin II
7f3bbaf3f8
Merge pull request #13755 from SimonWalton-HiFi/script-agent-destroy-engine 
Fix for ScriptEngines not being released upon AC shutdown
 2018-08-16 13:16:04 -07:00
John Conklin II
bbf6162361
Merge pull request #13632 from Atlante45/fix/udt-rtt 
Fix potential reliable connection lockup.
 2018-08-16 13:15:23 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
sabrina-shanman
130cb70a52 Do not create a reference to a shared pointer in CollisionPick.cpp 2018-08-16 10:39:13 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable 
Use Create Entities as Grabbable option when adding asset to world
 2018-08-16 09:22:23 -07:00
sabrina-shanman
67ff05739a Take advantage of CollisionPickResult intersections being shared pointers to avoid copying on result comparison 2018-08-16 09:00:30 -07:00
sabrina-shanman
aa4a6b2eae Convert entityIntersections/avatarIntersections lists in 
CollisionPickResult to shared pointers
 2018-08-16 08:59:29 -07:00
Cristian Luis Duarte
a01b00b3d8 delete access token log 2018-08-16 12:36:25 -03:00
John Conklin II
22168e84af
Merge pull request #13828 from huffman/fix/synthesized-release-event-text 
Fix functionality sometimes getting stuck if window loses focus (handshake, for instance)
 2018-08-16 08:21:58 -07:00
John Conklin II
96fd4704ac
Merge pull request #13829 from huffman/fix/edit-zoom-stuck 
Fix edit orbit camera getting stuck zooming
 2018-08-16 08:21:31 -07:00
John Conklin II
cb3ad63f77
Merge pull request #13831 from huffman/fix/edit-not-populating 
Force entity list tool to refresh when opened
 2018-08-16 08:21:04 -07:00
David Rowe
8d1b947bbd Fix variable names 2018-08-16 13:35:36 +12:00