Commit Graph

Select branches

Hide Pull Requests

concurrent

master

release

#1

#10

#12

#13

#14

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#3

#31

#33

#34

#36

#37

#39

#4

#40

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#67

#68

#69

#7

#8

#9

Mono Color

• 75b3bb46ac Merge pull request 'fix QCodeEdit code complete popup size' (#69) from master into release release andrey 2020-09-07 10:12:23 +03:00
• 75c6b5abcc fix QCodeEdit code complete popup size master andrey 2020-09-04 18:06:52 +03:00
• 97c6ddeaea Merge pull request 'master' (#68) from master into release andrey 2020-08-31 18:53:02 +03:00
• 235eb2acb8 remove graphic expand buttons, update pip andrey 2020-08-31 18:35:32 +03:00
• bd5579b8f1 qrc refactoring andrey 2020-08-27 14:29:02 +03:00
• 7f820c8f67 new Graphic feature - floatingAxisType: Free, TraceX/Y qpicalculator moved to PIEvaluator peri4 2020-08-26 23:44:50 +03:00
• 9130496887 restore my error peri4 2020-08-25 22:38:34 +03:00
• cca2e0f2d7 moved qpicalculator peri4 2020-08-25 22:29:59 +03:00
• b92a1fa558 moved to shstk peri4 2020-08-25 22:24:02 +03:00
• d4f1c78a6e pip andrey 2020-08-24 13:23:50 +03:00
• 274fb20103 microchange peri4 2020-08-22 01:04:46 +03:00
• acef4db1db QAD and PIQt overall messages (as at recent PIP) peri4 2020-08-22 00:58:46 +03:00
• 9f84e5c3df new "qt_generate_export_header" macro peri4 2020-08-21 22:13:06 +03:00
• aa009c36b0 work with QGL* peri4 2020-08-21 20:16:02 +03:00
• 5ae5034145 Merge pull request 'master' (#67) from master into release peri4 2020-08-20 13:47:31 +03:00
• e4340a7215 qglengine/CMakeLists.txt fix peri4 2020-08-20 13:25:37 +03:00
• f7eabd1a85 export headers for QAD, PIQt and cd_utils peri4 2020-08-19 22:42:37 +03:00
• 3ca32f4972 Merge branch 'master' of https://git.shs.tools/SHS/libs peri4 2020-08-19 19:55:42 +03:00
• 68512b6c08 move qpiconnection peri4 2020-08-19 19:55:32 +03:00
• 5d32c02b5f forget cd_utils fixed dangling piconnedit peri4 2020-08-19 17:27:22 +03:00
• d0148bf460 tree changes peri4 2020-08-19 16:22:10 +03:00
• 76d9604282 missing CMakeLists.txt on previous commit peri4 2020-08-19 00:48:38 +03:00
• 3e1768b418 tree changes peri4 2020-08-19 00:47:44 +03:00
• 016753fb4d Merge pull request 'master' (#65) from master into release andrey 2020-08-18 17:09:38 +03:00
• 4b7c513f7f flags() andrey 2020-08-18 17:03:13 +03:00
• 0f6bc121aa ImageView fix andrey 2020-08-18 17:02:14 +03:00
• 0ec173d9bb improve ImageView quality andrey 2020-08-18 16:59:58 +03:00
• cabacdd908 BlockView trace fix peri4 2020-08-17 12:10:13 +03:00
• f66138593c BlockView tracing fix peri4 2020-08-17 00:57:44 +03:00
• c49454bb03 another version of tracing across buses peri4 2020-08-17 00:32:59 +03:00
• efb5cbe484 blockview migrate to "deploy*" peri4 2020-08-16 16:36:46 +03:00
• b71db0530f Merge pull request 'pip' (#64) from master into release andrey 2020-08-14 19:55:38 +03:00
• ddc4da54be pip BlockBusItem paint fix peri4 2020-08-14 18:00:58 +03:00
• bb645bd71b Merge pull request 'master' (#63) from master into release andrey 2020-08-14 15:25:41 +03:00
• d6cc5f0033 QAD 1.7.0 backport PIChunkStream optimizations to ChunkStream peri4 2020-08-14 14:18:20 +03:00
• 055b8a9480 bus joint paint now configured with BlockView::setBusSquareNodes(), square or round. By default round peri4 2020-08-14 14:08:31 +03:00
• 12664842c7 Merge pull request 'master' (#62) from master into release andrey 2020-08-13 18:09:20 +03:00
• 8fbed9f427 revert busitem paint andrey 2020-08-13 18:09:04 +03:00
• e43ae02e48 Merge branch 'master' of https://git.signalmodelling.ru/SHS/libs andrey 2020-08-13 18:04:02 +03:00
• a9b9061475 binlog and PathEdit fixes andrey 2020-08-13 18:03:52 +03:00
• c41e92a9f5 Merge pull request 'master' (#61) from master into release andrey 2020-08-13 14:44:37 +03:00
• b37318a5a5 BlockView draw bus joint changed peri4 2020-08-13 14:13:23 +03:00
• 6f97d849e9 Merge branch 'master' of https://git.shs.tools/SHS/libs peri4 2020-08-13 13:00:59 +03:00
• 58432fa62e version 1.6.0 QAD::File add "is_save" flag peri4 2020-08-13 13:00:52 +03:00
• 6e4cdccc94 Merge pull request 'binlog user header' (#60) from master into release andrey 2020-08-12 20:02:12 +03:00
• aa2ea1eda6 binlog user header andrey 2020-08-12 20:01:46 +03:00
• e59bf65294 Merge pull request 'pip' (#59) from master into release peri4 2020-08-11 21:19:15 +03:00
• 11e665c419 pip peri4 2020-08-11 21:19:02 +03:00
• 2e5d64f258 Merge pull request 'pip' (#58) from master into release peri4 2020-08-11 20:59:41 +03:00
• 1312f950c7 pip peri4 2020-08-11 20:59:25 +03:00
• 5382c54d6a Merge pull request 'PIP 2.0.0' (#57) from master into release peri4 2020-08-11 20:21:17 +03:00
• 56b3dcad7c Merge remote-tracking branch 'remotes/origin/release' peri4 2020-08-11 20:20:24 +03:00
• 75464792ba Merge remote-tracking branch 'remotes/origin/master' into release peri4 2020-08-11 20:16:10 +03:00
• 8b86f93e38 pip 2.0.0 peri4 2020-08-11 20:11:10 +03:00
• 3e0ec72e7d Blockview changes: 1) Теперь для создания сегмента не надо держать Shift, а перемешение шины теперь с нажатой клавишей Shift 2) Режим трассировки шин теперь пытается проложить маршрут с возможностью пересечения шины под прямым углом 3) Теперь рисуются точки соединения сегментов если их больше 2х 4) Обновлена подсказка в tooltip andrey 2020-08-11 17:35:18 +03:00
• b45bfca826 getSaveFileName for QAD::File editor andrey 2020-08-11 10:15:09 +03:00
• 6a9b1751ac android docker peri4 2020-08-10 22:13:31 +03:00
• ede780249a android docker peri4 2020-08-10 22:12:52 +03:00
• 067839f02b Dockerfile ENV patch peri4 2020-08-10 17:55:07 +03:00
• da9237e74b Dockerfile ENV patch peri4 2020-08-10 17:48:35 +03:00
• 905eb77091 windows PIP -> QtBin install fix peri4 2020-08-05 12:06:56 +03:00
• 2974967790 TouchButtFrame fix peri4 2020-08-04 17:57:11 +03:00
• 4a567dbba4 pip peri4 2020-08-03 09:05:06 +03:00
• 0c7619d00b new pip peri4 2020-08-03 01:43:47 +03:00
• fa4634b0c7 last pip peri4 2020-08-02 12:16:14 +03:00
• 0f1825bf33 merged to PIP 1.99.3 peri4 2020-08-01 21:30:25 +03:00
• 562cb280f7 Merge branch 'master' of https://git.shs.tools/SHS/libs peri4 2020-07-30 00:25:33 +03:00
• 5ec9c22d46 pip peri4 2020-07-30 00:25:24 +03:00
• d78a1f532b Merge branch 'master' of https://git.signalmodelling.ru/SHS/libs andrey 2020-07-29 14:36:30 +03:00
• 0d9ecc9ceb Dockerfile, clone only one branch andrey 2020-07-29 14:36:21 +03:00
• 7baa7916f7 pip v2 peri4 2020-07-29 01:32:19 +03:00
• 7ecf33a908 Merge branch 'master' of https://git.shs.tools/SHS/libs peri4 2020-07-24 21:54:44 +03:00
• c3f921ea6a FindQAD.cmake patch for piqt and piqt_utils peri4 2020-07-24 21:54:38 +03:00
• 2251caf12c clean qglengine/qglview.h andrey 2020-07-23 17:14:22 +03:00
• c76608abf0 QGLEngine license andrey 2020-07-22 11:24:42 +03:00
• 06c99dd105 Merge pull request 'pip' (#55) from master into release andrey 2020-07-16 13:59:20 +03:00
• caf149ed28 pip andrey 2020-07-16 13:59:07 +03:00
• 13a543bfd5 Merge pull request 'pip 24' (#54) from master into release andrey 2020-07-16 13:51:49 +03:00
• 16e52701be pip andrey 2020-07-16 13:44:26 +03:00
• 09ed9a9907 compile fixes andrey 2020-07-16 13:41:50 +03:00
• a5d75fec09 includes andrey 2020-07-16 13:05:49 +03:00
• afd15e20f6 fix warning andrey 2020-07-16 12:58:31 +03:00
• 77c2296320 pip 24 andrey 2020-07-16 12:52:59 +03:00
• 1c8d2d5c5f Merge branch 'master' of https://git.signalmodelling.ru/SHS/libs andrey 2020-07-16 12:50:49 +03:00
• f6a9e44805 piSwap andrey 2020-07-16 12:50:24 +03:00
• a29302e2e6 Added additional poll method without timeout concurrent zzuummaa 2020-07-16 12:03:27 +03:00
• a5e5c289db Merge pull request 'fix qad_export.h' (#51) from master into release andrey 2020-07-10 21:46:56 +03:00
• a49aeda257 fix qad_export.h andrey 2020-07-10 21:46:36 +03:00
• 79db8ea408 Merge pull request 'master' (#50) from master into release peri4 2020-07-10 09:21:40 +03:00
• c359ba34a6 update pip andrey 2020-07-09 22:25:46 +03:00
• 760c57a843 FindQAD multiple add target fix peri4 2020-07-09 13:11:23 +03:00
• 61316462fa Imported targets for QAD peri4 2020-06-28 17:11:42 +03:00
• 4e3baadd70 Merge pull request 'master' (#49) from master into release peri4 2020-06-28 01:16:49 +03:00
• 8324776fb8 fix for Qt4 peri4 2020-06-28 01:04:28 +03:00
• 65f3cc0698 pip update peri4 2020-06-28 00:18:49 +03:00
• b72ef08892 Merge pull request 'master' (#48) from master into release peri4 2020-06-26 09:56:46 +03:00
• 8363ad29ef pip peri4 2020-06-26 09:51:27 +03:00
• ab4f2a3d40 Graphic mouse signals fix peri4 2020-06-25 12:05:45 +03:00
• 754d46a250 missing Graphic::setGraphicStyle(const Qt::PenStyle & style, int index) peri4 2020-06-24 11:45:56 +03:00
• ba5a30a7dd Android graphic fix peri4 2020-06-24 02:09:08 +03:00