Mikhail Paulyshka
ab5e1f9109
don't use separate .rc files for MSVC and MinGW
2014-10-12 16:32:02 +03:00
Ivan Savenko
b1285bc506
Merged GUI refactoring into develop, fixed conflicts
2014-08-09 15:01:55 +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
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
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
Michael Pavlyshko
bad7050096
spaces -> tabulation
2014-07-11 11:01:03 +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
afc6530084
fix vcmiclient linkage
2014-07-09 17:37:08 +03:00
Ivan Savenko
44742814cd
More cleanup:
...
- moved SoundBase.h to lib since it contains shared data
- added RMG info to object format. Note that data is not yet imported in
configs
- slightly updated API of object handlers
2014-06-05 23:51:24 +03:00
stopiccot
7356145c3a
updated LD_RUNPATH_SEARCH_PATHS
2014-03-04 03:51:17 +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
stopiccot
c5e0e48d98
Some OS X related fixes
2013-12-13 11:51:15 +00:00
beegee1
41e274b4aa
- Moved FunctionList from /client to /lib -> used in client and server
...
- Updated project files
2013-11-30 10:08:38 +00:00
beegee1
c786a3076a
- Refactored victory loss condition checks
...
- Added toString() method to EVictoryLossCheckResult enum class to improve debugging
- Removed mostly unused CFunctionList2
- Added missing header files for vcmiclient project to CMakeLists
- Tweaked SDL suggests bpp message a bit
- Added showInfoDialogAndWait (info dialog and waits, used from client thread) and showOkDialog (callback to ok click, used from GUI thread) to player interface
- Added showOkDialog method to CInfoWindow (unused for now, but may be used later)
2013-11-30 09:43:31 +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
stopiccot
cbc8cde10a
some OS X fixes
2013-10-07 01:19:02 +00:00
stopiccot
da659a4924
tiny fix in OS X cmake files
2013-05-01 12:30:46 +00:00
beegee1
30bcec42c6
- Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui
2013-04-07 11:52:07 +00:00
Michał W. Urbańczyk
8c7c4789ca
Attempt to apply patch from stopiccot.
2013-03-01 21:32:26 +00:00
Ivan Savenko
56ffd05648
patch from stoppicot:
...
1. vcmiclient now usese custom Info.plist
2. Original H3 game data is now also stored in Application Support folder
2013-02-06 15:39:34 +00:00
Ivan Savenko
9caa21a51c
- fix for #1189 (h3 text parsing fix)
...
- fix for #1188 (replaced ffmpeg detection with module from KDE)
2013-01-26 19:39:54 +00:00
Ivan Savenko
e023b7d6bc
another OS X patch from stopiccot
2012-12-27 09:21:30 +00:00
Ivan Savenko
b5ebf443fc
- all fonts handling is now in new file, UIFramework/Fonts.cpp/h
...
- common base class for H3 bmp and ttf fonts
- replaced fonts.txt with fonts.json
2012-12-19 17:24:53 +00:00
Ivan Savenko
423a226e31
OS X patch from stopiccot
2012-12-15 07:24:25 +00:00
Ivan Savenko
2643762f08
Mac OS patch from stopiccot
2012-12-01 06:30:52 +00:00
Ivan Savenko
f113f9573d
- CPack support. Works on my side, needs tweaks for Win
2012-10-05 12:38:17 +00:00
Ivan Savenko
a602d7e9da
- build system update
...
- compile\warning fixes
2012-09-29 12:02:46 +00:00
Ivan Savenko
7e778045b8
- removed no longer used CSndHandler. Transition to new fs is finished
...
- moved TownHandler::requirements to CBuilding class
2012-08-09 10:32:50 +00:00
Ivan Savenko
a72a294a46
some work on new filesystem, not tested
...
- one more new file
- removed duplicating code
- filesystem parser is now recursive
- decompression should be possible if decompressed size is unknown
- autotools and cmake update
2012-07-23 10:23:43 +00:00
Ivan Savenko
e4c88d5088
- moved ParseBonus to JsonNode.cpp (linkage errors)
...
- fixes to CMakeLists - vcmi can be compiled and started with cmake
- gcc\clang warnings fixes
2012-07-19 18:52:44 +00:00
ddaroo
69de38bf1d
Tweaks for cmake build system: data dir definitions, flags for clang (not tested), missing CQuestLog.cpp file for the client, naming convention of few binaries same for autotools and cmake
2012-07-15 16:05:41 +00:00
ddaroo
758fb0679e
Stub for a CMake build system.
2012-07-01 14:27:41 +00:00