1755 commits

Author	SHA1	Message	Date
David Rowe	3275846882	Material entity JSDoc	2018-03-01 09:57:42 +13:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
Stephen Birarda	9cc348ef27	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
David Rowe	1fb02d15d7	Entities actions JSDoc	2018-02-27 14:12:20 +13:00
Brad Davis	5aa15b5422	Fixing build warnings	2018-02-26 10:17:07 -08:00
David Rowe	a8e05824cd	Entities octree sending functions JSDoc	2018-02-25 14:15:39 +13:00
NissimHadar	b81f69d97a	WIP - recursive tests.	2018-02-23 18:40:16 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Atlante45	277e556b48	Create a standard function to init Hifi Apps	2018-02-22 17:06:09 -08:00
Atlante45	80c0f2a21e	Fix crash when passing --checkMinSpec flag ... That flag caused a DLL to be loaded before Application was instanced. This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes the previous registration pointing the startup function in the main executable to be overridden with the address of the function in the DLL (Since they both link the same static library) This leads to the correct function running in the wrong address space (the DLLs), hence not initializing some global variables correctly.	2018-02-22 16:29:38 -08:00
Stephen Birarda	946474c615	do not init caching for asset requests in domain-server	2018-02-21 16:33:58 -08:00
Stephen Birarda	79f5d0cee2	include memory for unique_ptr in Oven	2018-02-21 13:52:07 -08:00
Stephen Birarda	d4061c172e	quit all threads before waiting on them (CR)	2018-02-21 13:52:07 -08:00
Stephen Birarda	2a597eb715	use QCoreApplication for oven when headless version is used	2018-02-21 13:52:07 -08:00
David Rowe	67cfe783be	Entity properties JSDoc	2018-02-19 12:17:31 +13:00
Brad Davis	fe9b1de908	Fix PR builds	2018-02-16 09:28:58 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	a578e64416	Remove Qt dependency from scribe	2018-02-07 09:44:45 -08:00
Bradley Austin Davis	0455fb37b6	Merge remote-tracking branch 'upstream/master' into fix/shader_length	2018-02-06 15:55:01 -08:00
Bradley Austin Davis	f291715f87	Merge remote-tracking branch 'zvork/scribe' into fix/shader_length	2018-02-06 10:36:15 -08:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
Bradley Austin Davis	f611990b10	Fix overlimit shader char strings	2018-02-05 15:27:19 -08:00
Olivier Prat	ac92b3c130	Merge branch 'master' of http://github.com/highfidelity/hifi into scribe	2018-02-02 14:01:59 +01: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	3e3a585b92	Fixing compile warnings	2018-01-30 21:54:29 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
MiladNazeri	9baf02b7a1	Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request ... Leopoly_Phase1_003_Asset-Request	2018-01-29 11:40:41 -08:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Atlante45	314c51ab3b	Fix settings init in all exe	2018-01-26 15:53:08 -08:00
Brad Davis	361b767586	Merge branch 'fix/render_config' into android	2018-01-25 14:50:41 -08:00
Thijs Wenker	45487a1e45	Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete ... # Conflicts: # interface/CMakeLists.txt	2018-01-25 22:51:35 +01:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
Nissim Hadar	f9e0c724ce	Added '?raw=true' suffices where needed.	2018-01-23 18:09:45 -08:00
Nissim Hadar	6bb325f6a2	Implemented new recursive functionality.	2018-01-23 17:25:02 -08:00
Thijs Wenker	c46a115000	attempt to fix ubuntu build	2018-01-24 01:45:53 +01:00
Thijs Wenker	79dbde6a6f	optional auto-complete build (requires NPM installed)	2018-01-23 23:01:59 +01:00
Brad Davis	d0be19ab41	Add prototype KTX manipulation tool	2018-01-23 12:27:29 -08:00
humbletim	16ca0eebed	fix atp-client AssetUtils:: namespace	2018-01-23 03:36:00 -05:00
Thijs Wenker	5885569644	fix UNIX jsdoc command order	2018-01-23 01:29:52 +01:00
Thijs Wenker	4ff3c9e046	fix jsdoc output folder	2018-01-22 19:00:45 +01:00
Thijs Wenker	58216b947c	removal of unnecessary JS export (for now)	2018-01-22 18:54:24 +01:00
Thijs Wenker	483074b11e	jsdoc cmake fixes	2018-01-22 17:59:01 +01:00
Thijs Wenker	0f7f58417b	JS scripting console auto-complete	2018-01-19 19:11:12 +01:00
Brad Hefta-Gaub	4485ed8613	Merge pull request #12073 from NissimHadar/QtImageCompare ... Improved functionality	2018-01-18 15:00:35 -08:00
Clément Brisset	956f45b5af	Merge pull request #11932 from birarda/bug/baking-folder-number ... fix sparse rectification for small textures, export for same model at diff URL	2018-01-18 14:25:33 -08:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	157a229a4f	Tried to add GLSL validation in scribe. Issues with determining the correct version...	2018-01-17 15:09:32 +01:00
Olivier Prat	54690219e3	Changed the way shader type is sent to Scribe	2018-01-17 11:12:37 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Olivier Prat	98a47e56fc	Added a hack to force referencing of shader source on Android	2018-01-12 17:32:12 +01:00
Olivier Prat	420b58fd5b	Trying to fix Android build error	2018-01-12 15:13:55 +01:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Nissim Hadar	0f4206d330	Added option to delete old snapshots.	2018-01-10 18:21:34 -08:00
Stephen Birarda	fa75320acf	Merge pull request #11984 from birarda/bug/macdeployqt-for-oven ... fix rpath for oven on OS X	2017-12-14 10:26:13 -08:00
Stephen Birarda	88831ff08a	don't trigger unix step on apple for oven	2017-12-13 18:39:19 -08:00
Stephen Birarda	0b598ea948	fix RPATH for oven so it loads things from macdeployqt	2017-12-13 18:39:19 -08:00
Zach Fox	ed5082e5d4	Merge pull request #11974 from birarda/feat/staging-env-or-cl ... allow custom metaverse URL to be used with env var	2017-12-13 17:29:45 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
David Rowe	578c42b4ea	Merge branch 'master' into 21624	2017-12-13 09:41:09 +13:00
MiladNazeri	16e16501cd	Merge pull request #11791 from ctrlaltdavid/21602 ... JSDoc updates	2017-12-12 12:18:02 -08:00
Ryan Huffman	c2e0f19591	Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update	2017-12-11 13:39:58 -08:00
divya	e187852df1	Merge pull request #11941 from huffman/feat/atp-baking-process ... Move asset server baking to a separate process	2017-12-09 20:48:14 -08:00
Ryan Huffman	7b48f08566	Remove _baker inside ModelBakeWidget	2017-12-08 16:45:27 -08:00
Nissim Hadar	9ff1b4bcb1	WTF....	2017-12-08 16:38:46 -08:00
Nissim Hadar	44c76061ed	Lowered threshold to 0.999	2017-12-08 16:25:10 -08:00
Ryan Huffman	373b29c031	Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update	2017-12-08 14:29:58 -08:00
Nissim Hadar	b7a170c718	Added error messages to file rename.	2017-12-08 11:45:30 -08:00
Ryan Huffman	70c35f84b5	Update baker library with many style improvements	2017-12-08 10:30:38 -08:00
Nissim Hadar	5806605439	Reformatting per coding standard.	2017-12-07 11:34:56 -08:00
Nissim Hadar	8c1a4e058e	Changed format (to 5 digits). ... Changed threshold.	2017-12-07 10:58:28 -08:00
Ryan Huffman	4dd08d93f4	Cleanup dead code and unused var in BakerCLI	2017-12-07 10:54:39 -08:00
Ryan Huffman	94a58a2471	Remove baking dependency from assignment-client	2017-12-07 10:53:23 -08:00
Nissim Hadar	ebad5cf503	Reduced threshold from 0.9995 to 0.995	2017-12-06 16:55:32 -08:00
Ryan Huffman	6b098bfc6a	Fix aborted baking in oven cli	2017-12-06 13:51:31 -08:00
Ryan Huffman	bee666b522	Add error text reading to asset server baking	2017-12-06 11:49:34 -08:00
Ryan Huffman	7eb93f4777	Add oven as dep to assignment-client	2017-12-06 11:49:34 -08:00
Ryan Huffman	f3fc5769e8	Move asset baking on asset server to separate process	2017-12-06 11:49:19 -08:00
Stephen Birarda	5688a166f8	fix folder name creation for duplicated models	2017-12-05 14:44:11 -08:00
Nissim Hadar	3de34834e1	Changed autoTester threshold to 0.9995 ... Added a readme explaining how to deploy autoTester.	2017-12-05 11:19:00 -06:00
Nissim Hadar	c35310c2fb	Deal with user canceling folder selection.	2017-12-01 17:17:11 -08:00
Nissim Hadar	6c2e701023	Improved CMakeLists.txt for QT deployment. ... Changed threshold from 0.999 to 0.9998	2017-12-01 13:31:52 -08:00
Nissim Hadar	a83244c27f	Corrected typo in comment.	2017-12-01 11:16:57 -08:00
Nissim Hadar	526aa8fe57	Changed threshold from 0.98 to 0.999	2017-12-01 09:28:31 -08:00
Nissim Hadar	12ac551d25	Changed power from 2.0 to 2	2017-11-30 18:27:47 -08:00
Nissim Hadar	c0673db3c5	Fix for MacOS	2017-11-30 18:23:58 -08:00
Nissim Hadar	c63571a710	Debugging the image comparison.	2017-11-30 16:27:28 -08:00
Nissim Hadar	0842e09570	Debugging the image comparison.	2017-11-30 13:59:02 -08:00
Nissim Hadar	2e8fe40da8	Recursive test evaluations.	2017-11-30 13:07:54 -08:00
Nissim Hadar	4afc8f9759	Added print() code to the produced script.	2017-11-29 12:12:13 -08:00
Nissim Hadar	7a67e3e5f7	Using js modules.	2017-11-29 09:15:30 -08:00
Nissim Hadar	3710d726df	WIP - improving the recursive script.	2017-11-28 15:23:57 -08:00
Nissim Hadar	709fadff2e	WIP - improving the recursive script.	2017-11-28 15:23:33 -08:00
David Rowe	cd2922a560	Merge branch '21602' into 21624 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2017-11-28 17:04:59 +13:00
nissim.hadar	42fbe95768	Additional code.	2017-11-26 13:33:01 -08:00
nissim.hadar	b397cd80db	Implemented code to call the various test.s functions.	2017-11-26 02:44:12 -08:00
nissim.hadar	9b2c057e9b	Trying to fix Qt error on Ubuntu.	2017-11-26 01:39:16 -08:00
nissim.hadar	1510c4d68a	Fixed CMakeLists.txt.	2017-11-26 01:12:55 -08:00
nissim.hadar	c0d1549ca5	Trying to fix Qt error on Ubuntu.	2017-11-26 00:17:41 -08:00
nissim.hadar	ea53b9893c	Minor edit.	2017-11-26 00:00:19 -08:00
nissim.hadar	0a51ca46e8	Fix gcc error.	2017-11-25 11:58:30 -08:00
nissim.hadar	2911b7dec6	Fix gcc error, and MAC error (no pow).	2017-11-25 11:41:05 -08:00
nissim.hadar	fcd8a47bec	Fix gcc error.	2017-11-25 11:24:24 -08:00
nissim.hadar	e35e76afd7	Removed unused variable warning.	2017-11-25 11:03:33 -08:00
nissim.hadar	747ba0bf84	Removed unneeded include of glm.	2017-11-25 11:03:02 -08:00
nissim.hadar	034f4f6036	Fixes for gcc warnings.	2017-11-25 09:21:31 -08:00
nissim.hadar	a71ee719dc	Minor typos.	2017-11-25 08:45:22 -08:00
nissim.hadar	ab400159bd	Removed ITK.	2017-11-25 03:13:41 -08:00
nissim.hadar	e20ac9aa94	First version with own implementation of SSIM.	2017-11-25 03:01:15 -08:00
nissim.hadar	2a062ad772	Merge branch 'master' into QtImageCompare	2017-11-25 02:59:11 -08:00
nissim.hadar	186d9da303	First version with own implementation of SSIM.	2017-11-25 02:30:23 -08:00
David Rowe	de49fefc61	Merge branch 'master' into 21602 ... # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2017-11-25 17:06:36 +13:00
David Rowe	91671722a5	Add Shape API types JSDoc	2017-11-25 16:09:54 +13:00
nissim.hadar	857f2c6880	New image comparison method.	2017-11-23 05:58:00 -08:00
nissim.hadar	346c691f0c	Implemented creation of allTests.js	2017-11-22 10:56:32 -08:00
nissim.hadar	fef5d95e94	First fully-coded registration.	2017-11-20 12:33:38 -08:00
nissim.hadar	80b646f48c	Clean-up.	2017-11-20 11:13:06 -08:00
nissim.hadar	689957c80b	Created RGB to monochrome filters.	2017-11-20 08:11:19 -08:00
nissim.hadar	b13ccab303	Can copy an image using ITK.	2017-11-20 01:24:52 -08:00
nissim.hadar	861c33d5a9	Added first use of ITK.	2017-11-19 13:48:37 -08:00
nissim.hadar	7b2fed6db2	Include of "ITK" in Test.cpp complete	2017-11-17 05:38:29 -08:00
nissim.hadar	f990e3f918	Build auto-tester iff ITK has been installed.	2017-11-17 05:10:14 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
Nissim Hadar	a2925518c2	Andrew's amazing fix.	2017-11-14 13:35:37 -08:00
Nissim Hadar	95bd10063d	Fixing CMake	2017-11-14 11:48:33 -08:00
Nissim Hadar	7dacea327b	Fixing CMake	2017-11-14 09:40:24 -08:00
Nissim Hadar	ed28cf07b6	Fixing CMake	2017-11-14 09:20:38 -08:00
Nissim Hadar	4eda0ce025	Fixing CMake	2017-11-14 09:00:46 -08:00
Nissim Hadar	b07f98da14	Fixing CMake	2017-11-14 08:34:02 -08:00
Nissim Hadar	156282beaa	Fixing CMake	2017-11-14 08:09:46 -08:00
Nissim Hadar	3f59446718	Fixing CMake	2017-11-14 07:50:16 -08:00
Nissim Hadar	27f7511ce9	Fixing CMake	2017-11-14 07:12:03 -08:00
Nissim Hadar	84c64c3992	Fixing CMake	2017-11-14 00:30:32 -08:00
Nissim Hadar	0e0574edd5	Fixing CMake	2017-11-14 00:11:52 -08:00
Nissim Hadar	c6ffbf612a	Fixing CMake	2017-11-13 23:52:31 -08:00
Nissim Hadar	0c271488bb	Modified tools/auto-tester/CMakeLists.txt	2017-11-13 22:37:10 -08:00
Nissim Hadar	2417890cce	Fixing CMake	2017-11-13 22:26:38 -08:00
Nissim Hadar	ddab843b4d	To make Jenkins happy.	2017-11-13 22:08:48 -08:00
Nissim Hadar	cfcbf1c7cf	Fixing CMake	2017-11-13 21:25:07 -08:00
Nissim Hadar	4b3f892abe	Used 'system' return value.	2017-11-13 17:35:01 -08:00
Nissim Hadar	311d794529	Corrected case of #include'd file.	2017-11-13 15:38:59 -08:00
Nissim Hadar	58eadbe00f	Use GLOB_RECURSE in lieu of listing the files. This is an attempt to deal with Linux build failing.	2017-11-13 15:29:47 -08:00
Nissim Hadar	d11aa64306	Seems to work.	2017-11-13 13:25:59 -08:00
Nissim Hadar	aa4320104b	WIP.	2017-11-13 10:25:31 -08:00
Nissim Hadar	572646b8c6	Just missing the dll's.	2017-11-12 21:43:33 -08:00
Nissim Hadar	eaa51ebe9d	WIP.	2017-11-12 11:27:24 -08:00
Nissim Hadar	7a0d188149	WIP.	2017-11-11 18:10:47 -08:00
David Rowe	39ccd7d656	Update JSDoc for Camera API	2017-11-12 11:04:35 +13:00
Nissim Hadar	3457e1de5d	WIP.	2017-11-11 13:19:57 -08:00
Nissim Hadar	8433374fb6	CMake includes Qt headers	2017-11-10 20:24:11 -08:00
Nissim Hadar	3101663b7b	In the beginning.	2017-11-10 18:55:07 -08:00
David Rowe	a482b7c371	Fix up JSDoc tool readme file	2017-11-10 17:09:45 +13:00
utkarshgautamnyu	79c1e84c76	More indentation/spacing fixes	2017-10-24 16:15:20 -07:00
utkarshgautamnyu	98ec464106	Indentation Fixes	2017-10-24 16:05:00 -07:00
utkarshgautamnyu	46b46c2f4c	Fixed issues with FBXBaker and refactoring of OBJBaker	2017-10-23 20:07:24 -07:00
utkarshgautamnyu	28baed18c0	Added code for OBJBaker and moved Texture and Mesh compression to ModelBaker superclass	2017-10-20 18:55:41 -07:00
Seth Alves	66191a5419	Merge pull request #11291 from ElderOrb/optional-build-tools ... make building tools (besides 'scribe') optional	2017-10-08 10:02:28 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
beholder	04305155d0	make building tools (besides 'scribe') optional	2017-09-14 23:16:12 +03:00
Stephen Birarda	4066c9392d	output from oven into folder with model name	2017-09-13 13:34:15 -07:00
Stephen Birarda	88b8fb4c5e	use general worker threads for fbx baking	2017-09-12 20:02:27 -07:00
Ryan Huffman	395c9283dc	Merge remote-tracking branch 'upstream/feat/auto-bake' into feat/auto-bake-fbxwriter	2017-09-12 14:09:59 -07:00
Ryan Huffman	9b462171f6	Add draco support to FBXBaker	2017-09-08 16:58:29 -07:00
Stephen Birarda	91f4551598	add draco to the oven tool	2017-09-08 09:46:55 -07:00
Stephen Birarda	3cf77f377c	remove FBX SDK from CMake files	2017-09-07 18:46:44 -07:00
Ryan Huffman	b60d68c714	Replace FBX SDK loading of file in FBXBaker with FBXReader	2017-09-07 14:00:09 -07:00
Ryan Huffman	49e09f4838	Remove FBXBaker and TextureBaker from oven	2017-09-07 13:12:07 -07:00
Stephen Birarda	26b74db864	enable compression in image library from Asset Server	2017-09-07 12:07:57 -07:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display ... Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
Atlante45	28c9aa031c	Setup script model status	2017-08-25 10:54:34 -07:00
Ryan Huffman	39f04adc8d	Improve baking interface and add automatic baking to asset server	2017-08-24 16:15:28 -07:00
Ryan Huffman	8d4ab5f751	Update FBXBaker to take output directory and update oven to use it	2017-08-21 13:40:51 -07:00
Seth Alves	c4d909927a	make atp-client work again	2017-07-24 19:23:39 -07:00
Andrew Meadows	665aa92da2	Merge pull request #10877 from sethalves/atp-client ... Atp client	2017-07-07 14:04:50 -07:00
Stephen Birarda	bff54d260e	fix for baking FBX with external textures	2017-07-07 10:11:13 -07:00
Seth Alves	b8875a8902	Merge branch 'master' of github.com:highfidelity/hifi into atp-client	2017-07-06 17:28:55 -07:00
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only ... disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
Seth Alves	98ac2ccb90	rearrange code so authed connection works better	2017-07-05 17:36:25 -07:00
Seth Alves	f7131027e0	if user has provided login credentials, wait for the keypair to be ready before proceeding	2017-07-05 17:26:15 -07:00
Seth Alves	d62b0ffb3b	Merge branch 'acclient_fix' of github.com:jherico/hifi into atp-client	2017-07-05 17:03:16 -07:00
Brad Davis	2409c83d5d	Fix ACClient on Linux	2017-07-05 16:53:42 -07:00
Seth Alves	a05e9e12c1	remove some debug prints	2017-07-04 17:59:56 -07:00
Seth Alves	bdbfe25a53	remove some debug prints	2017-07-04 17:46:35 -07:00
Seth Alves	1192e86494	add a way to login on command-line	2017-07-04 17:11:53 -07:00
Seth Alves	a6af6015a4	add a way to login on command-line	2017-07-04 17:00:25 -07:00
Seth Alves	e9a8c3f5e8	rename atp-get to atp-client. add ability to list atp file mappings and to upload new files	2017-07-04 15:52:03 -07:00
Ryan Huffman	b8ce4b9006	Merge pull request #10801 from huffman/fix/oven-native-separators ... Add support for native separators in oven, and vs2015/2017 FBX sdk	2017-07-03 12:07:26 -07:00
Stephen Birarda	86eb5b14ca	disable the user activity logger in DS/AC/ac-client	2017-06-28 13:19:58 -07:00
Anthony J. Thibault	d7416434bf	added tool to visualize avatar-animation.json using graphviz.	2017-06-26 11:38:24 -07:00
Ryan Huffman	b12018ccf3	Fix Oven not properly handling native separators	2017-06-23 10:54:48 -07:00
Seth Alves	a053a1da4b	more HIFI_MEMORY_DEBUGGING fixes	2017-06-22 13:50:46 -07:00
Seth Alves	9ce173f682	missed a few	2017-06-22 10:56:08 -07:00
Seth Alves	7ff576ef18	add memory-debugging macro to some cmake files	2017-06-22 10:07:39 -07:00
Seth Alves	b1119ff465	more changes to get oven building on Linux	2017-06-21 20:10:54 -07:00
Stephen Birarda	e658953246	Merge pull request #10645 from seefo/oven ... Oven will now give proper return codes when used via CLI	2017-06-09 13:06:09 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 ... Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00
seefo	a4f4d49bec	Oven will now give proper return codes when used via CLI	2017-06-08 11:52:58 -07:00
seefo	0c7ffa0ac6	Replaced baker in OvenCLI with an std::unique_ptr	2017-06-08 09:48:30 -07:00
seefo	99e9e10882	Made requested changes to OvenCLI constructor	2017-06-07 11:36:56 -07:00
seefo	a3d2fa2630	Made requested changed to Oven CLI	2017-06-06 16:13:18 -07:00
seefo	46400f4122	Cleaned up oven CLI	2017-06-06 15:05:26 -07:00
Bradley Austin Davis	b4bbf98fe3	Suppress TBB warnings	2017-06-06 15:02:16 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
seefo	9bc1bc47a2	Added CLI to Oven tool	2017-06-06 14:57:42 -07:00
Stephen Birarda	9cdd7cc895	fix model check for filenames with periods	2017-05-23 15:46:45 -07:00
Stephen Birarda	4c652487d0	enable skybox compression (via BC7) by default	2017-05-23 14:14:22 -07:00
Stephen Birarda	0621ddfd9f	don't enable cube map compression by default	2017-05-23 11:54:09 -07:00
Stephen Birarda	2ba700d062	add a toggle to domain baker to re-bake originals	2017-05-23 11:54:09 -07:00
Stephen Birarda	3edbd41027	enable image compression at run time in baker	2017-05-23 11:54:08 -07:00
Stephen Birarda	a7f154a853	make a copy of original models file when baking domain	2017-05-23 11:54:08 -07:00
Stephen Birarda	fe280ab103	remember the browse directory for model baker	2017-05-03 14:24:23 -07:00
Stephen Birarda	b422ec3f88	also set the relative filename to fix double references	2017-05-02 18:04:23 -07:00
Stephen Birarda	2637040f17	remove skybox baking from domain baking	2017-04-26 18:37:36 -07:00
Stephen Birarda	0b4a8d05aa	fix references to moved texture type enum	2017-04-26 18:37:36 -07:00
Stephen Birarda	93c35314ec	use HF user agent for texture and FBX requests	2017-04-26 18:37:36 -07:00
Stephen Birarda	3aa6757c32	use QCryptographicHash static for cleaner hashing	2017-04-26 18:37:36 -07:00
Stephen Birarda	683985aea9	correct headers after move from model-baking to oven	2017-04-26 18:37:36 -07:00
Stephen Birarda	c43a4eec86	fix indexOf checks by using lastIndexOf	2017-04-26 18:37:36 -07:00
Stephen Birarda	258533de7b	fix filename references in FBXBaker	2017-04-26 18:37:36 -07:00
Stephen Birarda	46fc69dd32	fix filename parsing in TextureBaker	2017-04-26 18:37:36 -07:00
Stephen Birarda	38cb998ca1	move model-baking library to oven for build exclusion	2017-04-26 18:37:36 -07:00
Stephen Birarda	c71255d5fe	force oven dependency on model-baker since it is excluded	2017-04-26 18:37:36 -07:00
Stephen Birarda	b3f3302f5c	add accepted file types to baker file pickers	2017-04-26 18:37:36 -07:00
Stephen Birarda	b520640fef	grow status column when there are long results	2017-04-26 18:37:36 -07:00
Stephen Birarda	6127b72834	don't build oven and model-baking with default/ALL_BUILD	2017-04-26 18:37:36 -07:00
Stephen Birarda	2478ddb379	cleanup comments in skybox baking widget	2017-04-26 18:37:36 -07:00
Stephen Birarda	26d13ce002	make results window raising optional	2017-04-26 18:37:36 -07:00
Stephen Birarda	822af3365b	always bring the results window to front when shown	2017-04-26 18:37:36 -07:00
Stephen Birarda	95e2cc4eea	add BakeWidget, leverage for skybox widget cancellation	2017-04-26 18:37:36 -07:00
Stephen Birarda	8a1eb5f077	add cancellation handling to model bake widget	2017-04-26 18:37:36 -07:00
Stephen Birarda	7a5bfb8c19	add cancellation handling for domain bake widget	2017-04-26 18:37:36 -07:00
Stephen Birarda	9d8e493c20	remove suggestion that domain baker can load from URL	2017-04-26 18:37:36 -07:00
Stephen Birarda	3216202a8b	fix local skybox file reference on windows	2017-04-26 18:37:36 -07:00
Stephen Birarda	0bb3f1c9dc	assume local file if scheme is not remote	2017-04-26 18:37:36 -07:00
Stephen Birarda	a072f94085	leverage QDesktopServices to show output directory	2017-04-26 18:37:36 -07:00
Stephen Birarda	19aa05281e	fix build errors for oven on windows	2017-04-26 18:37:36 -07:00
Stephen Birarda	980de595a9	handle skybox baking from oven menu	2017-04-26 18:37:36 -07:00
Stephen Birarda	25d24c445d	handle ambient skybox textures for zones in domain bake	2017-04-26 18:37:36 -07:00
Stephen Birarda	7bc69e6eda	add skybox baking to DomainBaker	2017-04-26 18:37:35 -07:00
Stephen Birarda	cbd6f6417c	allow clicking on results row to show dir	2017-04-26 18:37:35 -07:00
Stephen Birarda	cdd9990fe8	use worker threads for Oven, re-write animation URLs	2017-04-26 18:37:35 -07:00
Stephen Birarda	383d82fe1d	fix multi-line display in results window	2017-04-26 18:37:35 -07:00
Stephen Birarda	3388debe9f	remove debug for percentage in DomainBakeWidget	2017-04-26 18:37:35 -07:00
Stephen Birarda	446cbf59b3	add domain bake progress to results table	2017-04-26 18:37:35 -07:00
Stephen Birarda	49e7ae6dbc	call image library for texture baking	2017-04-26 18:37:35 -07:00
Stephen Birarda	429e65888b	cleanup threading and result handling for DomainBaker	2017-04-26 18:37:35 -07:00
Stephen Birarda	83eb37b814	add domain bake to results table	2017-04-26 18:37:35 -07:00
Stephen Birarda	2b188427f1	cleanup memory management in memory bake widget	2017-04-26 18:37:35 -07:00
Stephen Birarda	3925493539	add a simple results window to show bake results	2017-04-26 18:37:35 -07:00
Stephen Birarda	7c5376bb1f	put fbx bakers on their own thread from ModelBakeWidget	2017-04-26 18:37:35 -07:00
Stephen Birarda	c5fbd28ecf	put all FBXBaker on same thread for bad FBX SDK	2017-04-26 18:37:35 -07:00
Stephen Birarda	916cecb8ec	use QtConcurrent to cleanup threading of bakers	2017-04-26 18:37:35 -07:00
Stephen Birarda	e1dc1990e5	add writing of new entities file during domain bake	2017-04-26 18:37:35 -07:00
Stephen Birarda	a773b0de04	output domain bake to a unique folder with timestamp	2017-04-26 18:37:35 -07:00
Stephen Birarda	177d4d0e07	add a simple domain baker to enumerate models.json.gz	2017-04-26 18:37:35 -07:00
Stephen Birarda	4e0aba10bc	add a modes menu and hook it up to the existing model widget	2017-04-26 18:37:35 -07:00
Stephen Birarda	31bf012503	handle multi-file select for model bake UI	2017-04-26 18:37:35 -07:00
Stephen Birarda	d9efd4adef	don't save copy of originals for one-off bake	2017-04-26 18:37:35 -07:00
Stephen Birarda	1fc678a929	add placeholder text, set export folder from FBX if not set	2017-04-26 18:37:35 -07:00
Stephen Birarda	425385d982	leverage settings to remember paths used before	2017-04-26 18:37:35 -07:00
Stephen Birarda	e1840eb4fe	give the Oven window a fixed width	2017-04-26 18:37:35 -07:00
Stephen Birarda	8d3b854e69	add a simple UI to Oven to bake individual model	2017-04-26 18:37:35 -07:00
Stephen Birarda	647377d07a	enumerate materials to find textures with types	2017-04-26 18:37:35 -07:00
Stephen Birarda	1b30afa03e	add basic Oven QCoreApplication, start to output results	2017-04-26 18:37:34 -07:00
Stephen Birarda	711938fb3d	lay async foundation for FBXBaker	2017-04-26 18:37:34 -07:00
Stephen Birarda	26d4cc73e0	add stubbed FBXBaker leveraging FBX SDK for read/write	2017-04-26 18:37:34 -07:00
Stephen Birarda	a586a31a93	stub the oven tool and add a find module for FBX SDK	2017-04-26 18:37:34 -07:00
Seth Alves	a1cab2c0d1	working toward fixing compound hulls	2017-04-09 17:23:56 -07:00
Seth Alves	8d00f0ab8f	allow obj reader to either combine meshes or keep parts separate	2017-04-07 15:59:01 -07:00
Anthony J. Thibault	f7de74109b	Added jsdoc documentation for some of MyAvatar properties and methods	2017-03-24 15:10:26 -07:00
Seth Alves	438fb42da4	oops	2017-03-15 20:54:08 -07:00
Seth Alves	60d10f3374	command-line utility for fetching an asset from a remote asset-server	2017-03-15 20:44:19 -07:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
Seth Alves	1cb330057e	fix a crash and a memory leak in vhacd-util	2016-12-23 13:05:57 -08:00
Atlante45	3035d43772	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
Ryan Huffman	c6b64081fc	Add Overlays jsdocs	2016-11-16 12:01:05 -08:00
Ryan Huffman	5fd1ae64b0	Begin adding entities jsdoc	2016-11-14 16:54:55 -08:00
Anthony J. Thibault	d111f7c409	Moved jsdoc folder from scripts to tools directory	2016-11-10 09:33:56 -08:00
Chris Collins	4700c80e38	Merge pull request #9003 from hyperlogic/feature/skeleton-dump-tool ... Added tools/skeleton-dump tool	2016-11-07 16:17:43 -08:00
Anthony J. Thibault	69fc048e5e	typo fixes in license comments	2016-11-04 14:03:59 -07:00
Anthony J. Thibault	1732448d3c	Added tools/skeleton-dump tool ... Debug tool that prints out the skeleton hierarchy of fbx files including joint indices, bindPose and defaultPoses. The verbose option also prints the full FBX transformation set, pre/post rotations etc.	2016-11-04 13:52:16 -07:00
Anthony J. Thibault	38a2ce67bb	Add tools/atp-extract.py ... Tool to list and extract files from the atp assets directory.	2016-11-04 11:23:10 -07:00
Atlante45	3d0f449afb	Ignore ack syn when using vegas	2016-10-18 15:54:25 -07:00
Atlante45	bad96d54ea	TCP congestion control first draft	2016-10-18 15:54:25 -07:00
Atlante45	36bd9ef4e6	Update new ACClientApp code	2016-10-12 14:02:05 -07:00
Seth Alves	f338e38bcf	oops	2016-10-05 16:25:00 -07:00
Seth Alves	0510411ac1	fix timer use	2016-10-05 16:19:39 -07:00
Seth Alves	785d67b87a	remove redundant addHelpOption	2016-10-05 15:25:45 -07:00
Seth Alves	86a3190385	on failure, print names of servers that didn't connect	2016-10-05 14:45:32 -07:00
Seth Alves	1dc52d3bf5	cleanups, fail if packet-version mismatch	2016-10-05 13:54:09 -07:00
Seth Alves	35755ddcb1	cleanups	2016-10-05 13:48:54 -07:00
Seth Alves	e9196e8f62	testing client to check if domain-server and ACs are running	2016-10-05 13:41:15 -07:00
Seth Alves	0192f72a11	use named constant rather than 7337	2016-09-22 10:34:00 -07:00
Seth Alves	eb6d329dfa	exit status depends on what happened. timeout added so it wont wait for server responses forever.	2016-09-19 15:30:55 -07:00
Seth Alves	c87652ab6d	cl flag to cache stun-server resposne	2016-09-19 13:34:56 -07:00
Seth Alves	b5e216db68	ice test-client uses stun server to get public address	2016-09-16 17:21:42 -07:00
Seth Alves	2e0cc158de	ice test-client uses stun server to get public address	2016-09-16 17:21:28 -07:00
Seth Alves	793687bb08	more command-line arguments	2016-09-16 14:11:44 -07:00
Seth Alves	d3dc0698a5	more command-line arguments	2016-09-16 13:51:33 -07:00
Seth Alves	6231fc4ba1	tool for testing ice-server	2016-09-16 13:34:40 -07:00
Seth Alves	cadbbd6194	tool for testing ice-server	2016-09-16 13:34:32 -07:00
Seth Alves	babe8f95bc	tool for testing ice-server	2016-09-16 13:34:05 -07:00
Stephen Birarda	f67f53a4fa	remove the mtc tool that is no longer used	2016-08-31 13:24:21 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Bradley Austin Davis	d2fd7f88fd	Enabling OSX Oculus plugin	2016-08-12 22:28:43 -07:00
Andrew Meadows	85d87fe13f	Merge pull request #8218 from huffman/feat/load-improvements ... Speed up gamma correction in cube map processing	2016-08-09 11:10:36 -07:00
Ryan Huffman	9b137570cf	Fix srgb_gen lookup table generation	2016-08-08 15:44:08 -07:00
Ryan Huffman	d40b783ce2	Add comments to srgb_gen.py	2016-08-08 12:06:09 -07:00
Ryan Huffman	28b3ff9bca	Update generation of srgb to linear lookup to include python script	2016-08-08 12:04:06 -07:00
samcake	307243da8b	cleaning compilation warnings and tuning the FBX material mapping pass	2016-07-13 11:04:53 -07:00
samcake	2fbdb22493	Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward	2016-07-08 18:14:05 -07:00
Andrew Meadows	1eb0b6a231	apply FBXGeometry.scaleOffset to mesh vertices	2016-05-31 11:38:58 -07:00
Andrew Meadows	402b7f2282	address review feedback	2016-05-25 20:53:43 -07:00
Andrew Meadows	2efec2a878	fix warning on windows about 64 to 32 bit cast	2016-05-25 19:31:21 -07:00
Andrew Meadows	e8e059c637	better variable names and fewer magic numbers	2016-05-25 19:31:21 -07:00
Andrew Meadows	21ef30d410	fix warning on windows build	2016-05-25 19:31:21 -07:00
Andrew Meadows	7ee4dea4ca	remove magic number	2016-05-25 19:31:21 -07:00
Andrew Meadows	78357057b6	return non-zero on error, add verbose option	2016-05-25 19:31:21 -07:00
Andrew Meadows	7d7c991447	connect progress callback	2016-05-25 19:31:21 -07:00
Andrew Meadows	0647f5b2d0	attempt to close open mesh parts	2016-05-25 19:31:21 -07:00
Andrew Meadows	f8e2cf8064	cleanup vhacd-util logging and variable names	2016-05-25 19:31:21 -07:00
samcake	670826effc	appeasing linux gods ?	2016-05-12 14:50:41 -07:00
samcake	c6aeaf308b	appeasing linux gods ?	2016-05-12 14:36:45 -07:00
samcake	a436c54817	make scribe spit out bigger chunks of litteral strings	2016-05-12 14:14:05 -07:00
samcake	2d573963bb	Introducing the unlit material	2016-05-04 18:50:52 -07:00
Atlante45	778c19d7e4	Make sure the socket allows fragmenting	2016-04-21 08:38:08 -07:00
Atlante45	492bc75d68	Reduce max packet size to 1492	2016-04-20 15:58:01 -07:00
Seth Alves	6025a66fa1	Merge pull request #7532 from Atlante45/feat/delayed-decrease ... Delay congestion epochs first decrease	2016-04-01 18:07:43 -07:00
Atlante45	0409479a12	CR	2016-03-31 16:36:34 -07:00
Atlante45	a3b771c4dc	UdtTest uses Mbps	2016-03-31 10:46:09 -07:00
howard-stearns	51a4154ae7	Check results of qUncompress, and catch fbx reader throws in utility ... programs.	2016-03-30 16:56:39 -07:00
Stephen Birarda	57da7c2ba7	add handling for short circuit loss in SendQueue	2016-03-23 17:29:46 -07:00
samcake	9cb8bd0808	Adding one more feature for NULL_VAR in scribe function parameters and unifying the MAterialTexture shader code	2016-02-23 02:41:26 -08:00
Stephen Birarda	8d47d70543	remove old nsis template and image	2016-01-15 15:41:34 -08:00
Stephen Birarda	ded210db39	exclude udt-test from ALL_BUILD	2016-01-15 15:41:34 -08:00
Stephen Birarda	3f7aa6a15a	changes to shortcut names for win installer	2016-01-04 12:04:22 -08:00
Stephen Birarda	6755c31cd8	some changeover from stack manager to console for installer	2016-01-04 11:01:34 -08:00
Stephen Birarda	817bbb09d2	rename console target to High Fidelity Console	2016-01-04 10:54:51 -08:00
Leonardo Murillo	0bd823e20c	Fix to install path	2015-12-31 10:09:27 -06:00
Leonardo Murillo	2bad5437a9	Adding default content set as optional installer component	2015-12-31 09:07:11 -06:00
Leonardo Murillo	ea6850c423	Changes per convo with Philip	2015-12-29 10:16:27 -06:00
Leonardo Murillo	8dc16f29bc	Fixes to uninstaller	2015-12-23 19:06:46 -06:00
Leonardo Murillo	02d317dc24	Better compression and fixing uninstaller	2015-12-23 14:55:47 -06:00
Leonardo Murillo	63a1ea6282	Couple of bugs	2015-12-23 14:26:03 -06:00
Leonardo Murillo	baf095f4af	Lots and lots of changes to installer	2015-12-23 14:16:49 -06:00
Leonardo Murillo	c1bac2f9bd	Fixing uninstall record	2015-12-18 08:47:47 -06:00
Leonardo Murillo	66770cc907	Finishing touches	2015-12-16 16:11:35 -06:00
Leonardo Murillo	cbed8bf35a	NSIS Changes	2015-12-16 15:12:14 -06:00
Leonardo Murillo	711d02ba2f	Consolidating installer checkpoint	2015-12-16 14:26:24 -06:00
Atlante45	d3224bfde3	More warning fixes	2015-12-11 16:03:44 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Ryan Huffman	c2049e5308	Fix udt-test to work with ReceivedMessage updates	2015-12-07 08:52:23 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Leonardo Murillo	9ad865c7f0	checkpoint	2015-11-20 15:19:45 -06:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Ryan Huffman	f0ad7f85dc	Add readHead* to ReceivedMessage	2015-11-18 15:30:30 -08:00
Anthony J. Thibault	a763858080	Revert cache-extract ... This reverts these commits: * 82b26b7 Code convention fixes * 9a484ff Fixes for windows * 086b064 Dumps all urls extracted to stdout. * c002888 Added cache extractor to the tools directory	2015-11-11 11:22:05 -08:00
Anthony J. Thibault	82b26b75f4	Code convention fixes	2015-11-09 08:14:27 -08:00
Anthony J. Thibault	9a484ff00d	Fixes for windows	2015-11-06 15:33:06 -08:00
Anthony J. Thibault	086b064527	Dumps all urls extracted to stdout.	2015-11-06 15:07:38 -08:00
Anthony J. Thibault	c002888808	Added cache extractor to the tools directory ... It should find the local High Fidelity/Interface qt cache, iterate over each file in the cache and output each corresponding file into the High Fidelity/Interface/extracted dir. The file path will be determined from the source url. Untested on windows.	2015-11-06 14:52:12 -08:00
Seth Alves	2b24ef2c83	Merge pull request #6114 from Atlante45/vhacd_fix ... Fix vhacd for models with quads	2015-10-19 16:11:28 -07:00
Atlante45	47d8afa6a8	Fix vhacd for models with quads	2015-10-19 15:22:10 -07:00
Brad Davis	282cdadf63	Fixing line endings	2015-10-18 22:55:14 -07:00
Atlante45	a34e1d85a5	Close current packet fix	2015-10-02 14:16:44 -07:00
Atlante45	15f7745bcc	JSON stats reliable and ordered	2015-09-11 14:21:54 +02:00
Ryan Huffman	b73d307210	Move std::placeholders::_1 to where they are used	2015-09-01 12:24:38 -07:00
Ryan Huffman	fb8e822fa8	Fix lines longer than 120 columns	2015-09-01 12:14:58 -07:00
Ryan Huffman	019d234ffd	Replace std::bind for methods that use std::unique_ptr with a lambda	2015-09-01 11:58:33 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Stephen Birarda	67816c033a	output megabits per second not per interval	2015-08-25 15:43:21 -07:00
Stephen Birarda	9ff7bfd0b5	some header cleanup in UDTTest output	2015-08-25 11:21:04 -07:00
Stephen Birarda	92116dd6e7	added stats for receive rate in Mbits	2015-08-25 11:04:24 -07:00
Brad Davis	380b0cb23c	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
Brad Davis	c3991dbb8c	Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor ... ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 23:57:16 -07:00
Anthony J. Thibault	1b3d7fabc8	ResourceCache, NetworkGeometry and Model refactoring and optimizations. ... * Removed validation logic from Resource class, Qt does this internally and is more standards compliant. This should result in more accurate caching and faster resource fetching when cache is stale and validation fails. * Added loaded and failed slots to Resource class, so it does not have to be polled. * NetworkGeometry now uses multiple Resource objects to download the fst/mapping file and the fbx/obj models. * NetworkGeometry is no longer a subclass of Resource * NetworkGeometry now has signals for success and failure, you no longer have to poll it to determine when loading is complete (except for textures *sigh*) Some functionality was removed * NetworkGeometry no longer has a fallback * NetworkGeometry no longer loads LODs or has lod logic. * The number of FBXGeometry copies is greatly reduced. * Model::setURL no supports fallback URL, delayLoad or retainCurrent option. This can result in a pop when switching avatars, and there's no longer a default if avatar loading fails.	2015-08-20 18:59:51 -07:00
Stephen Birarda	1756e60647	complete test for ordered packets in udt-test target	2015-08-20 14:22:05 -07:00
Stephen Birarda	039e6121bc	add randomization of data for ordered test	2015-08-20 12:44:10 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00
Ryan Huffman	74547777df	Add basic test to send packetList in udt-test	2015-08-18 23:12:09 -07:00
Stephen Birarda	fd43c48eac	resolve conflicts on merge with birarda/protocol	2015-08-18 11:48:36 -07:00
Stephen Birarda	972cf8cb02	remove the container-profile tool	2015-08-18 11:32:00 -07:00
Stephen Birarda	c6467f7fbc	rename the container-test to container-profile	2015-08-18 11:31:11 -07:00
Stephen Birarda	bf919f105a	add a simple container-test, speed HifiSockAddr hashing	2015-08-18 11:29:07 -07:00
Stephen Birarda	5c2348cf0d	remove header for commented stats	2015-08-18 09:49:39 -07:00
Stephen Birarda	ffa2070a46	remove commented stats in UDTTest	2015-08-18 09:44:56 -07:00
Stephen Birarda	2ec4d8ff3c	rename return of HifiSockAddr objects for connections	2015-08-17 16:39:12 -07:00
Stephen Birarda	5124fc1ea0	add LogHandler to UDTTest	2015-08-04 16:31:40 -07:00
Stephen Birarda	7b8ca2c0f2	fix suppression of link saturation messages	2015-08-04 16:29:53 -07:00
Stephen Birarda	52b1b647a2	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-08-04 10:51:23 -07:00
Bradley Austin Davis	3c76c0d4b6	Merge remote-tracking branch 'upstream/master' into core	2015-08-04 10:23:54 -07:00
Stephen Birarda	49dba76986	resolve conflicts on merge with clement	2015-08-03 19:14:52 -07:00
Atlante45	924a4d3c21	Change connection stats	2015-08-03 19:12:58 -07:00
Stephen Birarda	a10746a448	set the max window size, correct a typo	2015-08-03 19:12:39 -07:00
Atlante45	40520c204f	Stats improvement	2015-08-03 17:39:09 -07:00
Stephen Birarda	b5ec02bd01	go back to previous PacketTimeWindow code	2015-08-03 15:36:08 -07:00
Atlante45	8704f05812	Added UDTTest server stats	2015-08-03 14:40:18 -07:00
Stephen Birarda	20f33b3b64	fix sendqueue sleep timing to use microseconds	2015-08-03 14:34:12 -07:00
Stephen Birarda	51b47a1212	change stats sampling to 100ms	2015-08-03 13:27:00 -07:00
Stephen Birarda	62d4467f41	use a vector for events in ConnectionStats	2015-08-03 12:09:25 -07:00
Philip Rosedale	761f638ce3	Merge pull request #5466 from sethalves/vhacd-improvements ... vhacd tool -- make the height of the tetrahedrons in 'fatten' mode less tall.	2015-08-03 11:18:37 -07:00
Stephen Birarda	4230d02184	rename col for light ACKs	2015-08-03 11:06:48 -07:00
Stephen Birarda	826c8d5150	more stats in UDTTest for sender	2015-07-31 19:52:20 -07:00
Stephen Birarda	7f8c993bd7	make send rate actually send rate, don't sync as sender	2015-07-31 19:42:27 -07:00
Stephen Birarda	74a2d985eb	tell the send queue about ACKs on light ACK	2015-07-31 19:17:02 -07:00
Stephen Birarda	41c6220731	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
Stephen Birarda	df1e97c591	cleanup RTT stats, add assert for CT	2015-07-31 17:19:14 -07:00
Sam Gateau	ca4dbdb996	Merging with upstream and compiling on windows	2015-07-31 16:14:53 -07:00
Stephen Birarda	d420bca88e	fix for ACK2 sending, output prettier stats	2015-07-31 16:14:33 -07:00
Stephen Birarda	ce21204151	add output of connection stats in UDTTest	2015-07-31 15:09:30 -07:00
Brad Davis	aea07fe671	Merge branch 'master' into gl4_1 ... Conflicts: libraries/gpu/src/gpu/Config.slh libraries/render-utils/src/deferred_light_limited.slv libraries/render-utils/src/simple.slf libraries/render-utils/src/simple_textured.slf tests/render-utils/src/main.cpp tools/scribe/src/main.cpp	2015-07-31 15:08:37 -07:00
Seth Alves	5bae9843f5	code review	2015-07-31 09:34:50 -07:00
Seth Alves	c8f398024e	replace a magic number with a constant	2015-07-30 21:16:07 -07:00
Seth Alves	0bc94158a8	make the height of the tetrahedrons in 'fatten' mode less tall.	2015-07-30 21:09:14 -07:00
Stephen Birarda	a38e7b0431	cleanup SendQueue start and UDTTest bind	2015-07-30 17:59:27 -07:00
Stephen Birarda	8e786cb953	repairs while testing with UDTTest	2015-07-30 17:40:51 -07:00
Stephen Birarda	805c5a6aff	reset initial to 500, remove debug	2015-07-30 17:22:25 -07:00
Stephen Birarda	0f1d1a16a7	actually call sendReliablePacket for write of reliable	2015-07-30 17:12:44 -07:00
Stephen Birarda	d340515ab3	complete the initial version of UDTTest	2015-07-30 17:09:25 -07:00
Stephen Birarda	80ef80ec2e	add all initial command line options for UDTTest	2015-07-30 16:07:14 -07:00
Stephen Birarda	532ac69091	initial version of UDTTest tool	2015-07-30 15:36:54 -07:00
Howard Stearns	06aa107762	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-30 09:57:02 -07:00
Brad Hefta-Gaub	b95e4e1e93	Merge pull request #5323 from MarcelEdward/20605 ... Removed the line where the directory is stripped off the RelativeFile	2015-07-30 07:30:01 -07:00
Howard Stearns	1663d095a1	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-24 14:08:51 -07:00
Seth Alves	6ba135de09	when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down	2015-07-24 07:16:40 -07:00
Seth Alves	7c8d52cbd1	back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer	2015-07-22 13:41:31 -07:00
Marcel Verhagen	8f0893ba21	Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives. ... Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file. So it now does not break existing content. Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.	2015-07-22 22:34:45 +02:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Brad Davis	d8dde71c8f	Make scribe generated shaders more readable	2015-07-12 18:46:08 -07:00
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Brad Davis	f51c43f90d	Working on GL 4.1	2015-06-23 09:47:18 -07:00
Seth Alves	b258aeaa3d	merge from master	2015-06-18 10:04:14 -07:00
ZappoMan	58ee5217e3	fix some warnings	2015-06-17 14:08:02 -07:00
Seth Alves	508ae276c6	enable -Wdouble-promotion	2015-06-16 18:23:10 -07:00
David Rowe	a01830f8f8	Fix some double to float conversion warnings in Windows builds	2015-05-22 12:32:02 -07:00
Howard Stearns	4090f892b2	Merge remote-tracking branch 'upstream/master' into objReader	2015-05-05 14:58:18 -07:00
Stephen Birarda	6cff75f7c1	resolve conflicts on merge with upstream/master	2015-05-04 10:05:44 -07:00
Seth Alves	b2583298a9	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-05-03 10:45:55 -07:00
Stephen Birarda	b9c9ff6a14	clean up various warnings	2015-05-01 16:49:13 -07:00
Howard Stearns	242001a589	Restore some very odd modularity used by VHACDUtil.	2015-04-29 22:17:44 -07:00
Stephen Birarda	1058a61ddd	only look for OpenMP on UNIX	2015-04-15 15:21:35 -07:00
Stephen Birarda	134704412a	check for OpenMP on non Win32 platforms	2015-04-15 15:13:39 -07:00
Stephen Birarda	6d53bb2809	remove extra directives from vhacd-util cmake	2015-04-15 14:48:42 -07:00
Stephen Birarda	03129f98d4	make VHACD an external project	2015-04-15 13:51:51 -07:00
Seth Alves	922452f5c3	use output filename as base-name when splitting files	2015-04-13 09:21:17 -07:00
Seth Alves	efa5c473d2	add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields	2015-04-09 14:29:17 -07:00
Seth Alves	62fe9870e3	more command-line arguments	2015-04-08 10:48:13 -07:00
Seth Alves	1a7bdee180	added code to split an fbx into one obj file per mesh-part	2015-04-03 19:30:05 -07:00
Seth Alves	2dc4410f7e	added code to split an fbx into one obj file per mesh-part	2015-04-03 19:29:45 -07:00
Seth Alves	a01ade2d8d	more command-line options	2015-04-02 09:19:47 -07:00
Seth Alves	17f110172f	more command-line flags for v-hacd parameters	2015-04-02 06:57:47 -07:00
Seth Alves	06b38615d5	sort meshes into the order they appeared in the model file so that start and end arguments mean something usefil	2015-04-01 17:53:33 -07:00
Seth Alves	c035de4e73	cleanups	2015-04-01 11:38:54 -07:00
Seth Alves	4859278214	get rid of point/tri bounce structures in favor of FBXGeometry	2015-04-01 11:17:25 -07:00
Seth Alves	23903570f0	added more options to v-hacd util, messed with fatten-mesh code some more	2015-04-01 09:19:34 -07:00
Seth Alves	5cc12b8b47	allow for quads in the model which is being used as the template for generating the collision shape. added a flag to run the fatten-face code	2015-03-31 17:00:36 -07:00
Seth Alves	071b6a21de	Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs	2015-03-30 13:44:39 -07:00
Seth Alves	2dd33e5334	don't include build-ext in tags	2015-03-29 05:40:16 -07:00
Seth Alves	43c3c621a8	I can't set VHACD_ROOT_DIR and run cmake with this line.	2015-03-28 17:14:39 -07:00
Seth Alves	7c4ada9953	multiply points from fbs meshes by their transformation matrices	2015-03-26 06:37:05 -07:00
Seth Alves	c68f5dd1fa	added various controls for the convex hull generator	2015-03-25 15:13:40 -07:00
Brad Davis	54f2774d2e	Organize projects into folders for IDEs that support it	2015-03-19 15:45:11 -07:00
Seth Alves	d074cec135	fix obj writer in vhacd util	2015-03-15 08:14:25 -07:00
Sam Gateau	853cf75f60	adding the atmosphere in the directional lighting pass, debug	2015-03-10 09:37:13 -07:00
Sam Gateau	d9c071a2a9	trying to put the atmospheric effect in a shader header and use it on the directional lighting pass	2015-03-10 00:47:27 -07:00
Seth Alves	0833fc588b	coding standard	2015-03-09 06:56:35 -07:00
Seth Alves	3642e93b3f	keep triangles facing outward	2015-03-07 11:28:09 -08:00
Seth Alves	d642b52de3	swap y and z coords because normal obj format has 3rd value as up	2015-03-07 07:54:19 -08:00
Seth Alves	adfacf1e98	adjust debugging prints	2015-03-07 07:53:45 -08:00
Seth Alves	858d15d0ba	obj reader sort-of works	2015-03-06 13:15:53 -08:00
Seth Alves	0d093b4921	rename binary from vhacd to vhacd-util. vhacd-util outpus obj files	2015-03-05 15:38:55 -08:00
Seth Alves	af4957ff14	start to write out obj from vhacd	2015-03-05 06:38:42 -08:00
ZappoMan	5c3c94a618	remove metavoxels	2015-03-02 17:21:43 -08:00
Virendra Singh	d4367924ad	Clean up coding standard violations	2015-02-27 00:59:59 +05:30
Virendra Singh	95839dd64e	untabify the source files	2015-02-27 00:27:18 +05:30
Virendra Singh	36c3131524	Rectifying bad merge in BUILD.md and BUILD_WIN.md	2015-02-27 00:14:46 +05:30
Virendra Singh	b3fdb19cad	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 ... Conflicts: BUILD.md BUILD_WIN.md	2015-02-26 22:16:35 +05:30
Virendra Singh	434c0b569f	Make vhacd tool optional	2015-02-26 06:28:28 +05:30
Stephen Birarda	33b0fd24a6	don't call copy dll step for scribe	2015-02-25 11:02:05 -08:00
Stephen Birarda	fd8240669b	fix for windeployqt for executables	2015-02-25 10:39:44 -08:00
Kodey	a0a1564720	Merge branch '20305' of https://github.com/virneo/hifi into 20305	2015-02-25 08:45:29 +05:30
Kodey	a5aeb3b980	cmake changes for building on linux	2015-02-25 08:45:00 +05:30
Virendra Singh	9a153a6506	Time measurement ... Used c++11 chrono class to measure elapsed time.	2015-02-25 08:36:58 +05:30
Virendra Singh	c15c549881	Code formatting	2015-02-25 07:47:00 +05:30
Virendra Singh	ce04b1accb	vhacd tool ... this tool is as per joblist #20305. Its provides an executable to test VHACD computation on simple fbx models.	2015-02-21 15:40:39 +05:30
Virendra Singh	ddd137ed60	cmake changes for vhacd ... cmake changes to create a new project vhacd as a seperate executable in tools directory	2015-02-21 15:39:16 +05:30
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
Stephen Birarda	7d25013659	add DLL copying for all project targets	2015-02-17 17:44:58 -08:00
Stephen Birarda	9c13bec476	remove glm include where no longer required	2015-02-13 10:38:01 -08:00
Seth Alves	bee895ba0a	capture network bandwidth stats from NodeList rather than various places	2015-01-31 20:02:04 -08:00
Seth Alves	105b2c5fd7	shell script to regenerate emacs TAGS file for project	2015-01-31 10:54:01 -08:00
David Rowe	07b30da2ac	Fix miscellaneous types and casts	2015-01-08 13:44:51 -08:00
Sam Gateau	ccc77ce7a6	fixing command for scribe	2014-12-30 14:30:18 -08:00
Sam Gateau	7ea9f92492	polishing the scribe -c++ case	2014-12-23 18:25:35 -08:00
dev	42157161e0	fix the c++ header generation for mac though the brand new raw string format of c++11	2014-12-23 18:19:25 -08:00
Sam Gateau	c5eb04336f	first version of SCribe used for shaders in render-utils	2014-12-23 16:27:02 -08:00
Sam Gateau	249e6d02f8	Fixing typo and syntax	2014-12-23 14:49:06 -08:00
Sam Gateau	4004831377	Fixing typo and syntax	2014-12-23 14:46:58 -08:00
Sam Gateau	522ca55ed8	Fixing typo and syntax	2014-12-23 14:41:49 -08:00
Sam Gateau	0578a54ea0	Fixing typo and syntax	2014-12-23 14:41:05 -08:00
Sam Gateau	4bdc0d718d	Fixing typo and syntax	2014-12-23 14:29:26 -08:00
Sam Gateau	59387be856	Fixing typo and syntax	2014-12-23 14:20:12 -08:00
Sam Gateau	e16da55b1b	cleaning scribe main and checking naming	2014-12-22 16:02:58 -08:00
Sam Gateau	6b88eaceb5	FIx typos	2014-12-22 15:44:46 -08:00
Sam Gateau	4ee005affa	adding scribe tool	2014-12-22 11:51:54 -08:00
Stephen Birarda	114e3bb2ff	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
Sam Gateau	738369e21f	Replacing glutSolidSphere by a cached Geometry ... Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...) - replaced all the instances of "glutSolidSphere" - Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using fOuterRadius	2014-10-03 16:55:58 -07:00
Stephen Birarda	2fda95ae8f	repair build of various tools	2014-08-08 13:17:54 -07:00
Stephen Birarda	b1310c065c	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
Stephen Birarda	0449660f66	don't bubble up hifi libraries since they are static	2014-08-08 13:17:54 -07:00
Stephen Birarda	e4d01d269c	use shared dependency linking macro in hifi projects	2014-08-08 13:17:54 -07:00
Stephen Birarda	26f7b1ba62	add macro to link shared dependencies to target	2014-08-08 13:17:54 -07:00
Stephen Birarda	c9f8433a2d	tweak setup_hifi_library to bubble up full path of Qt modules	2014-08-08 13:17:54 -07:00
Stephen Birarda	87cf262b9e	get to successful cmake after library link macro changes	2014-08-08 13:17:53 -07:00
Stephen Birarda	2796f71419	library cleanup to suppress warnings on cmake 3.0	2014-07-30 15:06:15 -07:00
Andrzej Kapolka	9e61b5e45f	Fix Windows link error (hopefully).	2014-06-30 11:16:35 -07:00
Andrzej Kapolka	4b2d122f3d	Working on factoring out the common metavoxel endpoint/client code.	2014-06-26 16:12:11 -07:00
Andrzej Kapolka	eea45e98d7	Fix to include GLM.	2014-06-18 12:22:45 -07:00
Andrzej Kapolka	7931173671	Working on tools to convert bitstreams to/from json.	2014-06-17 12:33:31 -07:00
Andrzej Kapolka	37c977af02	Tests working for reading JSON.	2014-06-16 19:12:21 -07:00
Andrzej Kapolka	77b6a209ab	More progress on json reading.	2014-06-16 14:51:22 -07:00
Andrzej Kapolka	3ec127afde	Spoke a little too soon.	2014-06-15 16:46:43 -07:00
Stephen Birarda	619e9d7cd3	more header repairs caught via find	2014-04-09 09:52:00 -07:00
Stephen Birarda	d9fdd87aa3	add apache header to mtc main	2014-04-08 17:50:11 -07:00
Andrzej Kapolka	94a7ded212	Slip in a fix for Windows build warnings on mtc-generated code.	2014-04-08 15:36:21 -07:00
Andrzej Kapolka	1b980eebf2	More work on delta streaming.	2014-03-21 14:49:40 -07:00
Andrzej Kapolka	9c2f6ab2e5	Working on delta streaming for collections.	2014-03-20 18:28:43 -07:00
Andrzej Kapolka	24b2da1c0d	Working on delta streaming.	2014-03-18 13:14:21 -07:00
Andrzej Kapolka	6d14ad6ab5	Missed a spot.	2014-03-17 15:13:14 -07:00
Andrzej Kapolka	d8b83fd308	More work on version-resilient type streaming.	2014-03-17 15:12:43 -07:00
Andrzej Kapolka	61660f890e	Working on metadata for metatypes.	2014-03-17 11:39:16 -07:00
ZappoMan	1ceb05bf09	click harder	2014-03-08 18:22:30 -08:00
Stephen Birarda	628f91cd73	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00
Andrzej Kapolka	f9b0ff0608	Various bits of streaming work: send delete messages for main channel on ... reliable channel, test messages on main channel.	2014-02-12 12:33:40 -08:00
Andrzej Kapolka	524ceb4ed2	Working on tests for datagram sequencing, added autogenerated ==/!= operators ... to mtc.	2014-02-09 16:26:53 -08:00
Andrew Meadows	d28ed70ca9	merge pull request 1446	2014-01-10 15:55:38 -08:00
Stephen Birarda	0fdbfe8ea8	move gen_stars to the tools folder	2013-05-22 12:39:27 -07:00
ZappoMan	9b5ee05141	added some sample files	2013-05-21 12:04:48 -07:00
ZappoMan	321d1952d6	first cut at exists bits	2013-05-20 12:56:59 -07:00
ZappoMan	7480283dd4	cleanup of packet header constants	2013-04-08 19:54:14 -07:00
ZappoMan	5415543dcd	adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands	2013-04-06 12:03:46 -07:00
ZappoMan	407fa95195	more delete voxel debugging, call reaverage colors on root node	2013-04-03 11:14:00 -07:00
ZappoMan	8988796285	more voxel delete debugging, use memcmp() instead of ==	2013-04-03 09:38:11 -07:00
ZappoMan	17427a9c4d	adding some new tools	2013-04-02 14:43:33 -07:00