sabrina-shanman
|
74f482b361
|
Revert "Convert entityIntersections/avatarIntersections lists in"
This reverts commit aa4a6b2eae.
|
2018-08-20 10:15:28 -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 |
|
sabrina-shanman
|
51940898d9
|
Do not implicitly convert size of vector to bool in CollisionPick::filterIntersections
|
2018-08-17 16:23:31 -07: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 |
|
sabrina-shanman
|
b65572725d
|
Merge branch 'master' into stt_performance
|
2018-08-16 14:44:58 -07: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 |
|
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 |
|
Ryan Huffman
|
2f833f16d8
|
Force entity list tool to refresh when opened
|
2018-08-15 14:19:20 -07:00 |
|
Ryan Huffman
|
24af22a52f
|
Fix edit orbit camera getting stuck zooming
|
2018-08-15 13:56:44 -07:00 |
|
Sam Gondelman
|
5f4f232602
|
Merge pull request #13604 from huffman/feat/oven-etc2
Add ETC2 support to Oven
|
2018-08-15 13:55:44 -07:00 |
|
Ryan Huffman
|
5d44877f56
|
Fix functionality sometimes getting stuck if window loses focus
|
2018-08-15 13:32:58 -07:00 |
|
sabrina-shanman
|
61d12923ea
|
Do not copy list of collision pick contact points when filtering them
|
2018-08-15 11:12:50 -07:00 |
|
sabrina-shanman
|
83ededfd37
|
Pass collision filter flags into AllContactsCallback for more efficient collision filtering
|
2018-08-15 11:12:50 -07:00 |
|
amantley
|
0a1a75f752
|
Merge remote-tracking branch 'upstream/master' into newJumpWalkMotions
|
2018-08-15 10:26:24 -07:00 |
|
amantley
|
8b5f96a023
|
removed spin2App.js
|
2018-08-15 10:23:40 -07:00 |
|
amantley
|
48e08276bf
|
added new jump_takeoff and jump_land to fix the tposing in the transition to and from flying
|
2018-08-15 10:20:17 -07:00 |
|
John Conklin II
|
d1a80e57be
|
Merge pull request #13809 from birarda/feat/reliable-avatar-kill
make avatar kill packets from mixer reliable
|
2018-08-15 10:00:22 -07:00 |
|
Seth Alves
|
83718ca06d
|
Merge pull request #13746 from alexiamandeville/emoteIcon
updating emote app icon
|
2018-08-15 08:29:48 -07:00 |
|
Kerry Ivan Kurian
|
6a34bde49c
|
Merge pull request #13825 from roxanneskelly/autoScroll
Auto scroll
|
2018-08-14 20:56:53 -07:00 |
|
John Conklin II
|
032e67fd8e
|
Merge pull request #13748 from ElderOrb/FB16831
FB16831 qml-related warnings in log
|
2018-08-14 16:40:07 -07:00 |
|
Roxanne Skelly
|
50b0a458ce
|
Changes as requested by zfox23 - Start and stop timers on hover only if scroll is enabled.
|
2018-08-14 16:32:56 -07:00 |
|
Seth Alves
|
3623590e90
|
Merge pull request #13784 from sethalves/far-point-joints
Far point joints
|
2018-08-14 15:40:07 -07:00 |
|
Roxanne Skelly
|
5a8da4ce97
|
Fix 'hover-to-pause' functionality of AutoScroll Featured Stories list in the goto app
|
2018-08-14 15:28:22 -07:00 |
|
Roxanne Skelly
|
987d8569ae
|
Merge branch 'autoScrollGoTo' of https://github.com/zfox23/hifi into autoScroll
|
2018-08-14 15:27:22 -07:00 |
|
John Conklin II
|
a5bace4e4d
|
Merge pull request #13706 from ElderOrb/FB17062
use updated 'Last Legends: Male' from Mukul
|
2018-08-14 14:18:39 -07:00 |
|
John Conklin II
|
007652632c
|
Merge pull request #13724 from gcalero/android_audio_fixes3
Android audio tests
|
2018-08-14 13:57:59 -07:00 |
|
Ryan Huffman
|
19f27ec911
|
Merge pull request #13810 from ctrlaltdavid/M11360
Don't auto-action entry in HMD file dialog when single-click
|
2018-08-14 12:57:28 -07:00 |
|
John Conklin II
|
8c5344ad1a
|
Merge pull request #13781 from thoys/fix/localAngularVelocityZeroesOut
MS17380: Create App fix for angularVelocity zeroing out on duplication or undo
|
2018-08-14 11:37:33 -07:00 |
|
Alexander Ivash
|
4478733c27
|
fix coding conventions
|
2018-08-14 21:18:54 +03:00 |
|
Seth Alves
|
dce7b6eae6
|
Merge pull request #13714 from sabrina-shanman/safe-teleport-target
Create CollisionPick API
|
2018-08-14 09:56:51 -07:00 |
|
Seth Alves
|
41e9c3a2ad
|
Merge pull request #13820 from AndrewMeadows/dont-try-physics-for-invalid-models
don't attempt physics with invalid modelURL
|
2018-08-14 09:47:37 -07:00 |
|
Seth Alves
|
e5e9339a7b
|
Merge pull request #13819 from ElderOrb/FB16914
Avatar bookmarks missing from Avatar Favorites
|
2018-08-14 09:46:37 -07:00 |
|
Seth Alves
|
527b27da96
|
pseudo-joints for far-grab positions
|
2018-08-14 08:55:20 -07:00 |
|
Seth Alves
|
832eefd3a2
|
Merge pull request #13752 from ctrlaltdavid/M17208
Improve text in Avatar app's pop-ups
|
2018-08-14 08:48:04 -07:00 |
|
Seth Alves
|
54fa7dd0b6
|
Merge pull request #13817 from sethalves/fix-desktop-handshake
fix desktop press-x handshake
|
2018-08-14 08:42:10 -07:00 |
|
sabrina-shanman
|
2576d502ab
|
Remove unused getter for btCollisionWorld in PhysicsEngine
|
2018-08-13 17:27:57 -07:00 |
|
Ryan Huffman
|
0fcf1517a5
|
Fix TextureCache not correctly choosing gl41 when gl45 is disabled
|
2018-08-13 16:35:21 -07:00 |
|
John Conklin II
|
73ef2ff09c
|
Merge pull request #13804 from thoys/fix/create/cantMoveFocusCameraOutPastLowLimit
MS17291: Create-app increase focus distance limit
|
2018-08-13 14:58:17 -07:00 |
|
sabrina-shanman
|
e5cb078133
|
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
|
2018-08-13 14:51:37 -07:00 |
|