Andrii Danylchenko
|
6c31b50e73
|
Merge pull request #1094 from Nordsoft91/autobattle-bugfix
[965] Fix for auto-battle crash
|
2022-11-03 08:17:30 +02:00 |
|
nordsoft
|
e21c2a02ce
|
Merge remote-tracking branch 'upstream/develop' into lobby
|
2022-11-02 18:33:33 +04:00 |
|
nordsoft
|
a7d11856ec
|
Merge remote-tracking branch 'upstream/develop' into autobattle-bugfix
|
2022-11-02 18:32:53 +04:00 |
|
Andrii Danylchenko
|
418aabcd94
|
Merge pull request #1095 from kambala-decapitator/ci-fix-running-conan
[CI] fix running Conan
|
2022-11-02 12:34:22 +02:00 |
|
Andrey Filipenkov
|
a5ad4893a7
|
[CI] use setup-python action
fixes running pip-installed packages without `python3 -m`
|
2022-11-02 11:07:20 +03:00 |
|
nordsoft
|
52b3b329a4
|
Fix [965]
|
2022-11-01 19:16:45 +04:00 |
|
nordsoft
|
1c84cc4521
|
Merge remote-tracking branch 'upstream/develop' into lobby
|
2022-11-01 16:30:27 +04:00 |
|
Andrii Danylchenko
|
80ce205d94
|
Merge pull request #1093 from Nordsoft91/port-override
Write port override
|
2022-10-31 07:21:01 +02:00 |
|
nordsoft
|
410c402dd6
|
Try to fix windows encoding
|
2022-10-30 22:53:05 +04:00 |
|
nordsoft
|
ecfa568774
|
Minor fixes for lobby
|
2022-10-30 22:50:16 +04:00 |
|
nordsoft
|
27bff89e66
|
Write port override
|
2022-10-30 19:59:43 +04:00 |
|
nordsoft
|
d8641324a3
|
Try to fix mxe build
|
2022-10-29 21:49:30 +04:00 |
|
nordsoft
|
0a2a250379
|
Try to fix mxe build
|
2022-10-29 21:10:21 +04:00 |
|
nordsoft
|
6eb43d3834
|
Minor changes
|
2022-10-27 01:39:57 +04:00 |
|
nordsoft
|
1455c65e1a
|
Move proxy server
|
2022-10-27 00:53:32 +04:00 |
|
nordsoft
|
21a1706627
|
First working prototype
|
2022-10-27 00:52:39 +04:00 |
|
Andrii Danylchenko
|
8fc38c617f
|
Merge pull request #1086 from vcmi/fix-mantis-2934
Mantis-2934: fix conditions to upgrade town in h3m format parser
|
2022-10-25 11:52:22 +03:00 |
|
nordsoft
|
dd45d1a9cf
|
Develop game part
|
2022-10-25 05:27:53 +04:00 |
|
nordsoft
|
aac859a030
|
Store settings
|
2022-10-23 23:24:33 +04:00 |
|
nordsoft
|
2761c59cf0
|
Add server prototype
|
2022-10-23 23:11:19 +04:00 |
|
nordsoft
|
05cba08b40
|
Continue development
|
2022-10-23 23:10:46 +04:00 |
|
Andrii Danylchenko
|
7618bc7425
|
Mantis-2934: fix conditions to upgrade town in h3m format parser
|
2022-10-23 16:40:07 +03:00 |
|
Andrii Danylchenko
|
afc0cc1c15
|
Merge pull request #1067 from vcmi/battle-ai-improvements
Battle ai improvements
|
2022-10-23 11:41:29 +03:00 |
|
Andrii Danylchenko
|
ebf4854801
|
Battle AI: add some comments + refactoring
|
2022-10-23 11:41:03 +03:00 |
|
Andrii Danylchenko
|
601ced3749
|
BattleAI: rework movement when no targtes
|
2022-10-23 11:41:03 +03:00 |
|
Andrii Danylchenko
|
033a585e4b
|
Battle AI 2 turns attacks recalculation
|
2022-10-23 11:41:03 +03:00 |
|
Andrii Danylchenko
|
a2380ebd37
|
Merge pull request #1082 from kambala-decapitator/linux-mapeditor-icon
[Linux] add proper desktop entry for the map editor
|
2022-10-23 11:40:41 +03:00 |
|
Andrii Danylchenko
|
11790c7c02
|
Merge pull request #1083 from vcmi/fix-android
Move version definition into a separate cmake file
|
2022-10-23 10:39:25 +03:00 |
|
Andrii Danylchenko
|
3a9493130c
|
Merge pull request #1081 from kambala-decapitator/macos-bundle-ID
[macOS] improve Info.plist
|
2022-10-23 10:39:05 +03:00 |
|
nordsoft
|
75613a947d
|
Implement command parsing
|
2022-10-23 02:55:22 +04:00 |
|
Andrey Filipenkov
|
7dcd910877
|
add Linux icons for the map editor
Co-authored-by: SoundSSGood <87084363+SoundSSGood@users.noreply.github.com>
|
2022-10-22 23:03:01 +03:00 |
|
Andrii Danylchenko
|
6ef480971d
|
Move version definition into a separate cmake file
|
2022-10-22 20:48:38 +03:00 |
|
Andrey Filipenkov
|
278e6bedeb
|
[Linux] add proper desktop entry for the map editor
|
2022-10-22 17:08:55 +03:00 |
|
Andrey Filipenkov
|
e0e075df77
|
[Conan] save install folder to CMake variable
|
2022-10-22 16:59:45 +03:00 |
|
Andrey Filipenkov
|
d1ab611b4f
|
[macOS] don't use macdeployqt together with Conan
|
2022-10-22 16:59:45 +03:00 |
|
Andrey Filipenkov
|
35a6a24204
|
[macOS] sign executables with bundle identifier
|
2022-10-22 16:59:45 +03:00 |
|
Andrey Filipenkov
|
8e8323a3d5
|
[macOS] build properly ordered list of executables that needs to be signed
|
2022-10-22 16:59:45 +03:00 |
|
Andrey Filipenkov
|
9865578faa
|
[macOS] remove deprecated entries from Info.plist
|
2022-10-22 16:53:08 +03:00 |
|
Andrey Filipenkov
|
002e09fa2d
|
[macOS] set copyright to Info.plist
|
2022-10-22 16:52:47 +03:00 |
|
Andrey Filipenkov
|
c9198311a1
|
[macOS] set bundle identifier to Info.plist
|
2022-10-22 16:52:27 +03:00 |
|
Andrii Danylchenko
|
b43e0ff9e4
|
Merge pull request #972 from vcmi/cpp-map-editor
Cpp map editor
|
2022-10-22 12:42:27 +03:00 |
|
Andrii Danylchenko
|
c2cc801f60
|
Merge pull request #1073 from kambala-decapitator/ios-conan
[Conan] add iOS support, bump dependencies, improvements
|
2022-10-22 12:40:48 +03:00 |
|
Andrii Danylchenko
|
bae4750e93
|
Merge pull request #1078 from Nordsoft91/advspell-mech-fix
[1072] Fix advmap spell mechanics
|
2022-10-22 12:30:34 +03:00 |
|
Andrii Danylchenko
|
91dc94c66b
|
Merge pull request #1079 from Nordsoft91/fix-screenshots-param
Fix screenshots loading
|
2022-10-22 12:30:15 +03:00 |
|
nordsoft
|
e54c9af24e
|
Continue development
|
2022-10-21 20:29:27 +04:00 |
|
nordsoft
|
b58f70ac5e
|
Prototype
|
2022-10-21 05:53:30 +04:00 |
|
nordsoft
|
2409bdfbda
|
Fix screenshots loading
|
2022-10-21 04:03:54 +04:00 |
|
nordsoft
|
750f160276
|
Fix advmap spell mechanics
|
2022-10-20 22:34:27 +04:00 |
|
Andrii Danylchenko
|
c32d44190e
|
Merge pull request #1075 from Nordsoft91/town-entrance-fix
[1069] Fix bug related to town entrance
|
2022-10-19 13:42:33 +03:00 |
|
Andrii Danylchenko
|
288f36c0c3
|
Merge pull request #1052 from Nordsoft91/mp-disconnection
MP handle disconnection
|
2022-10-19 09:56:18 +03:00 |
|