Konstantin
f577b7240b
launcher & editor: use qt_add_translations for Qt6
...
This will make possible to run update_translations target on
Qt6 build of VCMI
2023-01-29 22:40:15 +03:00
Konstantin
848e858312
launcher: russian translation
...
This is mostly finished russian translation
2023-01-29 22:40:15 +03:00
Ivan Savenko
f5a7f5173f
Cursor type is now configurable in Launcher
2023-01-20 15:15:19 +02:00
Dydzio
8b0625ac43
Update polish.ts
2023-01-18 02:02:18 +02:00
Ivan Savenko
bafe0c42ce
Merge pull request #1293 from IvanSavenko/translate_launcher
...
Translations support - Launcher
2023-01-17 23:05:14 +02:00
Ivan Savenko
7a92aa0a06
Fixes for compilation with Qt6
2023-01-17 12:49:33 +02:00
Ivan Savenko
b9712b0899
Fix translation search paths on ios
2023-01-16 22:37:19 +02:00
nordsoft
1ef9610e30
Remove irrelevant comment
2023-01-16 20:58:19 +04:00
nordsoft
da085b0058
Code review tweaks
2023-01-16 20:58:19 +04:00
nordsoft
2cce15efbe
Automatic mod conflict resolution
2023-01-16 20:58:19 +04:00
nordsoft
a2e358876c
Health check fix
2023-01-16 20:58:19 +04:00
nordsoft
14fc1c3f26
Cosmetic changes
2023-01-16 20:58:19 +04:00
nordsoft
8e1d8f835a
Implemented support of protocol 4
2023-01-16 20:58:19 +04:00
Ivan Savenko
c252837b6a
Fix installation of compiled QM files
2023-01-16 18:02:11 +02:00
Ivan Savenko
96141f010b
Merge remote-tracking branch 'vcmi/develop' into translate_launcher
2023-01-15 23:55:49 +02:00
Ivan Savenko
434163461e
Added logging for translation search
2023-01-15 23:54:27 +02:00
Ivan Savenko
494274ee46
Fix single-app build
2023-01-15 23:53:27 +02:00
Ivan Savenko
246281e62a
Merged vcmi/beta with vcmi/develop
2023-01-15 17:46:42 +02:00
Ivan Savenko
bec894c348
Implemented automatic detection of H3 files language/encoding
2023-01-15 17:32:39 +02:00
Andrey Filipenkov
2de48624bc
[iOS] fix linking QtCore
2023-01-15 17:28:09 +02:00
Ivan Savenko
9658ffba99
Allow disabling & deleting local mods other than vcmi mod
2023-01-12 16:29:01 +02:00
Ivan Savenko
192e856797
merge with vcmi/develop
2023-01-11 16:47:53 +02:00
Ivan Savenko
e28250b899
Add missing include?
2023-01-07 18:26:02 +02:00
Ivan Savenko
b1427f695b
Fix MXE
2023-01-07 18:01:39 +02:00
Ivan Savenko
67f7e5d042
Apply review suggestions
2023-01-07 16:15:45 +02:00
Ivan Savenko
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix
...
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
Ivan Savenko
78ae6d6ed0
Made scaling of left panel limited, within well-defined bounds
2022-12-29 16:38:43 +02:00
Ivan Savenko
8010bff866
Formatting
2022-12-29 16:37:38 +02:00
Ivan Savenko
b1aaa09b8b
Fix search paths for translation
2022-12-29 16:37:03 +02:00
Ivan Savenko
d3a4a38694
Add editor icon to launcher
2022-12-28 22:45:47 +02:00
Ivan Savenko
3704102e1d
Editor -> Map Editor string
2022-12-28 22:22:43 +02:00
Ivan Savenko
4f4a89e15d
Fix formatting
2022-12-28 22:22:05 +02:00
Ivan Savenko
e6a83ad53b
Attempt to improve layout on mobile devices
2022-12-28 22:20:27 +02:00
Ivan Savenko
d11abdcdef
Updated icons with larger versions for scaling
2022-12-28 22:19:45 +02:00
Ivan Savenko
df3d62c5bc
Formatting fix
2022-12-28 18:04:27 +02:00
Ivan Savenko
5f4a998435
editorPath -> mapEditorPath
2022-12-28 17:59:16 +02:00
Ivan Savenko
cd6a894417
Call method from parent class after processing event
2022-12-28 17:58:39 +02:00
Ivan Savenko
858fb97f42
Added -DENABLED_LAUNCHER and -DENABLED_EDITOR defines
2022-12-28 17:56:22 +02:00
Ivan Savenko
42ecf05c47
Regenerated translations
2022-12-28 12:40:39 +02:00
Ivan Savenko
60f25f7a0c
Added Polish translation by dydzio
2022-12-28 12:29:26 +02:00
Ivan Savenko
2687b7af7f
Increased default width of lobby room creation window
2022-12-28 12:28:59 +02:00
Ivan Savenko
b6f13ea50c
Fix formatting
2022-12-27 12:28:40 +02:00
Ivan Savenko
5dea5fcd85
Fix ios build
2022-12-26 00:22:20 +02:00
Ivan Savenko
1f0ad8e149
Regenerated translations
2022-12-26 00:10:31 +02:00
Ivan Savenko
9fb426edc1
Do not use translator without translator tools
2022-12-25 23:42:06 +02:00
Ivan Savenko
e4e5278f60
Merge with vcmi/develop
2022-12-25 23:10:52 +02:00
Ivan Savenko
20dec34484
Attempt to make translations optional (MXE...)
2022-12-25 23:09:15 +02:00
Ivan Savenko
b38752bde1
Editor can be started from Launcher (disabled for ios)
2022-12-25 23:08:39 +02:00
Ivan Savenko
4cd91ffbed
Save & load language selection
2022-12-25 23:06:22 +02:00
Ivan Savenko
b012cd9490
Compiled launcher translations are now in launcher/translations/ dir
2022-12-25 22:18:14 +02:00
Ivan Savenko
a0c78e8ecb
Added german translation by Laserlicht
2022-12-25 21:58:20 +02:00
Ivan Savenko
a481961c57
Added dummy files for WIP translations
2022-12-25 21:41:45 +02:00
Ivan Savenko
1696db8a3c
Launcher translation upgrade, still WIP:
...
- launcher can be re-translated without restart
- mod info (name/description/etc) can have localized versions
2022-12-25 13:19:16 +02:00
Ivan Savenko
5b57b69699
Bumped version to 1.2 for Linux packaging
2022-12-23 17:54:41 +02:00
Ivan Savenko
eb20a4b208
Merge remote-tracking branch 'vcmi/develop' into warnings_fix
2022-12-23 14:40:45 +02:00
Ivan Savenko
f073c676f9
Merge 1.1 release into develop
2022-12-23 14:17:18 +02:00
Ivan Savenko
b84e0775b3
Updated release date for Linux packaging
2022-12-23 10:41:59 +04:00
Ivan Savenko
9e4cef015d
Initial test version of selectable translations for launcher.
2022-12-19 19:12:44 +02:00
nordsoft
dd95d92735
Fix compatibility check
2022-12-17 22:56:33 +04:00
Ivan Savenko
db2a40600d
Fixed some of the warnings detected by CI run
2022-12-08 23:20:42 +02:00
Ivan Savenko
facf77b3ae
vstd::unique -> std::unique
2022-12-07 23:36:20 +02:00
Ivan Savenko
3219e322ae
Fixed all non-silenced gcc/clang warnings
2022-12-07 18:05:47 +02:00
Ivan Savenko
e09f42f487
Reverted launcher change: launcher should use shared version of libvcmi
2022-12-06 21:11:20 +02:00
Ivan Savenko
4e43f5bdc2
Removed dllimport/export from single-app launcher build
2022-12-06 19:39:33 +02:00
Ivan Savenko
fa23965d0b
Renamed for consistency BUILD_SINGLE_APP -> ENABLE_SINGLE_APP_BUILD
2022-12-06 00:00:56 +02:00
Ivan Savenko
d7cf5a0479
Version bump for Appstream metadata
2022-12-02 12:57:36 +02:00
Nordsoft91
89b8b87a6b
Merge pull request #1156 from vcmi/features/online
...
Online mode
2022-11-29 20:43:39 +04:00
nordsoft
98d59eb221
Added more comments
2022-11-29 19:42:09 +04:00
nordsoft
b9ef95be3e
Extend protocol
2022-11-27 05:35:05 +04:00
nordsoft
63a402a7fa
Some ui improvements
2022-11-27 03:41:06 +04:00
nordsoft
f785525508
Fix mods updating
2022-11-23 21:34:05 +04:00
nordsoft
665d6ebb78
Ios scroll by gesture
2022-11-22 03:36:50 +04:00
nordsoft
6ab8fccc60
Fix crash
2022-11-17 05:06:23 +04:00
nordsoft
ddebf85665
try to fix mxe
2022-11-17 04:30:43 +04:00
nordsoft
33575e5ce2
Try to fix mxe build
2022-11-17 04:05:44 +04:00
nordsoft
05e4188908
Support mod list
2022-11-17 03:15:26 +04:00
nordsoft
4527bd1a61
Disconnection on error
2022-11-16 23:53:54 +04:00
nordsoft
179cdee424
Improve online lobby visual
2022-11-16 23:28:21 +04:00
nordsoft
20573073c9
Some tweaks
2022-11-16 04:42:43 +04:00
nordsoft
15ba4cda70
Cosmetic improvements for lobby
2022-11-16 04:22:48 +04:00
nordsoft
8d6a2e4383
Fix indentation
2022-11-15 22:09:47 +04:00
nordsoft
50a157bfd2
support encoding
2022-11-15 22:09:47 +04:00
nordsoft
694fedc662
Fix crash due to passing args
2022-11-15 22:09:46 +04:00
nordsoft
cfe1867d4a
Fix ios build
2022-11-15 22:09:46 +04:00
nordsoft
b2b9cacac2
Fix mxe build
2022-11-15 22:09:46 +04:00
nordsoft
a45fb910af
Try to fix mxe build
2022-11-15 22:09:46 +04:00
nordsoft
eda102ddfb
Add header for mxe build
2022-11-15 22:09:46 +04:00
nordsoft
0a149ba73b
Fix launcher crash at close
2022-11-15 22:09:46 +04:00
nordsoft
f0ac73b217
Fix(?) mxe lobby
2022-11-15 22:09:46 +04:00
nordsoft
f79e5a82d3
Fix crash
2022-11-15 22:09:46 +04:00
nordsoft
3d60f079fb
Remove some ios specific flags
2022-11-15 22:09:46 +04:00
nordsoft
c4c1cd392a
Attempt to fix server hosting on ios
2022-11-11 22:21:03 +04:00
nordsoft
d691925b1f
Try to do some fixes
2022-11-11 00:02:00 +04:00
nordsoft
9397c836f2
Enable scrolling for buttons
2022-11-10 19:15:18 +04:00
nordsoft
81a0ac2398
Lobby refactoring and changes
2022-11-10 04:20:44 +04:00
nordsoft
f83e4f4ce4
Add lobby icon
2022-11-09 00:21:26 +04:00
nordsoft
43ca275afa
Fix ios typo
2022-11-09 00:03:15 +04:00
nordsoft
e83870205e
Global veriables
2022-11-08 20:47:01 +04:00
nordsoft
57dfeb2ff2
Remove excessive code
2022-11-08 05:03:33 +04:00
nordsoft
17d8c646f2
Command line arguments for ios
2022-11-08 05:02:26 +04:00
nordsoft
97e5fc8a07
Lobby works
2022-11-08 04:44:34 +04:00
nordsoft
7b6d9c23b3
Attempt to pass lobby parameters as command line arguments
2022-11-07 13:44:58 +04:00
nordsoft
1c84cc4521
Merge remote-tracking branch 'upstream/develop' into lobby
2022-11-01 16:30:27 +04: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
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
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
nordsoft
75613a947d
Implement command parsing
2022-10-23 02:55:22 +04:00
Andrey Filipenkov
278e6bedeb
[Linux] add proper desktop entry for the map editor
2022-10-22 17:08:55 +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
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
Andrey Filipenkov
f10e5e3b99
[Conan] add iOS support
2022-10-16 13:25:38 +03:00
Andrey Filipenkov
b29229a577
fix showing logs path in Launcher
2022-10-09 17:42:33 +03:00
Andrii Danylchenko
238dabe060
Merge pull request #1055 from kambala-decapitator/version-from-cmakelists
...
define app version only in CMakeLists
2022-10-08 09:55:59 +03:00
Andrii Danylchenko
8b1a2a3ff3
Merge pull request #1039 from Nordsoft91/modinfo-from-json
...
Modinfo from json
2022-10-06 17:11:08 +03:00
Andrey Filipenkov
92dd6d8c17
define app version only in CMakeLists
...
now it's propagated to code via macros
2022-10-04 12:29:38 +03:00
Andrii Danylchenko
d07586ccf6
Merge pull request #1022 from kambala-decapitator/apple-set-app-version
...
[Apple] set proper app and build versions
2022-10-01 20:48:37 +03:00
Andrey Filipenkov
796845d173
[iOS] clear focus in launcher only when something has focus
2022-10-01 12:37:23 +03:00
Andrii Danylchenko
99502c97d0
Merge pull request #1012 from kambala-decapitator/ios-launcher-prevent-autofocus
...
prevent keyboard appearing automatically after switching tab
2022-10-01 09:18:10 +03:00
Andrii Danylchenko
a2dbb6c8ac
Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions
...
Hide unsupported resolutions
2022-09-30 17:34:07 +03:00
Andrey Filipenkov
4a1933bac3
display build version in the launcher
2022-09-30 12:33:37 +03:00
Alexander Wilms
48150211d9
Update bug tracker URL in metainfo
2022-09-29 23:07:54 +02:00
nordsoft
9bf7106905
Add compatibility info
2022-09-29 18:21:29 +04:00
nordsoft
ae15807964
Collect mod info from remote mod.json
2022-09-29 17:38:03 +04:00
Andrey Filipenkov
d1d274382c
[iOS] prevent keyboard appearing automatically after switching tab in launcher
2022-09-29 12:17:37 +03:00
Andrey Filipenkov
e8396401f9
fetch Extra Resolutions mod path from the settings schema
2022-09-27 11:56:13 +03:00
Andrey Filipenkov
42ea458ccf
handle (un)installing Extra Resolutions mod
2022-09-27 11:56:13 +03:00
Andrey Filipenkov
d06977ecbb
handle enabling/disabling Extra Resolutions mod
2022-09-27 11:56:13 +03:00
Andrey Filipenkov
76b36b8951
iOS can use any resolution
2022-09-27 11:56:12 +03:00
Andrey Filipenkov
063f80fac3
don't list resolutions larger than the selected screen's in the launcher
2022-09-27 11:56:12 +03:00
Andrey Filipenkov
9aad1ae95e
handle integer type in vcmi <-> Qt JSON interoperability
2022-09-27 11:56:12 +03:00
Andrey Filipenkov
36cbb2f605
make Display Index combobox empty by default
2022-09-27 11:56:12 +03:00
Andrey Filipenkov
cfba8a5373
replace deprecated signal
2022-09-27 11:56:12 +03:00
Andrey Filipenkov
f0b909f772
code improvement
2022-09-27 11:56:12 +03:00
Andrey Filipenkov
53ac61b52b
iOS: don't create unused CConsoleHandler
2022-09-27 07:05:10 +03:00
Andrii Danylchenko
6ad468ecd3
Merge pull request #995 from Nordsoft91/hotfix/mods-deps
...
Hotfix for mods dependencies
2022-09-26 09:14:18 +03:00
nordsoft
5552fbb8e6
Fix ios build
2022-09-25 16:24:25 +04:00
nordsoft
54e0bb17fd
[994] fixed
2022-09-25 16:17:21 +04:00
nordsoft
af98ce2e3d
Hotfix for mods dependencies
2022-09-25 15:36:46 +04:00
Andrey Filipenkov
b8eef4ce35
support building against iOS SDK < 13.0
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
44174da9a2
fix MXE build
2022-09-24 15:55:25 +03:00
Andrey Filipenkov
7b411a5fc4
fix building vcmiERM for iOS
2022-09-24 15:55:24 +03:00
Andrey Filipenkov
fab3216df0
add setting to control app launch type: launcher or game
...
- removes custom AppDelegate
- now starting launcher using qt_main_wrapper
- when starting SDL from launcher, SDLUIKitDelegate is created and assigned as app delegate
fix kambala-decapitator/vcmi#33
2022-09-24 15:55:23 +03:00
Andrey Filipenkov
1e01780d17
start app with launcher, start SDL from launcher
...
kambala-decapitator/vcmi#33
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
10a14bd6fd
remove no longer used iOS launcher files
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
5e838008df
merge launcher and client
...
launcher is a static lib now
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
ad256cd11f
fix building launcher
2022-09-24 15:55:22 +03:00
Andrey Filipenkov
ff635edc0b
wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined
...
preparation for having client and server in a single process
2022-09-24 15:55:21 +03:00
Andrey Filipenkov
3388583089
use component-based install to copy only what's needed for every app
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
fae295da88
allow building without codesigning
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
9dc5f3ed8b
improve RPATH handling, apply RPATH when installing dylibs
2022-09-24 15:55:20 +03:00
Andrey Filipenkov
6652e656c3
disable some launcher settings that are useless on iOS
...
kambala-decapitator/vcmi#17
2022-09-24 15:55:19 +03:00
Andrey Filipenkov
4c848b8f00
fix showing icons in the launcher
...
kambala-decapitator/vcmi#17
2022-09-24 15:55:19 +03:00
Andrey Filipenkov
67ef0c234d
build Qt launcher, launch Client with it
...
kambala-decapitator/vcmi#17
2022-09-24 15:55:19 +03:00
nordsoft
145103a32d
Allow enabling of compatible mods only
2022-09-22 16:41:13 +04:00
Andrii Danylchenko
3d3c513603
Merge pull request #929 from Nordsoft91/branch-merge-versioning
...
Mods versioning [part 3]
2022-09-22 14:56:20 +03:00
nordsoft
fd10d8a887
Fix compilation on msvc
2022-09-19 12:34:18 +04:00
Andrey Filipenkov
e423e415c1
move Uninstall button to the left side of layout
2022-09-19 08:48:50 +03:00
nordsoft
dcfafac266
Reuse QVersionNumber
2022-09-19 03:52:54 +04:00
Andrey Filipenkov
99af5bbe4c
add dedicated method to get logs path
2022-09-18 09:24:36 +03:00
nordsoft
1b6f4a5cf3
Rebase on develop
2022-09-17 17:43:59 +04:00
Alexander Wilms
d67d8a003e
Add 1.0.0 release to appstream metadata
2022-09-14 21:53:42 +03:00
Nordsoft91
205bb09880
Launcher fixes for mod filesystem ( #860 )
...
* Show submods as disabled if parent mod is disabled
* [845] disable button for local mods
Fixes for #812 #851 #852
2022-09-10 19:30:41 +03:00
Nordsoft91
5862c192b0
Mod from GitHub ( #785 )
...
* Make new dialog for checking updates
* update on startup
* Implemented auto-update
2022-09-04 19:32:48 +03:00
Soar Qin
188607b05f
Replace cotire with CMake builtin precompiled headers support (Requires CMake version >= 3.16)
2022-06-17 17:20:08 +03:00
Konstantin
1a6ee0d697
Launcher: Qt6 support. Qt 5.12 required ( #746 )
...
* Launcher: Qt6 support. Qt 5.12 required
2022-05-28 16:32:20 +03:00
Konstantin
8fc14369a4
CMake presets. ( #744 )
...
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
2022-05-26 08:55:20 +03:00
val-gaav
3d1da88bb9
Update csettingsview_moc.ui
2022-04-26 15:08:02 +03:00
val-gaav
4056772998
Update csettingsview_moc.ui
2022-04-26 15:08:02 +03:00
Alexander Wilms
ba7c9d7021
Linux packaging: Add metainfo file
2021-08-02 12:27:56 +01:00
Andrii Danylchenko
b4241670ba
Nullkiller: rename VCAI to AIGateway
2021-07-26 21:02:50 +03:00
John Bolton
a05ae78e67
Fixed lots of warnings.
...
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.
4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
2020-10-04 02:20:18 -07:00
hwiorn
0c3be77e78
Add Korean encoding(CP949)
2020-03-19 16:11:55 +09:00
DJWarmonger
ab62430785
Remove space after if
2019-07-30 11:00:44 +02:00
DJWarmonger
20ea7ac44f
Disable drag & drop icons:
...
https://bugs.vcmi.eu/view.php?id=3078
https://bugs.vcmi.eu/view.php?id=3079
2019-07-30 09:37:00 +02:00
DJWarmonger
d58c7b2105
Persist mod table header (especially column widths).
2019-07-30 09:28:42 +02:00
DJWarmonger
37bebd8f62
Persist window settings in system
2019-07-30 08:32:35 +02:00
Dydzio
54550b50de
Update VS files to 2019, partially fix test project
2019-06-09 17:28:55 +02:00
Michał Kalinowski
a0d1808b62
CMake transitive compile dependency
...
Moving to more target focusing code that provides better transitive scope
2019-01-19 17:38:54 +03:00
Dydzio
216d50788b
Fix AI build, update default Windows SDK version for projects
2018-12-31 15:18:42 +01:00
Michał Janiszewski
7be9aa4868
Prevent shadowing of function arguments by local vars
2018-10-29 16:56:14 +01:00
Dydzio
6174df0a72
Revert only launcher saving to settings.json from PR441
2018-07-16 22:05:42 +02:00
Karlis Senko
40e6292ed2
Fix memory leaks in launcher.
2018-05-01 00:01:20 +03:00
Arseniy Shestakov
9da3f48274
Code style: formatting and refactoring of launcher code
2018-04-13 15:23:35 +07:00
Henning Koehler
2ede3783dd
Settings: savefrequency is now configurable in launcher
...
* Client command-line can modify arbitrary settings now
* Only launcher auto-saves to settings.json
2018-04-08 17:12:29 +07:00
Michał Kalinowski
968bd4a7da
Setting policy CMP0071 for launcher cmake
...
CMake from version 3.10.2 warns when the policy is not set.
Reference: https://cmake.org/cmake/help/v3.10/policy/CMP0071.html
2018-02-24 08:22:37 +03:00
Dydzio
38d836d1a5
Update project files to Visual Studio 2017
2018-01-13 16:33:49 +01:00
Michał Kalinowski
26a222ac62
Change JsonType to enum class ( #393 )
...
Change enum JsonType to enum class JsonType
2017-11-27 00:18:18 +03:00
Arseniy Shestakov
1110dd27d1
Launcher: use QDesktopWidget to get display list instead of SDL2
...
First of all SDL2 trying to use dbus and this conflict with Qt. Check mantis#2704.
And there no reason to use SDL2 in launcher when Qt can do the same thing as well.
2017-08-24 04:55:44 +03:00
Arseniy Shestakov
525ee8771a
Launcher: avoid menu items not overlap so it's look slightly better
...
It's still very ugly, but less ugly than it's was.
2017-08-24 03:04:40 +03:00
Dydzio
ea17b0f458
Major overhaul of VS related files
2017-08-19 15:58:55 +02:00
Dydzio
e3ba491fa1
Use multi-core compile by default, fix VCMI_client path
2017-08-19 13:27:24 +02:00
Arseniy Shestakov
03c7bf5ee6
CMake: installer building improvements for Windows
...
- Implement support for BundleUtilities when Vcpkg is used
- Add some hacky code to copy Qt plugins install directory
- Use same icon for launcher as used for VCMI, launcher one is ugly
2017-08-16 18:34:46 +03:00
Arseniy Shestakov
2b3a467728
CMake: structure changes and other small improvements
...
- Now cmake_minimum_required used properly and set to 2.8.12
- cmake_modules/CMakeCPackOptions.cmake.in is removed
2017-08-16 16:10:08 +03:00
Arseniy Shestakov
40af43c46e
CMake: massive rework for Mac build and other improvements
...
- macOS: RPATH-related code all removed or disabled
- macOS: new osx/CMakeLists.txt to run some install-code running after all subdirectories
- Assets copying into the runtime output directory implemented for Mac and Linux development
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
7dca95c8cc
CMake: multiple improvements for builds and project generation
...
- Change default build output directory name from "build" to "bin"
- Implement new function vcmi_get_cmake_debug_info
- Link client with SDL2main on Windows and disable debug console
- Remove all old MinGW-specific options since they outdated and MXE work fine
- Set AUTOGEN_TARGETS_FOLDER for better Xcode and Visual Studio projects
- Remove useless vcmitestFiles custom target for less garbage in project files
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
56f89270db
macOS: full rework of Mac packaging process
...
- Most of outdated CMakeLists code removed.
- All Mac-specific code is removed include Sparkle support and vcmibuilder app.
- DMG buidling reimplemented using macdeployqt command.
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
193f492b99
CMake: cleanup, project generation and other improvements
...
- Use EXCLUDE_FROM_ALL for FuzzyLite and GoogleTest to avoid inclusion of unneded headers and libraries into installers.
- Set minimum CMake version only in main CMakeLists.txt
- Set project name only in main CMakeLists.txt
- Visual Studio: add assign_source_group function to generate proper filesystem tree
- Visual Studio: set PROJECT_LABEL so generated projects have same names binaries on Windows
- Visual Studio: enabled USE_FOLDERS for projects grouping. This also possibly affect other IDEs.
- Added add_subdirectory_with_folder function to make sure 3rd-party libraries are affected by USE_FOLDERS.
2017-08-16 16:10:07 +03:00
AlexVinS
15138c23de
Finished conversion to new logging API
...
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
2017-08-11 23:06:27 +03:00
AlexVinS
f2de6d1122
fix
2017-08-11 17:38:28 +03:00
Arseniy Shestakov
21074e13c3
macOS: always change working directory for launcher and server
...
This make relative paths work properly when launched from DMG or from different directory.
2017-08-09 01:33:12 +03:00
ArseniyShestakov
b52cfe5283
Code style: use parentheses for creating heap-based objects ( #344 )
2017-07-16 12:58:05 +03:00
Arseniy Shestakov
f1e5797834
Code style: move or add licensing information on top of every file
2017-07-14 01:26:03 +03:00
Arseniy Shestakov
99d3b9e37a
CMake: add all launcher headers to CMakeLists.txt
2017-07-13 02:44:58 +03:00
ArseniyShestakov
fcd63cd982
Merge pull request #333 from dydzio0614/RealFullscreen
...
Add optional real fullscreen mode support
2017-07-10 21:04:24 +03:00
Dydzio
c377f594a5
Add optional real fullscreen mode support
2017-07-08 18:43:04 +02:00
Victor Luchits
30cc2f6a01
Change the output path for cmake so all files go into the same root directory
2017-07-07 13:08:53 +03:00
Arseniy Shestakov
6642816b1e
Client: server port and testing options cleanup
...
Now we only pass port as ui16 instead of std::string
2017-06-04 08:49:23 +03:00
Arseniy Shestakov
5d8e943787
Launcher: add sanity checks for QDir::removeRecursively. Issue 2673
...
I'm not always fail to uninstall mod, but when I do I remove $HOME
Bumblebee developers should be proud of us...
2017-05-25 03:03:02 +03:00
DjWarmonger
a75d981962
Merge pull request #282 from drizt/resolution-combobox
...
Makes sense to me, thanks!
2017-02-20 08:46:31 +01:00
Michał Janiszewski
f5ebc763b4
Add override
keyword where applicable
2017-02-17 14:39:16 +01:00
Ivan Romanov
739cb9b2c5
Avoid scroollbar in resolution combobox
2017-02-17 14:00:55 +05:00
Michał Kalinowski
4d39f652bf
Making more detailed options when choosing AI in launcher: http://
...
bugs.vcmi.eu/view.php?id=2369
2017-01-17 12:34:28 +01:00
DjWarmonger
80d5f7b4a4
Updated project files to MVS 2015 (in fact, it's trivial).
2016-12-12 19:14:45 +01:00
DjWarmonger
092a0c305b
MSVS project update.
2016-11-25 18:17:40 +01:00
Arseniy Shestakov
cb3d6a24e7
Cmake: cleanup for commit hash in build version
...
Since it's available in lib we don't need to include it everywhere.
2016-10-27 17:01:29 +03:00
Vadim Markovtsev
da1c9cf249
Fix rebuilding everything on HEAD change
2016-10-23 16:56:53 +02:00
Vadim Markovtsev
ac3c231fee
Fix launcher's UI for Ubuntu's scaled view on Retina displays
2016-10-02 00:31:22 +02:00
DjWarmonger
d2bd749b4f
MSVS project fixes.
2016-09-04 13:30:11 +02:00
ArseniyShestakov
5fc1fd4daf
Merge pull request #206 from Chocimier/fixes
...
genBuildingRequirements is tricky one, but in tests it's seems everything is okay
2016-09-04 09:02:34 +03:00
Krzesimir Nowak
58bc0f7272
Allow choosing the display from the launcher
...
This adds another combobox for choosing the display. To ease the
display choice we try to roughly describe the display (its resolution
and location).
The combobox is hidden for single display setups.
2016-08-31 11:12:59 +02:00
Piotr Wójcik
a4f12fb007
Show downloaded mods with no need to reload remote repositories
2016-08-30 22:16:52 +02:00
Alexander Shishkin
5e5ce0bb09
Merge pull request #203 from vcmi/logFormat
...
boost::format support for CLogger
2016-08-29 17:32:44 +04:00
AlexVinS
9250d16016
[c::b] project files tweak
2016-08-18 12:22:34 +03:00
AlexVinS
72f79a3ad7
Draft boost::format based log proxy.
2016-08-13 16:57:09 +03:00
ArseniyShestakov
890ae43f55
Merge pull request #180 from Zyx-2000/FileInfo
...
Refactored CFileInfo & ResourceID
2016-02-08 04:55:39 +03:00
Zyx-2000
3a1a8e3d47
further refactoring-related changes
2016-01-29 15:16:14 +01:00
DjWarmonger
327e95407e
- Compile fixes part 1
...
- Project settings for MSVS
2016-01-27 21:08:08 +01:00
Zyx-2000
7166efef15
added code::blocks project file for launcher. note that it is far from perfect at the moment
2016-01-18 17:50:14 +01:00
Zyx-2000
00d1fd3aec
some fixes for launcher
2016-01-16 19:44:15 +01:00
Zyx-2000
cf61837ced
replaced std::string with boost::filesystem::path in several places
2016-01-16 16:36:16 +01:00
Zyx-2000
933b7c1f5e
some modernization of CFileInputStream implementation code
2016-01-12 23:40:24 +01:00
Zyx-2000
f9b255c896
Cleaner code & MSVC compatibility
2016-01-12 22:40:05 +01:00
Zyx-2000
203b2dccc3
hopefully fixed things
2016-01-09 21:23:55 +01:00
Ivan Savenko
faa7cbff18
Fixed gcc/clang warnings
2015-12-04 01:17:43 +02:00
Ivan Savenko
a3d4f9d22f
Fixed conversion warnings caused by Qt
2014-11-12 22:46:36 +02:00
josch
b962e11bd7
Launcher: add setting allowing not to automatically check remote repositories
...
- add a button to the launcher which allows manual downloading
- add a configuration option autoCheckRepositories to launcher settings
- add ui elements to settings dialog to change autoCheckRepositories
2014-11-10 08:21:47 +01:00
Mikhail Paulyshka
7b7282f52e
fix launcher linking problem for MSVC
2014-10-12 16:40:49 +03:00
Mikhail Paulyshka
b8f5a57c64
Include ZLib headers for launcher and server
2014-10-12 16:33:38 +03:00
Mikhail Paulyshka
ab5e1f9109
don't use separate .rc files for MSVC and MinGW
2014-10-12 16:32:02 +03:00
Ivan Savenko
b551bdb725
Final part of the merge
...
Merging VCMI Dirs refactoring + GUI refactoring with current develop
2014-09-04 20:59:07 +03:00
DjWarmonger
0edaf4fa8a
Merge pull request #26 from vcmi/FFMpeg
...
Let's do this, way too many branches running now.
2014-09-01 10:35:30 +02:00
DjWarmonger
8b10f70afd
Migrating to MSVS 2013, which allows to delete inttypes.h file.
2014-08-31 19:08:39 +02:00
Karol
958839668c
VCMIDirs update #5
...
- Minor fixes
- string based paths -> boost::filesystem::path paths (I hope it's
final)
- New user data path on windows
- New moving dir method on windows.
2014-08-21 22:26:28 +02:00
Ivan Savenko
00cda400a1
Miscellaneous improvements for Launcher UI:
...
- Implemented "show intro" toggle in settings
- Install/Update/Enable buttons are now visible even when mod info is hidden
- Fixed behaviour of show mod info switch, added more obvious button to enable it
- Removed no longer used "Enable mods on install" switch
- Added buttons to open data, user data and temporary directories
2014-08-04 14:03:57 +03:00
Michael Pavlyshko
6a23960642
CMake/WIN32 : add icon to client and launcher
2014-07-14 01:02:00 +03:00
Michael Pavlyshko
bad7050096
spaces -> tabulation
2014-07-11 11:01:03 +03:00
Michael Pavlyshko
c25ccc2acb
Rename: vcmi.dll -> VCMI_lib.dll, vcmilauncher.exe -> VCMI_launcher.exe
2014-07-11 01:09:00 +03:00
Michael Pavlyshko
29e6c2c412
add WIN32 flag for vcmilauncher to hide console window
2014-07-11 00:57:17 +03:00
DjWarmonger
9e7013de77
Backup for my own MVS project configuration
2014-04-24 21:07:43 +02:00
Ivan Savenko
791099ab33
- added *_moc suffix to imageviewer files
2014-03-29 12:46:41 +00:00
Ivan Savenko
771c1ce255
- some effords to get rid of bottlenecks in AI code
...
- fixes, probably partially #1577
- enabled code for reading map object templates from json, still not
used
- disabled PCH for launcher due to speed issues.
2014-03-23 16:36:16 +00:00
Ivan Savenko
9dda194ed3
Support for new fields in mod format including:
...
- screenshots, repository-only field, will be used by launcher to d/l
screeenshots
- screenshots will be viewed as thumbnails with switch to full view on
click
- changelog that is now visible in launcher
- somewhat better handling of submods by launcher
2014-03-23 12:08:01 +00:00
Ivan Savenko
760ae7d44a
Changes related to Debian packaging, based on josch patch
...
- AUTHORS file is now in UTF-8
- tags for desktop files
- fixed some typos
- better reaction on --help and --version commands
- vcmibuilder should work with both avconf and ffmpeg
2014-03-20 18:17:40 +00:00
Ivan Savenko
333a51a48a
Launcher now supports submods. See forum thread for details.
2014-03-20 17:06:25 +00:00
Ivan Savenko
7f6f125b4c
First part of submods support.
...
- VCMI will load mods from Mods directory recursively. Submods must be
placed into additional Mods directory, e.g.
<data dir>/Mods/<mod name>/Mods/<submod name>
- submods will be loaded only if their parent mod was enabled
- submods namespace for objects will be "<parent mod ID>.<submod ID>"
- TODO: Launcher is not aware of submods yet (seems to be working but
may behave incorrectly)
2014-03-15 10:57:34 +00:00
Ivan Savenko
5cbec833c2
- (linux) XDG filesystem support
...
BIG NOTE TO LINUX USERS
All user data has been moved according to XDG specs:
- Game data (H3 files and mods) and saves: from ~/.vcmi to ~/.local/
- Temporary files, including logs: from ~/.vcmi to ~/.cache/vcmi
- Config files: from ~/.vcmi/config to ~/.config/vcmi
For compatibility VCMI will read game data from ~/.vcmi as well but this
is temporary behavior and will be removed
2014-03-04 14:51:10 +00:00
Michał W. Urbańczyk
43ef565e7e
Added serializer-based class able to make deep copies of objects — CMemorySerializer.
...
CGameState::init will work on the deep copy of StartInfo.
Some casts to reduce warnings.
2014-02-08 21:54:35 +00:00
beegee1
95034b9fa0
- Updated PCH to use our StdInc.h as the prefix header (not generated one from cotire) -> no exclude headers from ffmpeg/etc... statements required
...
- Fixed compilation error (VCAI ResourceSet logging)
2014-02-05 20:25:36 +00:00
beegee1
df0a28d9cb
- added PCH compilation for CMake using cotire module (PCH is OFF per default, can be enabled with ENABLE_PCH=ON)
2014-02-01 13:37:26 +00:00
Ivan Savenko
27be6a8f13
- new mods (not mentioned in modSettings.json) will be enabled by
...
default
2014-01-30 14:51:15 +00:00
Ivan Savenko
45c186bba8
some code cleanup in launcher, tweaked appearence of mod list
2014-01-30 12:35:17 +00:00
Ivan Savenko
3779a54ddd
- probably fixed 1671
...
- fixed missing loss condition in Birth of Barbarian
- fixed some bugs found by cppcheck
2014-01-30 11:08:37 +00:00
Michał W. Urbańczyk
edacdf34e5
Sometimes, when working with MS Build projects I feel pure, unconditional hate.
...
Now Launcher should work with MSVC 2013.
2014-01-06 22:11:43 +00:00
Ivan Savenko
ed329c5a1f
- minor refactoring for filesystem, moved checksum calculation to
...
loading stage from initialization
- fixes for launcher
2013-12-11 17:12:39 +00:00
Ivan Savenko
5de70ba235
Minor fixes:
...
- properly re-enable necessary mods during update
- do not crash if building border is fully-colored
2013-12-08 10:07:06 +00:00
Ivan Savenko
2b6cdd5f41
- (linux) launcher will be available in OS start menu/launchers as
...
"VCMI" and client will be present as "VCMI Client"
2013-11-16 18:13:30 +00:00
Ivan Savenko
2b3405fa50
- minor optimizations
...
- fixed incorrect error reporting in launcher
- set WoG version to "0.0.0" so full version will be installed from repo
in future
- updated debian required packages list
- launcher will be enabled by default
2013-11-14 13:21:09 +00:00
Ivan Savenko
29e98b2d51
- modhandler will only validate new, changed or mods that failed
...
validation last time.
- fixed several issues with modSettings.json file
- some refactoring of modhandler, still needs some work.
2013-11-09 19:10:16 +00:00
Ivan Savenko
dd73573c5c
- vcmi can now calculate crc32 checksum of a file
...
- reorganized internal filesystem structure - all files from one mod are
now grouped in same FS node
- modhandler will now calculate crc32 checksum for each mod
- modhandler now knows validation status of each mod
todo - use checksum to determine mods that have not changed since last
start and disable validation for them.
2013-11-08 20:36:26 +00:00
Ivan Savenko
c4716d0a9a
- reordered files in cmake so files with long compile times will be
...
compiled first.
- changed format of modSettings.json, VCMI should properly update file
on the first run.
- implemented property "defaultTavern" that acts as default value for
"tavern" entry in hero class and town formats.
2013-11-03 12:07:23 +00:00
Ivan Savenko
e2c037402c
Unicode support.
...
- boost-locale library is now required (boost 1.48 or higher)
- Unicode namespace that contains UTF-8 handling
- All non-ASCII strings from H3 data will be converted to UTF-8 during loading
- All JSON files MUST use UTF-8.
- H3 data encoding can be selected via launcher or directly in config file
2013-10-25 21:45:14 +00:00
stopiccot
cbc8cde10a
some OS X fixes
2013-10-07 01:19:02 +00:00
Ivan Savenko
03bca320fe
- fixed update presence detection in launcher
2013-10-01 15:14:05 +00:00
Ivan Savenko
eb6ff6b114
fixes #1482 , add one pixel spacing for Chinese fonts
2013-09-25 21:15:15 +00:00
Ivan Savenko
208df34fc2
bigfixing & new file: launcher/jsonutils.cpp
...
- launcher uses json parser from vcmi lib instead of one from Qt #1469
- fixed abilities overrides for some creatures #1476
- fixed hero portraits in seer huts #1402
- ttf fonts will render text in utf-8 mode. Not really useful at this point
- new settings entry, available in launcher: encoding. Unused for now.
2013-09-21 18:29:26 +00:00
Ivan Savenko
6331995afd
minors:
...
- fixes missing line of pixels with Chinese fonts
- disabling a mod won't disable all its requirements as well
2013-09-08 18:35:09 +00:00
Ivan Savenko
e13dc872e0
- support for Chinese fonts (GBK 2-byte encoding)
...
- fixes #1446
2013-09-08 16:49:23 +00:00
Ivan Savenko
42879225f0
minor fixes:
...
- don't crash if image can't be player-colored (no palette)
- fixes #1447
- compile fix
2013-09-08 13:02:34 +00:00
Ivan Savenko
8515bd037d
basic error reporting for launcher.
2013-09-05 21:25:03 +00:00
Ivan Savenko
0a627698d8
- fixes crash on giving banned skills to hero (partial #1427 )
...
- fixes hover text for prisons - they should not display name of imprisoned hero
- missing bits for launcher, Linux-specific
2013-09-04 23:00:51 +00:00
Michał W. Urbańczyk
f217c61131
Added launcher to solution, fixed .rc file so launcher has its icon.
2013-09-04 20:12:37 +00:00
Michał W. Urbańczyk
a50e9219c2
Launcher works for me.
...
Details: http://forum.vcmi.eu/viewtopic.php?p=10290#10290
2013-09-02 17:26:52 +00:00
Ivan Savenko
4287b2b7bb
fixes for launcher, as discussed on forums:
...
- renamed files that should be preprocessed with moc: they will have _moc suffix (cpp files were also renamed for consistency)
- fixed disabling of mods that have dependent on them mods
- repositories will be reloaded if changed
- may have fixed non-starting vcmi client on Win
2013-08-24 20:11:51 +00:00
DjWarmonger
0c717618c5
Project finally compiles.
2013-08-23 09:19:13 +00:00
DjWarmonger
7a1752ef32
Almost there, linker issues are gone.
2013-08-23 08:30:31 +00:00
DjWarmonger
4be6f131c4
More work on launcher project
2013-08-23 06:42:49 +00:00
DjWarmonger
4a8dbf2f2b
Not-yet-finished project for Visual Studio. Needs moc tool.
2013-08-22 17:47:49 +00:00
Ivan Savenko
7cbfdd509c
VCMI Launcher/Mod manager. See forum post for details.
2013-08-22 14:22:49 +00:00