Commit Graph

265 Commits

Author SHA1 Message Date
7c7a6dd173 Merge pull request 'deploy fix' (#99) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/99
2021-07-25 18:04:53 +03:00
66463b27ea deploy fix 2021-07-25 18:04:31 +03:00
f77062ef25 Merge pull request 'deploy fix' (#98) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/98
2021-07-25 17:42:07 +03:00
2311f47898 deploy fix 2021-07-25 17:41:48 +03:00
df6577b80f Merge pull request 'deploy fix' (#97) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/97
2021-07-25 11:06:51 +03:00
de69867e38 deploy fix 2021-07-25 11:06:27 +03:00
b74ede80b8 Merge pull request 'deploy fix' (#96) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/96
2021-07-25 10:44:52 +03:00
35f61f0c42 deploy fix 2021-07-25 10:43:17 +03:00
9d0e3e5481 Merge pull request 'Jenkinsfile' (#95) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/95
2021-07-24 18:42:00 +03:00
1f9243fb8d Jenkinsfile 2021-07-24 18:41:46 +03:00
f5e7ba6f45 Merge pull request 'Jenkinsfile' (#94) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/94
2021-07-24 18:39:38 +03:00
c3af06ff65 Jenkinsfile 2021-07-24 18:39:19 +03:00
c3d9c0e2f9 Merge pull request 'Jenkinsfile' (#93) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/93
2021-07-24 18:35:57 +03:00
6408ebaf5b Jenkinsfile 2021-07-24 18:35:42 +03:00
cae949eacb Merge pull request 'deploy fix' (#92) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/92
2021-07-24 18:29:22 +03:00
e48fa4fffa deploy fix 2021-07-24 18:27:59 +03:00
2606da735f Merge pull request 'deploy fix' (#91) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/91
2021-07-24 18:02:48 +03:00
a11bc3d7f8 deploy fix 2021-07-24 18:02:33 +03:00
746745188e Merge pull request 'Jenkinsfile' (#90) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/90
2021-07-24 17:49:33 +03:00
8b059bd783 Jenkinsfile 2021-07-24 17:49:03 +03:00
b60f133cc9 Merge pull request 'master' (#89) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/89
2021-07-24 16:34:50 +03:00
e0bb28560d pip, Jenkinsfile 2021-07-24 16:34:13 +03:00
6a9c328308 Merge branch 'master' of https://git.shs.tools/SHS/shstk 2021-07-24 16:33:51 +03:00
dab9f3185f add deploy 2021-07-24 16:33:42 +03:00
066ab32adc Merge branch 'master' of https://git.shs.tools/SHS/shstk 2021-07-16 14:32:36 +03:00
67476644dd update pip 2021-07-16 14:32:27 +03:00
f4034379ac Merge pull request 'qad, qglengine' (#88) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/88
2021-07-15 16:01:11 +03:00
143083c950 qad, qglengine 2021-07-15 16:00:18 +03:00
bc1e4d1fb9 Merge pull request 'add windows32' (#87) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/87
2021-07-15 13:41:00 +03:00
0df27b567b add windows32 2021-07-15 11:50:37 +03:00
22640d3044 Merge pull request 'EComboBox and StringListEdit improvments' (#86) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/86
2021-07-06 22:43:48 +03:00
a45762afb7 qad version 2021-07-06 17:44:01 +03:00
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
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/85
2021-07-01 14:48:34 +03:00
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
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/84
2021-06-19 00:12:40 +03:00
560f99cab3 qad 2021-06-19 00:12:09 +03:00
0b5c390032 Merge pull request 'update pip & qad' (#83) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/83
2021-06-15 10:00:07 +03:00
d8a60dadff update pip & qad 2021-06-15 09:57:54 +03:00
f3a0a4a3a1 Merge pull request 'master' (#82) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/82
2021-06-11 21:12:32 +03:00
77adf5b64b pip 2021-06-11 21:11:35 +03:00
32e24b963f cd, pip 2021-06-11 21:07:12 +03:00
f4bfee1215 Merge pull request 'master' (#81) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head There was a failure building this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/81
2021-06-11 20:45:58 +03:00
c099d229ac update submodules 2021-06-11 20:39:40 +03:00
b77f04ba59 picoutobj and qglengine refactoring 2021-05-31 13:47:55 +03:00
f56ddc73c8 Merge pull request 'master' (#80) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/80
2021-05-22 21:53:15 +03:00
351d23b11f cmake 2021-05-22 21:52:17 +03:00
b0fc989388 pip qglengine 2021-05-20 17:03:04 +03:00
e8a7f02b8f Merge pull request 'pip' (#79) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/79
2021-05-06 17:42:33 +03:00
b4d4b76b7e pip 2021-05-06 17:42:15 +03:00