64078 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
Melissa Brown	93e039d6d6	Merge pull request #12310 from Triplelexx/tetherball_cachebuster ... remove createTetherballStick.js cache buster	2018-02-01 11:55:09 -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
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
John Conklin II	56320c364d	Merge pull request #12312 from vladest/addressbar_close_fix ... Addressbar close fix	2018-02-01 09:25:58 -08:00
Triplelexx	a8d2be045c	fix typos	2018-02-01 07:09:24 +00: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
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
John Conklin II	d37e9af7d4	Merge pull request #12307 from jherico/hotfix/amd_crash ... Fix for AMD crashes in QML rendering	2018-01-31 16:30:53 -08:00
Liv	8767bc8790	Merge pull request #12293 from misslivirose/fix-remote-exterminator-sample ... removing old game sample from script-archive	2018-01-31 16:10:21 -08:00
John Conklin II	453d0038d6	Merge pull request #12297 from hyperlogic/bug-fix/hair-freakout ... Fix avatars with extra joints during mirrored animations	2018-01-31 15:33:34 -08:00
John Conklin II	fd92ef226a	Merge pull request #12274 from samcake/flash ... FIxing the dark ambient lighting on scattering surface	2018-01-31 15:32:29 -08:00
vladest	bca903a6df	Fix build	2018-01-31 23:31:18 +01:00
Alexander Ivash	1ed7d164c4	FB11511 - position of log windows should be persistent between invocations of interface	2018-02-01 01:15:03 +03:00
vladest	2a5b3d97fb	AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property	2018-01-31 23:05:38 +01:00
Bradley Austin Davis	59a088f226	Merge pull request #12309 from highfidelity/revert-12126-addressbar_close_fix ... Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"	2018-01-31 14:02:27 -08:00
Triplelexx	257932cedc	remove cache buster	2018-01-31 22:00:30 +00:00
Brad Hefta-Gaub	f5614618b9	Merge pull request #12288 from ctrlaltdavid/21729 ... Add location.domainID as a synonym for location.domainId	2018-01-31 13:50:48 -08:00
Alexander Ivash	579d9a8640	fix slots invocation	2018-02-01 00:48:03 +03:00
Seth Alves	a49097789a	Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"	2018-01-31 13:32:19 -08:00
Bradley Austin Davis	f40d83381d	Merge pull request #12300 from jherico/fix/amd_crash ... Trying to fix AMD crash in QML rendering	2018-01-31 13:24:50 -08:00
John Conklin II	3d5742865d	Merge pull request #12266 from hyperlogic/bug-fix/neck-cauterization ... Bug fix for avatar neck cauterization	2018-01-31 12:37:09 -08:00
Brad Davis	e5559fa865	Better fix for AMD crashing (hopefully	2018-01-31 12:10:06 -08:00
Seth Alves	0df4ae02fc	Merge pull request #12126 from vladest/addressbar_close_fix ... AddressBar trigger implemented. Fixed warnings on non existing contex…	2018-01-31 11:26:05 -08:00
Seth Alves	50e6864988	Merge pull request #12138 from Triplelexx/21669_prompt_keyboard ... WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()	2018-01-31 11:19:49 -08:00
Seth Alves	a596e07464	fix left-over run button when scripts are reloaded	2018-01-31 11:05:35 -08:00
samcake	582ef2a8a2	MErging with master	2018-01-31 11:00:23 -08:00
Bradley Austin Davis	b97c938544	Merge pull request #12216 from thoys/feat/js-script-console-auto-complete ... JS scripting console auto-complete	2018-01-31 10:39:51 -08:00
Brad Davis	ef699c2a78	Better fix for AMD crashing (hopefully	2018-01-31 10:38:20 -08:00
Seth Alves	c4f57877dd	if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright	2018-01-31 10:06:20 -08:00
Sam Gateau	9a131cfab6	Merge pull request #12265 from SamGondelman/resourceCache ... Remove unnecessary invokeMethod from ResourceCache::getResource	2018-01-31 09:35:05 -08:00
Seth Alves	600cc1b48e	Merge pull request #12250 from druiz17/fix-multihighlight ... Don't manually highlight tablet buttons from swipeview.	2018-01-31 09:33:33 -08:00
John Conklin II	ece72501b9	Merge pull request #12279 from druiz17/fix-parenting-crash ... fix entity parenting crash	2018-01-31 09:32:52 -08:00
Brad Davis	9893273d33	Trying to fix AMD crash in QML rendering	2018-01-31 08:36:52 -08:00
John Conklin II	2ae9395283	Merge pull request #12299 from highfidelity/stable ... Merge stable back into master	2018-01-30 20:03:06 -08:00
John Conklin II	399c24bf06	Merge pull request #12298 from Atlante45/hotfix/crashpad-packaging ... Beta Release 63.1 - hotfix	2018-01-30 18:40:16 -08:00
John Conklin II	db255719db	Merge pull request #12296 from Atlante45/merge-back ... Merge stable back into master	2018-01-30 18:09:38 -08:00
Atlante45	97729e8f41	Cleanup bad install	2018-01-30 17:10:06 -08:00
Atlante45	d155d19198	Fix cmake install cmd	2018-01-30 17:08:10 -08:00
Anthony J. Thibault	ed67a5b408	Fix avatars with extra joints during mirrored animations ... When the avatar is rotated it will play a mirrored and non mirrored versions of the rotation animation. The mirrored version would also mirror extra joints on the model, yielding unexpected results. This refines the logic that determines which joints are NOT mirrored, so that extra joints remain unaffected by the mirrored animation playback.	2018-01-30 16:51:39 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
John Conklin II	408189763b	Merge pull request #12229 from highfidelity/RC63 ... Beta Release 63 - includes up to Developer Release 7741	2018-01-30 15:54:56 -08:00
John Conklin II	215d03c4ce	Merge pull request #12269 from sethalves/backtrace-for-rc-63 ... Backtrace for rc 63	2018-01-30 15:13:01 -08:00
John Conklin II	eebbb7e563	Merge pull request #12276 from jherico/RC63_haze_hotfix ... RC63 Hotfix: Fix haze parameters uniform buffer size	2018-01-30 15:04:07 -08:00