Dante Ruiz
|
71e8ccd190
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-21 16:20:16 -07:00 |
|
Bradley Austin Davis
|
d3fd2132ce
|
Merge pull request #13851 from samcake/black
Fix the local lights not working on AMD
|
2018-08-21 15:36:12 -07:00 |
|
sam gateau
|
30c0c44822
|
Completely remove the texcoord frame transform as we don;t use it at all
|
2018-08-21 14:52:42 -07:00 |
|
sam gateau
|
6b994ba39a
|
Completely remove the texcoord frame transform as we don;t use it at all
|
2018-08-21 14:51:54 -07:00 |
|
sam gateau
|
8c5aab7fa0
|
tabs!
|
2018-08-21 12:30:31 -07:00 |
|
sam gateau
|
b7d8b92fb5
|
Add comment in shader and fix bad cull mode
|
2018-08-21 12:25:27 -07:00 |
|
sam gateau
|
5ae604f341
|
REmove the texture Transform for deferred_light slv which then makes it work correctly on AMD
|
2018-08-21 12:14:32 -07:00 |
|
John Conklin II
|
1b4314ae45
|
Merge pull request #13846 from ctrlaltdavid/M17652-b
Reduce strength of teleport parabola
|
2018-08-21 11:32:40 -07:00 |
|
John Conklin II
|
ad835597e6
|
Merge pull request #13779 from amantley/perspectiveBug
Perspective bug
|
2018-08-21 11:31:14 -07:00 |
|
Dante Ruiz
|
b2fb2c7f98
|
fix build error
|
2018-08-21 10:45:59 -07:00 |
|
Dante Ruiz
|
db3d3d3d93
|
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
|
2018-08-21 09:56:59 -07:00 |
|
Wayne Chen
|
acc7d493ec
|
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
Safe landing client-side improvements
|
2018-08-20 20:36:17 -07:00 |
|
Simon Walton
|
8d6aaf3fb5
|
Tidy some method names per reviewer comment
|
2018-08-20 17:50:29 -07:00 |
|
John Conklin II
|
e6c81cdfba
|
Merge pull request #13833 from sabrina-shanman/stt_performance
Performance improvements for Collision Pick API
|
2018-08-20 17:34:46 -07:00 |
|
Sam Gateau
|
d237195944
|
Merge pull request #13840 from AndrewMeadows/revert-backfacing-triangle-hack
fix MyAvatar collision bug at transitions between meshes
|
2018-08-20 17:01:40 -07:00 |
|
David Rowe
|
67eb03ba7d
|
Reduce strength of teleport parabola
|
2018-08-21 11:18:00 +12:00 |
|
John Conklin II
|
7e03fc98b2
|
Merge pull request #13844 from SimonWalton-HiFi/node-kill-regexp
Fix killing of single node from DS web interface
|
2018-08-20 15:19:50 -07:00 |
|
John Conklin II
|
b28aa3951f
|
Merge pull request #13802 from jherico/feature/scribe_programs
Migrating to scribe program descriptors
|
2018-08-20 14:48:54 -07:00 |
|
John Conklin II
|
5db751e4be
|
Merge pull request #13839 from misslivirose/master
RC 72 Tutorial - MS17378
|
2018-08-20 14:21:25 -07:00 |
|
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 |
|
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 |
|
Andrew Meadows
|
3068865a6c
|
fix MyAvatar collision bug at transitions b/w meshes
|
2018-08-20 11:42:28 -07:00 |
|
sabrina-shanman
|
813290aad8
|
Do filtering with copy vector in CollisionPick::filterIntersections
|
2018-08-20 11:23:22 -07:00 |
|
Dante Ruiz
|
2261ad2bcb
|
clean up the interstitial page
|
2018-08-20 11:14:48 -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 |
|
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 |
|
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 |
|
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 |
|