Olivier Prat
1f4671ba17
Cleaned up orthographic shadow culling functor
2018-02-02 11:09:28 +01:00
Olivier Prat
3804917cf4
Orthographic octree selection seems to be working
2018-02-02 09:40:57 +01: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
Zach Fox
fa69ea0352
Small comment addition
2018-02-01 13:57:05 -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
Zach Fox
d4f9287e3f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign
2018-02-01 13:15:38 -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
Triplelexx
a8d2be045c
fix typos
2018-02-01 07:09:24 +00:00
Sam Gateau
d4a3932549
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 21:53:09 -08:00
Sam Gateau
edb416d24e
Fixing the program map sorting, good to go
2018-01-31 21:32:22 -08:00
David Back
c01790bd3e
punch list updates and various fixes
2018-01-31 18:27:15 -08:00
David Back
54e496329c
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-31 18:26:49 -08:00
John Conklin II
7d05b302d3
Merge pull request #12313 from highfidelity/stable
...
Merge stable back into master
2018-01-31 18:05:24 -08:00
Anthony J. Thibault
b23f98b311
Removal of hips offset shifting from AnimInverseKinematics node
...
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
2018-01-31 17:56:33 -08:00
Zach Fox
b1be12a5d4
Remove errant GPUCache files
2018-01-31 17:38:26 -08:00
samcake
89f4fe1c04
Adding the map of existing shaders and programs and ways to identify them to avoid recompiling them
2018-01-31 17:28:45 -08:00
Zach Fox
14051bce0c
This logic is insane
2018-01-31 17:20:20 -08:00
Zach Fox
fb5308e517
This logic is insane
2018-01-31 17:06:29 -08:00
Zach Fox
ab3a91a1da
Oooooh it's so pretty
2018-01-31 16:53:23 -08:00
David Rowe
a7ec4501e6
FBX node IDs aren't alphanumerically ordered per logical structure
2018-02-01 13:43:14 +13:00
David Rowe
4cd130dd63
Don't reparent model node with clusters if it's a root node
2018-02-01 13:39:57 +13:00
