SamGondelman
|
d01b438cb3
|
CR
|
2018-08-31 11:25:17 -07:00 |
|
SamGondelman
|
5f08ed5027
|
misc perf improvements
|
2018-08-30 16:55:15 -07:00 |
|
Sam Gateau
|
12ec56875e
|
Merge pull request #13867 from SamGondelman/recurse
findRayIntersection/findParabolaIntersection performance improvements
|
2018-08-30 09:49:16 -07:00 |
|
Sam Gondelman
|
cfffa65819
|
Merge pull request #13899 from SamGondelman/pointerPerf
Improve Pointer performance
|
2018-08-29 16:57:43 -07:00 |
|
John Conklin II
|
7298cb4654
|
Merge pull request #13888 from dback2/editControllerMapping
Edit mode controller mapping using new platform state variables
|
2018-08-29 16:06:47 -07:00 |
|
Zach Fox
|
67e57a9487
|
Merge pull request #13849 from zfox23/MS16003_backCloses
Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back
|
2018-08-29 14:29:12 -07:00 |
|
SamGondelman
|
cda8b82ead
|
improve pointer performance
|
2018-08-29 13:32:53 -07:00 |
|
John Conklin II
|
47ce8be526
|
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847
MS16847: Tablet button doesn't load in HMD mode
|
2018-08-29 13:20:04 -07:00 |
|
John Conklin II
|
26f76081e6
|
Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir
Read glTF resources from other than the main directory
|
2018-08-29 12:31:41 -07:00 |
|
David Back
|
96d2ba660c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-29 12:05:51 -07:00 |
|
David Back
|
0e53fa3f8b
|
only focus with selection
|
2018-08-29 12:05:46 -07:00 |
|
David Back
|
dcf2074d7e
|
remove [ camera key, allow F to enter camera without selection
|
2018-08-29 11:56:37 -07:00 |
|
Sam Gondelman
|
156f1dc60d
|
Merge pull request #13852 from Cristo86/android_lists_in_mem_cached_fast
Android - Domains and Users Lists - memory cache for quick loads
|
2018-08-29 11:24:12 -07:00 |
|
John Conklin II
|
4ab45e70a4
|
Merge pull request #13887 from sethalves/fix-pick-reg-point-1
fix far-grab laser-lock on entities with non-default registration point
|
2018-08-29 10:42:03 -07:00 |
|
SamGondelman
|
0c8a4cc81e
|
merge with master
|
2018-08-28 17:31:51 -07:00 |
|
Sam Gondelman
|
89bd24dd54
|
Merge pull request #13880 from SamGondelman/matCrash
Fix crash on shutdown in domain with material
|
2018-08-28 11:48:35 -07:00 |
|
Anthony Thibault
|
f281afa71f
|
Merge pull request #13874 from amantley/phaseWalkFix
Phase walk fix bug 17770
|
2018-08-28 11:29:29 -07:00 |
|
Sam Gateau
|
d9d23e7fcf
|
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars
Create N replicas of each other-avatar on the client side
|
2018-08-28 09:02:13 -07:00 |
|
David Back
|
511478a563
|
use not Mac instead of Windows
|
2018-08-27 18:11:19 -07:00 |
|
David Back
|
990638fd95
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-27 18:04:23 -07:00 |
|
luiscuenca
|
c19bd8968a
|
Fix mixer crash
|
2018-08-27 16:48:47 -07:00 |
|
David Back
|
f81fe6b29f
|
add more inputs to controller mapping
|
2018-08-27 16:35:36 -07:00 |
|
Seth Alves
|
52bbb4d2ab
|
fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix.
|
2018-08-27 16:21:01 -07:00 |
|
Sam Gateau
|
657373d02f
|
Merge pull request #13588 from jherico/bug/fb15594
Working on pauses in tomb domain
|
2018-08-27 15:56:55 -07:00 |
|
SamGondelman
|
aae06e8f49
|
faster aabox ray intersection and pre-computed inverse direction
|
2018-08-27 15:40:33 -07:00 |
|
David Back
|
75d7bf0424
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
|
2018-08-27 14:53:28 -07:00 |
|
David Back
|
b6edb2c9d6
|
platform states, edit controller mapping, separate mac/win delete
|
2018-08-27 14:53:13 -07:00 |
|
Brad Davis
|
945982b1bd
|
Working on pauses in tomb domain
|
2018-08-27 13:28:49 -07:00 |
|
Stephen Birarda
|
7ddd70a84a
|
Merge pull request #13871 from birarda/bug/double-domain-connect
force NodeList reset if DS changes session or local ID
|
2018-08-27 11:59:24 -07:00 |
|
John Conklin II
|
467fe56103
|
Merge pull request #13845 from SamGondelman/perf
Move blendshape packing to worker thread
|
2018-08-27 09:40:03 -07:00 |
|
luiscuenca
|
8ede6f1cd0
|
Fix removing my avatar and code standards
|
2018-08-27 06:55:52 -07:00 |
|
SamGondelman
|
ff6020e0ef
|
fix compile errors, maybe
|
2018-08-24 15:41:25 -07:00 |
|
SamGondelman
|
98d145dc24
|
fix crash on shutdown in domain with material
|
2018-08-24 15:19:48 -07:00 |
|
John Conklin II
|
fcdbc6c6d2
|
Merge pull request #13778 from SamGondelman/bloom
Enable bloom in zone properties
|
2018-08-24 14:46:31 -07:00 |
|
Stephen Birarda
|
d8b5a1a4a6
|
always remove old socket-matching node before add
|
2018-08-24 14:21:54 -07:00 |
|
SamGondelman
|
70f4d0c634
|
Merge remote-tracking branch 'upstream/master' into perf
|
2018-08-24 14:04:37 -07:00 |
|
Stephen Birarda
|
cb4ce4fedb
|
make sure settings are re-requested on new connection
|
2018-08-24 13:05:04 -07:00 |
|
John Conklin II
|
477fba4b15
|
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
workload tracks other avatars and adds/removes from physics simulation accordingly
|
2018-08-24 12:43:51 -07:00 |
|
luiscuenca
|
ddbadf5a69
|
change to Test API
|
2018-08-24 11:59:46 -07:00 |
|
SamGondelman
|
3d048c77ba
|
Merge remote-tracking branch 'upstream/master' into recurse
|
2018-08-24 11:39:05 -07:00 |
|
SamGondelman
|
1c0c17cecb
|
faster triangle intersection
|
2018-08-24 11:20:10 -07:00 |
|
luiscuenca
|
5654acf5bf
|
Fix warnings
|
2018-08-24 09:24:58 -07:00 |
|
Howard Stearns
|
9a472fa388
|
Merge pull request #13870 from zfox23/wallet_autologout
Implement Wallet Security feature - Auto Logout checkbox
|
2018-08-23 18:04:38 -07:00 |
|
luiscuenca
|
1fd0d7da94
|
Create API call
|
2018-08-23 18:03:27 -07:00 |
|
SamGondelman
|
b5b7167644
|
add to stats
|
2018-08-23 17:56:24 -07:00 |
|
John Conklin II
|
bc90d1a439
|
Merge pull request #13869 from zfox23/MS17738_fixBlastIcon
Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review
|
2018-08-23 17:40:24 -07:00 |
|
amantley
|
671bf32d58
|
removed whitespace
|
2018-08-23 17:36:35 -07:00 |
|
amantley
|
884be2f99d
|
removed comment and whitespace
|
2018-08-23 17:30:03 -07:00 |
|
amantley
|
0cc302f68c
|
set phase to 0.0
|
2018-08-23 17:28:38 -07:00 |
|
Zach Fox
|
dc1a33ba6e
|
Merge branch 'master' of github.com:highfidelity/hifi into wallet_autologout
|
2018-08-23 16:58:49 -07:00 |
|