David Back
|
ececd1c60f
|
fix loop index change
|
2018-02-02 17:14:48 -08:00 |
|
David Back
|
7621ba180d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
|
2018-02-02 17:05:34 -08:00 |
|
David Back
|
ed4cbe2679
|
fix fill ring rotation
|
2018-02-02 17:05:25 -08:00 |
|
David Back
|
1e7717b491
|
remove debug line
|
2018-02-02 16:46:12 -08:00 |
|
David Back
|
900669d937
|
fix multi-selection rotation yay!
|
2018-02-02 16:44:59 -08:00 |
|
John Conklin II
|
c8bb26ae74
|
Merge pull request #12294 from samcake/pastel
Improve startup time by optimizing shader bookkeeping
|
2018-02-02 16:37:44 -08:00 |
|
Andrew Meadows
|
a5e968867e
|
Merge pull request #12302 from druiz17/fix-another-bootstrapping
Fix another bootstrapping and rename entityItem _dirtyFlags
|
2018-02-02 15:14:38 -08:00 |
|
John Conklin II
|
9f4820df3b
|
Merge pull request #12255 from Zvork/trnormalmap
Normal map support on translucent objects
|
2018-02-02 14:19:50 -08:00 |
|
Zach Fox
|
2a0d85a119
|
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
Commerce: Send Money Nearby particle effect!
|
2018-02-02 14:17:48 -08:00 |
|
Zach Fox
|
28c9cd15a4
|
Merge pull request #12326 from zfox23/commerce_fixPopUpHover
Fix a bug where hover events incorrectly propagate under popups
|
2018-02-02 13:23:36 -08:00 |
|
Seth Alves
|
00b184124d
|
Merge pull request #12308 from vladest/fix_progress_animation
Image overlay uses bounds property
|
2018-02-02 12:53:20 -08:00 |
|
Seth Alves
|
b3250ff4b6
|
Merge pull request #12158 from sethalves/cauterize-head-av-entities-1
don't draw head-descendant entitys with 1st-person camera
|
2018-02-02 11:57:49 -08:00 |
|
Zach Fox
|
f26477b3e1
|
Slight wording change to Optional Message placeholder
|
2018-02-02 11:00:32 -08:00 |
|
Zach Fox
|
2f3448ed1f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
|
2018-02-02 10:59:49 -08:00 |
|
Zach Fox
|
19235b8d94
|
Fix a bug where hover events incorrectly propagate under popups
|
2018-02-02 10:50:35 -08:00 |
|
Olivier Prat
|
03daba9bac
|
Removed duplicate shader include
|
2018-02-02 18:18:24 +01:00 |
|
Seth Alves
|
861497e907
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-02 08:56:18 -08:00 |
|
Seth Alves
|
14d5029f4d
|
only update cauterization of child entities when something relevant changes
|
2018-02-02 08:56:11 -08:00 |
|
Olivier Prat
|
a44c5c9814
|
Merge branch 'master' of http://github.com/highfidelity/hifi into trnormalmap
|
2018-02-02 08:46:38 +01:00 |
|
David Back
|
55f55cd78b
|
few more updates
|
2018-02-01 17:59:38 -08:00 |
|
David Back
|
db56246cd6
|
more fixes, clean up, updates
|
2018-02-01 17:30:56 -08:00 |
|
David Back
|
c69eff3322
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
|
2018-02-01 17:29:42 -08:00 |
|
Melissa Brown
|
bf5b875382
|
Merge pull request #12241 from 1P-Cusack/FogBugz/Case_4315_okbutton
[Case 4315] Edit menu color picker OK button is hard to use in HMD
|
2018-02-01 16:52:07 -08:00 |
|
John Conklin II
|
cbdbf51ccd
|
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset
Removal of hips offset shifting from AnimInverseKinematics node
|
2018-02-01 15:30:08 -08:00 |
|
Zach Fox
|
dd2b7eb107
|
Send Money Effect & Lightbox
|
2018-02-01 15:17:50 -08:00 |
|
Seth Alves
|
53f536c476
|
Merge pull request #12320 from ctrlaltdavid/21731
Bump avatar mixer packet version
|
2018-02-01 14:28:23 -08:00 |
|
Seth Alves
|
45ab2e9654
|
Merge pull request #12319 from hyperlogic/bug-fix/cauterization-on-rigid-bound-mesh
Fix for rigidly bound mesh not being properly cauterized.
|
2018-02-01 13:44:27 -08:00 |
|
samcake
|
9867b479fd
|
APplying review feedback
|
2018-02-01 13:12:28 -08:00 |
|
David Rowe
|
f46362906d
|
Bump avatar mixer packet version
|
2018-02-02 10:02:20 +13:00 |
|
Seth Alves
|
0a94af53fc
|
Merge pull request #12314 from ctrlaltdavid/21731
FBX fixes
|
2018-02-01 12:12:38 -08:00 |
|
Seth Alves
|
f7027b52e1
|
Merge pull request #12311 from ElderOrb/FB11511
FB11511 - position of log windows should be persistent between invocations of interface
|
2018-02-01 12:11:30 -08:00 |
|
Seth Alves
|
bdf6736a54
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-01 12:04:56 -08:00 |
|
Anthony J. Thibault
|
a1b67afabf
|
Fix for rigidly bound mesh not being properly cauterized.
For example, sometimes in first person view, you can see the back of your avatar's eyes or the brim of your avatar's hat.
|
2018-02-01 11:57:50 -08:00 |
|
Zach Fox
|
89e52561e3
|
Silly bugfix
|
2018-02-01 11:56:54 -08:00 |
|
Melissa Brown
|
93e039d6d6
|
Merge pull request #12310 from Triplelexx/tetherball_cachebuster
remove createTetherballStick.js cache buster
|
2018-02-01 11:55:09 -08:00 |
|
Zach Fox
|
ce79504f03
|
Fix checkbox
|
2018-02-01 11:51:08 -08:00 |
|
Zach Fox
|
268c12e47a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
|
2018-02-01 11:38:47 -08:00 |
|
MiladNazeri
|
a9c6af6b13
|
Merge pull request #12318 from Triplelexx/entity_serverscript_log_typo
Fix typos for entity server script log
|
2018-02-01 10:55:29 -08:00 |
|
John Conklin II
|
6eac91a3c7
|
Merge pull request #12304 from sethalves/fix-upside-down-equip
allow upside-down equip
|
2018-02-01 10:47:07 -08:00 |
|
John Conklin II
|
acde2511ba
|
Merge pull request #12305 from sethalves/fix-run-reload
fix left-over run button when scripts are reloaded
|
2018-02-01 10:46:44 -08:00 |
|
samcake
|
fd501cf3af
|
Addressing review comments
|
2018-02-01 10:37:54 -08:00 |
|
Liv
|
6363ded74b
|
Merge pull request #12280 from misslivirose/feat/expose-identity-verification
Expose functionality to enable entity scripts to check ownership verification on avatar entities
|
2018-02-01 10:07:58 -08:00 |
|
David Back
|
9f8fd387cb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
|
2018-02-01 09:45:10 -08:00 |
|
Zach Fox
|
bd26c9dfc0
|
More improvements
|
2018-02-01 09:36:41 -08:00 |
|
John Conklin II
|
56320c364d
|
Merge pull request #12312 from vladest/addressbar_close_fix
Addressbar close fix
|
2018-02-01 09:25:58 -08:00 |
|
Dante Ruiz
|
ab20643ada
|
fix mistakes
|
2018-02-01 08:13:43 -08:00 |
|
Seth Alves
|
482be7ba4e
|
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
|
2018-02-01 06:36:04 -08:00 |
|
Sam Gateau
|
351f619555
|
Fixing a shader error on android
|
2018-01-31 23:35:16 -08:00 |
|
Sam Gateau
|
a650c5bbc6
|
Move a define to resume watchdog a bit further
|
2018-01-31 23:31:31 -08:00 |
|
Sam Gateau
|
60238fa644
|
Fixing the android build
|
2018-01-31 23:15:19 -08:00 |
|