67863 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Livi Erickson	9c0084209b	fix style error, start lifetime properly for cloned entities	2018-05-20 16:41:14 -07:00
Liv Erickson	6c8d68afc6	add extra cleanup in delete messages and simulation, as a fall back	2018-05-18 18:18:42 -07:00
Liv Erickson	29b11b9101	some fixes to server cloneables	2018-05-18 17:12:41 -07:00
Liv Erickson	de05388ebf	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-18 10:42:26 -07:00
Sam Gateau	efca568dbe	Merge pull request #13198 from NissimHadar/autoTesterUsePeriods ... Updated auto-tester.	2018-05-18 10:15:55 -07:00
Sam Gateau	964d5b5715	Merge pull request #13096 from jherico/transfer2 ... Faster texture transfers	2018-05-18 10:05:57 -07:00
Anthony Thibault	e09cb2dfdb	Merge pull request #13151 from thoys/fix/update-eslint-config ... eslint config update [ skip builds ]	2018-05-18 10:02:42 -07:00
Brad Davis	3356486f27	Fix populated texture size tracking	2018-05-18 09:23:54 -07:00
Brad Davis	91f1d93d4e	Fix flicker while transferring texture data	2018-05-18 09:23:54 -07:00
Brad Davis	ae07036f20	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
Brad Davis	fb81cf927a	Faster texture transfers	2018-05-18 09:21:02 -07:00
Liv	40ff3f966f	Merge pull request #13165 from ctrlaltdavid/21872-b ... JSDoc stubs for various APIs	2018-05-18 09:11:55 -07:00
NissimHadar	a0462451be	Updated auto-tester	2018-05-18 09:09:29 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
David Back	26b6b851f5	Merge branch 'cloneables' of github.com:dback2/hifi into cloneables	2018-05-17 14:50:39 -07:00
David Back	b8ce07744d	initialize prop defaults, no bool returns	2018-05-17 14:50:14 -07:00
John Conklin II	fb7b1d3550	Merge pull request #13190 from Atlante45/new-master ... RC67.2 stable mergeback to master	2018-05-17 13:10:00 -07:00
David Rowe	33ba559bb4	Show all OverlayWebWindows properties and functions together	2018-05-18 08:02:02 +12:00
David Rowe	2669a39e0f	Deprecate Agent API items that shouldn't be exposed in the API	2018-05-18 07:32:25 +12:00
Clement	da08d747dc	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -07:00
David Back	08ca2cd374	Merge pull request #1 from misslivirose/clone-server ... Entities.cloneEntity JSDoc	2018-05-17 11:26:39 -07:00
Liv Erickson	ec8aa71dc4	Add JSDoc header to new clone function in Entity API	2018-05-17 11:25:20 -07:00
Liv Erickson	45e6d38d32	Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server	2018-05-17 11:19:18 -07:00
David Back	42d8492427	no clock skew	2018-05-17 11:17:04 -07:00
Liv Erickson	92e0f0403c	Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server	2018-05-17 10:29:33 -07:00
David Back	3730cbe36c	reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable	2018-05-17 10:28:48 -07:00
John Conklin II	bb7d8463fc	Merge pull request #13177 from highfidelity/RC67.2 ... Beta Release 67.2 - branched at Developer Release 8265	2018-05-17 10:27:40 -07:00
Gabriel Calero	e10b716507	Revert audio fix	2018-05-17 14:26:36 -03:00
Gabriel Calero	5a73da6fdf	Bugfix: stop audio when app starts	2018-05-17 14:05:49 -03:00
David Back	900b373c96	Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables	2018-05-17 09:04:28 -07:00
Liv Erickson	10f48bef2f	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-17 08:59:52 -07:00
Gabriel Calero	96da032b16	Add missing js to haptic feedback change	2018-05-17 11:49:44 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
David Rowe	d20cd6ad44	Add missing JSDoc of parameter in takeSecondaryCamera360Snapshot()	2018-05-17 20:25:25 +12:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
David Rowe	145d73aa76	OverlayWebWindow JSDoc fixes	2018-05-17 19:18:00 +12:00
John Conklin II	1cba2edb03	Merge pull request #13185 from samcake/rc67.2-taaOn ... Rc67.2 Provide a toggle switch for TAA in the menu developer/render to opt-out	2018-05-16 16:46:52 -07:00
Gabriel Calero	65a9b98b97	Use android.os.Vibrator to perform haptic feedback in Android	2018-05-16 20:07:10 -03:00
John Conklin II	4ce4afe0b1	Merge pull request #13180 from Cristo86/android_no_joystick_fix ... Fix Joystick/Control not showing up in Samsung after typing address (Android)	2018-05-16 15:41:24 -07:00
samcake	ade1d6c056	use the correct call to toggle the debugFXAA on the AaConfig	2018-05-16 15:37:13 -07:00
Liv Erickson	ef6bf54f54	Merge branch 'cloneables' of https://github.com/dback2/hifi into clone-server	2018-05-16 15:29:03 -07:00
Zach Fox	ec29948b15	Merge pull request #13181 from zfox23/MS15103_snapFolderCrash ... Fix MS15103: Interface crashes on snap if snap dir is deleted	2018-05-16 15:16:58 -07:00
Gabriel Calero	5370cb7725	Change login option UI	2018-05-16 18:15:31 -03:00
Zach Fox	486f33b4bd	Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash	2018-05-16 14:14:35 -07:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
samcake	adc8a07d3c	Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn	2018-05-16 13:14:14 -07:00
samcake	21e069c90c	Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa	2018-05-16 13:09:55 -07:00
John Conklin II	8d437892cb	Merge pull request #13175 from luiscuenca/fixAvatarDisappearing ... Fix hips position when flying	2018-05-16 12:37:07 -07:00
John Conklin II	9c9f375bb5	Merge pull request #13178 from samcake/rc67.2-translucents ... Rc67.2 : Fixing translucents objects in ambient lighting	2018-05-16 12:18:15 -07:00
David Back	06fa4efe05	add comment	2018-05-16 11:39:53 -07:00