1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

4428 Commits

Author SHA1 Message Date
Michael Pavlyshko
88316f93d1 add NSIS generator settings 2014-07-14 01:23:57 +03:00
Michael Pavlyshko
6a23960642 CMake/WIN32 : add icon to client and launcher 2014-07-14 01:02:00 +03:00
Ivan Savenko
647b9c683f Reorganized client source tree:
- client/widgets for reusable GUI elements
- client/windows for independent windows
- client/gui for base GUI classes which should remain internal
2014-07-13 20:53:37 +03:00
Ivan Savenko
cec9161f8f Added missing files 2014-07-13 18:40:13 +03:00
Ivan Savenko
83099fdb78 Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree 2014-07-13 18:39:45 +03:00
Michael Pavlyshko
69ca17d985 Disable Clang 3.1. 2014-07-13 18:14:14 +03:00
Ivan Savenko
55ff933b7f Reducing size of GUI classes. Split trade windows into a separate file 2014-07-13 16:31:00 +03:00
Ivan Savenko
09bedf9aa9 Reducing size of GUIClasses. Moved Garrison Int into a separate file. 2014-07-13 16:11:25 +03:00
Ivan Savenko
7e76a5dd0e Moved some code from GUIClasses into two smaller files:
- CArtifactHolder.*
- CComponent.*

Goal: reorganize artifacts UI to decrease dependency on CGHeroInstance class
2014-07-13 14:56:30 +03:00
Michael Pavlyshko
5f04c596b1 trying to update Qt 2014-07-13 14:08:16 +03:00
Michael Pavlyshko
2f9bc5fc9a use ffmpeg ppa 2014-07-13 11:44:39 +03:00
Michael Pavlyshko
9d2b87ba4d try to fix clang 2014-07-13 11:33:44 +03:00
Michael Pavlyshko
023943ad81 Disable gcc 4.6 2014-07-12 20:20:02 +03:00
Michael Pavlyshko
1dd0a04e54 fix 2014-07-12 19:57:50 +03:00
Michael Pavlyshko
704f7e190b add some more compilers 2014-07-12 19:50:48 +03:00
Michael Pavlyshko
1744248095 travis support 2014-07-12 16:35:55 +03:00
Ivan Savenko
e78491fda2 Merge pull request #27 from Mixaill/cmake-2
Make CPack functional on Windows
2014-07-12 14:18:25 +03:00
Michael Pavlyshko
83aff2d68e * remove static linking for libgcc
* fix clang warnings
2014-07-12 14:10:44 +03:00
Michael Pavlyshko
13cbf0bbca disable fPIC for windows 2014-07-11 23:11:19 +03:00
Michael Pavlyshko
3b461cfa02 disable one more warning (type-limits) 2014-07-11 22:54:50 +03:00
Michael Pavlyshko
2145eae128 disable one more warning (strict-aliasing) 2014-07-11 21:35:19 +03:00
Michael Pavlyshko
dbb8b6636f Add -Wno-unused-local-typedefs instead of suppress all warnings 2014-07-11 18:26:22 +03:00
Michael Pavlyshko
699919a251 * link VCMI with libgcc statically
* copy winpthread to install folder
* copy libgcc to install folder because Qt5 linked with libgcc dynamically
2014-07-11 17:29:46 +03:00
Michael Pavlyshko
f7d8faa540 install only .dll (without .dll.a) 2014-07-11 17:27:50 +03:00
Ivan Savenko
59586df402 Merge pull request #25 from Mixaill/cmake-2
Make CMake functional on Windows
2014-07-11 15:51:40 +03:00
Michael Pavlyshko
a96cd51c5a suppress extra GCC warnings on Windows 2014-07-11 14:09:14 +03:00
Michael Pavlyshko
2a18a09d12 install dlls on Windows 2014-07-11 14:08:20 +03:00
Michael Pavlyshko
3c36bc9f51 Enable FFmpeg for all platforms 2014-07-11 12:43:24 +03:00
Michael Pavlyshko
457e922cca fix iconv check 2014-07-11 11:25:20 +03:00
Michael Pavlyshko
bad7050096 spaces -> tabulation 2014-07-11 11:01:03 +03:00
Michael Pavlyshko
3b80c52fc4 Oops, reverting CXX_FLAGS back 2014-07-11 01:27:05 +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
Michael Pavlyshko
8581cfd5d8 link with iconv only when iconv is found 2014-07-11 00:23:06 +03:00
AlexVinS
679dd64ff9 Make scale a parameter of "open" methods 2014-07-10 14:18:21 +04:00
Michael Pavlyshko
08ee65c3c8 fix .dll and .exe filenames 2014-07-10 01:06:37 +03:00
Michael Pavlyshko
c935193558 disable WIN32 flag for executables, fix previous commit 2014-07-10 00:47:22 +03:00
Michael Pavlyshko
ce5f59e8b6 Fix windows linkage, also, use SYSTEM_LIBS variable for OS-dependent libraries 2014-07-10 00:41:31 +03:00
DjWarmonger
966873181f Do not let monsters or treasures spawn near already placed monsters. 2014-07-09 22:09:06 +02:00
Michael Pavlyshko
11d73f2ac9 fix CVideoHandler compilation 2014-07-09 18:01:12 +03:00
Michael Pavlyshko
24af413d61 define M_PI
M_PI isn't a part of standard and may be undefined.
2014-07-09 17:42:22 +03:00
DjWarmonger
6c0a396094 Corrected y-axis orientation, now object placement is correct. 2014-07-09 16:39:17 +02:00
Michael Pavlyshko
afc6530084 fix vcmiclient linkage 2014-07-09 17:37:08 +03:00
Michael Pavlyshko
7405066cbd Link with wsock32 lib 2014-07-09 17:36:01 +03:00
DjWarmonger
492b866806 - Fixed crash caused by randomShuffle
- Banned Magic Spring as it has 2 visitable positions
2014-07-09 14:27:12 +02:00
DjWarmonger
8d58ce08aa Correct position of blocked tiles. 2014-07-09 12:05:14 +02:00
DjWarmonger
927e16d9f5 Almost correct placement of all objects. 2014-07-09 11:38:16 +02:00
DjWarmonger
2a8ae6310e Better object placement and accessibility. 2014-07-09 09:22:50 +02:00
Michael Pavlyshko
3443ba5bb3 fix libvcmi linking 2014-07-09 01:43:13 +03:00
DjWarmonger
22d26db694 Correct placement of non-overlapping objects. 2014-07-08 20:13:51 +02:00