Commit Graph
4089 Commits
Author SHA1 Message Date
Ivan Savenko 9841600839 Moved all resolutions but 800x600 into a separate mod 2014-08-03 19:11:54 +03:00
Ivan Savenko 77a73fbaa9 Merge branch 'feature/freegfx' into refactoring/guiClasses
Conflicts:
	client/windows/CHeroWindow.cpp
	client/windows/CQuestLog.cpp
	client/windows/GUIClasses.cpp
2014-08-03 18:50:59 +03:00
Ivan Savenko 7390647cd5 End of buttons refactoring:
- cleanup of slider API
- documentation fixes
2014-08-03 17:31:56 +03:00
Ivan Savenko 0882201b17 Miscellaneous fixes to toggle buttons 2014-08-03 16:19:16 +03:00
Ivan Savenko 10fc1892a8 Large refactoring of button classes:
- renamed CAdventureMapButton to more expectable CButton
- merged CButtonBase into CButton
- created more generic class for clickable elements
- created more generic class for selectable elements
- renamed CHighlightableButton to CToggleButton
- renamed CHighlightableButtonsGrous to CToggleGroup
- minimized differences between API of all these classes
- removed all but one contructors in buttons, with same parameters across all classes
2014-08-03 14:16:19 +03:00
Ivan Savenko 731aedf3a1 Split CIntObjectClasses into multiple smaller files. This should be the last change in files 2014-07-15 10:14:49 +03:00
Ivan Savenko 9f5704f8ba Uploaded recreated stack queue backgrounds 2014-07-14 22:38:13 +03:00
Ivan Savenko 52da593292 New resolution selection button 2014-07-14 21:49:52 +03:00
Ivan Savenko 5111bff6cc Implemented new button for commander window 2014-07-14 20:43:38 +03:00
Ivan Savenko 7f790f9d6a Quest window now uses new background, using same gfx sources as creature window 2014-07-14 18:07:57 +03:00
Ivan Savenko a69fcdd435 Fixed compilation issues caused by merge 2014-07-14 17:44:15 +03:00
Ivan Savenko 92d22bae63 Merge branch 'feature/creatureWindow' into refactoring/guiClasses 2014-07-14 17:23:24 +03:00
Ivan Savenko 2a0a0e81a7 Cleaning up includes 2014-07-14 17:19:44 +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
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
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
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
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
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
Michael Pavlyshko 3443ba5bb3 fix libvcmi linking 2014-07-09 01:43:13 +03:00
Michael Pavlyshko e0134aed0b Delete unused include 2014-07-08 02:00:11 +03:00
Michael Pavlyshko 820eceb8ad Add VCMI_DLL flag for libvcmi 2014-07-08 01:50:44 +03:00
Michael Pavlyshko 2957377360 Fix *_DIR variables for windows 2014-07-07 23:21:59 +03:00
Ivan Savenko ca86416953 Fixed compilation with gcc 4.7 2014-07-07 11:02:55 +03:00
Ivan Savenko 142272d588 Debian/Ubuntu builds will use SDL1.2 2014-07-07 09:16:28 +03:00