Olivier Prat
|
9bc85b3e5d
|
Fixed android build
|
2018-09-27 15:43:37 +02:00 |
|
Olivier Prat
|
9cd963af95
|
Added generateTextureMipsWithPipeline function in batch
|
2018-09-27 10:26:51 +02:00 |
|
John Conklin II
|
7701cfd9c8
|
Merge pull request #14084 from luiscuenca/appearOnFloorFix
Fix avatars loading below the ground bug
|
2018-09-26 16:00:53 -07:00 |
|
John Conklin II
|
70c7ffcc71
|
Merge pull request #14069 from AndrewMeadows/avatar-collisions-002
fix MyAvatar-vs-OtherAvatar collisions
|
2018-09-26 15:21:18 -07:00 |
|
John Conklin II
|
b02e2c8123
|
Merge pull request #14081 from SamGondelman/blendshapes
Improve ModelBlender queuing
|
2018-09-26 15:10:02 -07:00 |
|
John Conklin II
|
c1dc0ff2ec
|
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
Prevent thread issues with PickResults modified by Pointers
|
2018-09-26 12:12:58 -07:00 |
|
John Conklin II
|
7df90881cd
|
Merge pull request #14007 from kkurian/marketplace-item-tester
Marketplace item tester interface
|
2018-09-26 11:25:53 -07:00 |
|
John Conklin II
|
6c47ba0dc7
|
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
Use C++ chrono system_clock for timestamps
|
2018-09-26 11:22:49 -07:00 |
|
John Conklin II
|
d1771b2928
|
Merge pull request #14058 from danteruiz/fix-dispacther-module-order
fix equip while keeping new functionality
|
2018-09-26 11:06:45 -07:00 |
|
John Conklin II
|
0de433c7c7
|
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
fix for deadlock in other avatar entity removal from tree
|
2018-09-26 09:58:26 -07:00 |
|
John Conklin II
|
c5ff72bd20
|
Merge pull request #14024 from wayne-chen/toggle404Redirect
Toggle going to 404 redirect domain
|
2018-09-25 20:44:57 -07:00 |
|
Kerry Ivan Kurian
|
28ec98be9e
|
Uninstall marketplace item tester on wallet shutdown
|
2018-09-25 19:24:46 -07:00 |
|
luiscuenca
|
754653b093
|
Fix warnings
|
2018-09-25 17:31:18 -07:00 |
|
luiscuenca
|
82b08f1a93
|
Wait until skeleton is loaded to locate the avatar
|
2018-09-25 16:21:05 -07:00 |
|
John Conklin II
|
3d71dfc467
|
Merge pull request #14072 from SamGondelman/highlight
Fix avatar highlighting
|
2018-09-25 16:13:14 -07:00 |
|
Kerry Ivan Kurian
|
e6249e690e
|
Remove duplicate line
|
2018-09-25 15:52:26 -07:00 |
|
John Conklin II
|
19438d143e
|
Merge pull request #14073 from jherico/fix/18069_test
Working on Vive shutdown issues
|
2018-09-25 15:41:32 -07:00 |
|
Kerry Ivan Kurian
|
276125937c
|
Eliminate double equals
|
2018-09-25 15:18:12 -07:00 |
|
Kerry Ivan Kurian
|
4e7b03883f
|
Use triple equals
|
2018-09-25 15:13:26 -07:00 |
|
Brad Davis
|
15de0590e8
|
Cleaning up commented out code
|
2018-09-25 13:18:49 -07:00 |
|
Brad Davis
|
5adc4c2290
|
Protect against null pointer usage in sound scripting wrapper
|
2018-09-25 13:17:49 -07:00 |
|
sabrina-shanman
|
55ab0a394b
|
Return std::make_shared
|
2018-09-25 12:21:22 -07:00 |
|
SamGondelman
|
21cd3948ae
|
improve blender queuing
|
2018-09-25 12:07:05 -07:00 |
|
sabrina-shanman
|
6e83e96d1c
|
Check type in Pointer::getPickResultCopy
|
2018-09-25 12:05:47 -07:00 |
|
sabrina-shanman
|
660bdf36d0
|
Check if pick result is null when building visual pick result
|
2018-09-25 09:56:51 -07:00 |
|
sabrina-shanman
|
8dd36e465b
|
Merge branch 'master' into crash_ray-pick-dtor_pointer-only
|
2018-09-25 09:22:30 -07:00 |
|
sabrina-shanman
|
eca31e7a99
|
Fix instantiating abstract class when creating visual pick result for pointers
|
2018-09-25 09:20:57 -07:00 |
|
Kerry Ivan Kurian
|
ff83713365
|
Use persistent object id counter
|
2018-09-25 00:58:01 -07:00 |
|
Kerry Ivan Kurian
|
ca1da9c830
|
Implement delete-from-list functionality in marketplace item tester
|
2018-09-25 00:57:59 -07:00 |
|
Kerry Ivan Kurian
|
505e08b841
|
Resolve merge conflicts
|
2018-09-25 00:57:43 -07:00 |
|
Kerry Ivan Kurian
|
0a43c17ce0
|
Use entity-specific glyphs in marketplace item tester
|
2018-09-24 21:15:08 -07:00 |
|
sabrina-shanman
|
5dbebd4aae
|
Add comment explaining why visualPickResult is a copy
|
2018-09-24 17:36:24 -07:00 |
|
John Conklin II
|
be23d07621
|
Merge pull request #14010 from sethalves/thread-safe-settings
make settings thread safe
|
2018-09-24 17:24:50 -07:00 |
|
sabrina-shanman
|
7f189e4d10
|
Make visualPickResult used by Pointers a private copy
|
2018-09-24 17:15:56 -07:00 |
|
Kerry Ivan Kurian
|
697f556a60
|
Persist list of marketplace items in test
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
|
2018-09-24 16:30:49 -07:00 |
|
Andrew Meadows
|
a3f946dee1
|
activate OtherAvarar in physics sim on position change
|
2018-09-24 16:27:37 -07:00 |
|
Wayne Chen
|
69d5299362
|
patching fix for previous commits
|
2018-09-24 15:22:46 -07:00 |
|
Brad Davis
|
72fc686ec1
|
Fix timer managmement during shutdown
|
2018-09-24 14:52:13 -07:00 |
|
John Conklin II
|
55848e6959
|
Merge pull request #14008 from sethalves/fix-local-angular-velocity
fix bug that caused localAngularVelocity to get zeroed out
|
2018-09-24 14:32:57 -07:00 |
|
SamGondelman
|
ad73cb3996
|
fix avatar highlighting
|
2018-09-24 14:02:35 -07:00 |
|
Wayne Chen
|
ac5814a1f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
|
2018-09-24 13:57:23 -07:00 |
|
John Conklin II
|
a602bff217
|
Merge pull request #13981 from gcalero/android_settings
Android settings (AEC)
|
2018-09-24 13:55:30 -07:00 |
|
John Conklin II
|
1f6f51993d
|
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit
Remove verbose logging of keyboard messages in edit.js and gridTool.js
|
2018-09-24 12:54:43 -07:00 |
|
John Conklin II
|
45b206d748
|
Merge pull request #14065 from SamGondelman/blendshapeCrash
Fix blendshape crash on avatar removal
|
2018-09-24 12:39:52 -07:00 |
|
Andrew Meadows
|
c1d65f5118
|
update avatar shape after it loads
|
2018-09-24 12:07:08 -07:00 |
|
John Conklin II
|
d520152a95
|
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
Small Improvements to Anim Stats
|
2018-09-24 11:56:01 -07:00 |
|
Stephen Birarda
|
b31837168d
|
fix bad lock, optimize some operations, clarify comment
|
2018-09-24 11:27:20 -07:00 |
|
John Conklin II
|
9916496118
|
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74
Fix entity list selection failing when selecting entities not in list
|
2018-09-24 11:02:36 -07:00 |
|
SamGondelman
|
d772cdb34a
|
please
|
2018-09-24 10:16:35 -07:00 |
|
Dante Ruiz
|
d4450ac780
|
fix equip and keeping new functionallity
|
2018-09-21 15:59:00 -07:00 |
|