245 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Пелипенко Иван	b60f133cc9	Merge pull request 'master' (#89) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/89	2021-07-24 16:34:50 +03:00
peri4	e0bb28560d	pip, Jenkinsfile	2021-07-24 16:34:13 +03:00
peri4	6a9c328308	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2021-07-24 16:33:51 +03:00
peri4	dab9f3185f	add deploy	2021-07-24 16:33:42 +03:00
andrey	066ab32adc	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2021-07-16 14:32:36 +03:00
andrey	67476644dd	update pip	2021-07-16 14:32:27 +03:00
Пелипенко Иван	f4034379ac	Merge pull request 'qad, qglengine' (#88) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/88	2021-07-15 16:01:11 +03:00
peri4	143083c950	qad, qglengine	2021-07-15 16:00:18 +03:00
Бычков Андрей	bc1e4d1fb9	Merge pull request 'add windows32' (#87) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/87	2021-07-15 13:41:00 +03:00
andrey	0df27b567b	add windows32	2021-07-15 11:50:37 +03:00
Пелипенко Иван	22640d3044	Merge pull request 'EComboBox and StringListEdit improvments' (#86) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/86	2021-07-06 22:43:48 +03:00
andrey	a45762afb7	qad version	2021-07-06 17:44:01 +03:00
andrey	0cbf5dbffa	EComboBox and StringListEdit improvments	2021-07-06 17:40:12 +03:00
Бычков Андрей	0012f9a37d	Merge pull request 'pip vector and maitrix foreach and qad ImageView LOD patch' (#85) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/85	2021-07-01 14:48:34 +03:00
andrey	53a1cb4814	pip vector and maitrix foreach and qad ImageView LOD patch	2021-07-01 14:46:37 +03:00
Пелипенко Иван	7d4c38ce67	Merge pull request 'qad' (#84) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/84	2021-06-19 00:12:40 +03:00
peri4	560f99cab3	qad	2021-06-19 00:12:09 +03:00
Бычков Андрей	0b5c390032	Merge pull request 'update pip & qad' (#83) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/83	2021-06-15 10:00:07 +03:00
andrey	d8a60dadff	update pip & qad	2021-06-15 09:57:54 +03:00
Пелипенко Иван	f3a0a4a3a1	Merge pull request 'master' (#82) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/82	2021-06-11 21:12:32 +03:00
peri4	77adf5b64b	pip	2021-06-11 21:11:35 +03:00
peri4	32e24b963f	cd, pip	2021-06-11 21:07:12 +03:00
Пелипенко Иван	f4bfee1215	Merge pull request 'master' (#81) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/81	2021-06-11 20:45:58 +03:00
Andrey	c099d229ac	update submodules	2021-06-11 20:39:40 +03:00
andrey	b77f04ba59	picoutobj and qglengine refactoring	2021-05-31 13:47:55 +03:00
Пелипенко Иван	f56ddc73c8	Merge pull request 'master' (#80) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/80	2021-05-22 21:53:15 +03:00
peri4	351d23b11f	cmake	2021-05-22 21:52:17 +03:00
andrey	b0fc989388	pip qglengine	2021-05-20 17:03:04 +03:00
Пелипенко Иван	e8a7f02b8f	Merge pull request 'pip' (#79) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/79	2021-05-06 17:42:33 +03:00
peri4	b4d4b76b7e	pip	2021-05-06 17:42:15 +03:00
Пелипенко Иван	c6ab0ff16d	Merge pull request 'pip, cmake' (#78) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/78	2021-05-06 14:03:28 +03:00
peri4	4198ca574a	pip, cmake	2021-05-06 14:03:14 +03:00
Пелипенко Иван	edd3bde8d6	Merge pull request 'pip, cmake' (#77) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/77	2021-05-06 13:28:06 +03:00
peri4	9d78e279a8	pip, cmake	2021-05-06 13:27:40 +03:00
Пелипенко Иван	1a7b4fff2e	Merge pull request 'pip, qad' (#76) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/76	2021-05-05 22:00:48 +03:00
peri4	706b157c13	pip, qad	2021-05-05 21:57:09 +03:00
Пелипенко Иван	49af7e7835	Merge pull request 'pip' (#75) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/75	2021-04-29 12:49:54 +03:00
peri4	fc446fcf98	pip	2021-04-29 12:49:28 +03:00
Пелипенко Иван	6e6fc1dcd8	Merge pull request 'pip' (#74) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/74	2021-04-29 12:25:56 +03:00
peri4	b849d7a672	pip	2021-04-29 12:25:30 +03:00
Andrey	57e1ac6075	deploy dir fullname	2021-04-23 16:28:21 +03:00
Andrey	4f6ba22d12	path fix	2021-04-23 15:08:57 +03:00
Andrey	9c215fe520	revert QGLENGINE and QGLVIEW flags	2021-04-23 10:16:47 +03:00
Пелипенко Иван	2d1d22f6b8	Merge pull request 'qad HAS_GL option, by default disabled for linux dockers' (#73) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/73	2021-04-23 00:35:36 +03:00
Ivan Pelipenko	744c688003	qad HAS_GL option, by default disabled for linux dockers	2021-04-23 00:35:05 +03:00
Бычков Андрей	4c3f8b5614	Merge pull request 'opengl linux' (#72) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/72	2021-04-22 14:51:24 +03:00
andrey	13a8064fa3	opengl linux	2021-04-22 14:40:10 +03:00
Пелипенко Иван	c784297d3d	Merge pull request 'pip' (#71) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/71	2021-04-21 18:28:41 +03:00
peri4	e06d9ee207	pip	2021-04-21 18:28:23 +03:00
Пелипенко Иван	b6b459e735	Merge pull request 'deploy' (#70) from master into release ... Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/70	2021-04-21 17:13:18 +03:00