1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

146 Commits

Author SHA1 Message Date
AlexVinS
439aeecc8b [c::b] re-enabled PCH, tested with GCC 5.3. (Older versions may not work) 2016-08-18 13:40:35 +03:00
AlexVinS
72f79a3ad7 Draft boost::format based log proxy. 2016-08-13 16:57:09 +03:00
AlexVinS
dd70e74769 [AI] relaxed logging 2016-08-13 16:57:07 +03:00
Vadim Markovtsev
3926920103 Rename radious -> radius
There is no such English word, "radious"
Some files get new lines in the end - BSD sed bug + best practices
2016-01-31 18:01:58 +03:00
Zyx-2000
a50a702073 switched to -std=gnu++11 2016-01-18 17:49:07 +01:00
Zyx-2000
203b2dccc3 hopefully fixed things 2016-01-09 21:23:55 +01:00
Arseniy Shestakov
9fd1cff090 Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.

This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
ArseniyShestakov
f6de3f94ca Teleports: use TTeleportExitsList typedef for exits list
There is several ideas that teleportation code have to be shared between object/spells and this way we can avoid changing showTeleportDialog declaration every time.
2015-11-28 02:41:30 +03:00
AlexVinS
03a295f1a0 Added debug mingw64 build, minimum Windows version set to windows 7, SDL suffixes removed from Build Tagerts 2015-08-20 03:28:04 +03:00
AlexVinS
53b85d16be Cleanup C::B projects 2015-06-21 01:59:33 +03:00
ArseniyShestakov
25656aa586 Add showTeleportDialog everywhere except actual code for AI and player
Just like TeleportDialog it's based off showBlockingDialog, but as number of package is higher when possible showTeleportDialog will be after other dialogs handling code.
2015-03-08 16:52:50 +03:00
DjWarmonger
8b10f70afd Migrating to MSVS 2013, which allows to delete inttypes.h file. 2014-08-31 19:08:39 +02:00
Michael Pavlyshko
f7d8faa540 install only .dll (without .dll.a) 2014-07-11 17:27:50 +03:00
AlexVinS
56c74bc46a +More build target to support both SDL1 and SDL2 builds 2014-06-13 07:55:48 +04:00
AlexVinS
bbd0312b45 Tweak configuration 2014-06-13 07:55:47 +04:00
DjWarmonger
4a71442c80 Missing changes. 2014-04-27 14:38:20 +02:00
DjWarmonger
9e7013de77 Backup for my own MVS project configuration 2014-04-24 21:07:43 +02:00
beegee1
e2bcac4d27 - fixed include random generator header 2014-04-18 18:45:47 +02:00
beegee1
1d57b75bc5 - random number generation refactoring
- fixed mantis #1743
2014-04-10 19:22:32 +02:00
alexvins
4203d69525 Part 2 of new spell configuration
1) spell handler refactored to support modding in general way
2) imunnity icons moved to WoG as they depends on wog`s graphics
3) introduced new class template for handlers (todo: use this in other handlers)
4) save format changed
5) introduced "absolute immunity" - unaffected by "the Orb" etc. (todo: use it in config)
6) new format documented on wiki, added json schema.

* more split of registertypes - fixes 32 mingw build
2014-03-07 13:21:09 +00:00
alexvins
a740f7989c [c::b] update projects, disable PHC for now, +few fixes (still wip) 2014-01-05 17:48:50 +00:00
Michał W. Urbańczyk
0a0048fdf4 Updated EmptyAI project to follow the conventions. 2013-09-27 23:41:15 +00:00
DjWarmonger
b36be10e30 2013-07-25 11:53:36 +00:00
Michał W. Urbańczyk
4a0587d500 More work on auto-fight.
Dynamic libraries return smart-pointers to what they create.
2013-06-22 21:47:51 +00:00
Michał W. Urbańczyk
254f194220 Some very early work towards autofight feature.
Added EmptyAI to the solution.
Passing callbacks by shared_ptr.
2013-06-22 14:47:20 +00:00
Ivan Savenko
b01637840a - compile fixes
- fixed building in towns after loading (partial #1272)
2013-05-27 14:20:46 +00:00
beegee1
f10ba48c77 - Fully integrated new logging API(ERM, Editor, missing parts) - Removed old logger 2013-04-11 15:58:01 +00:00
Ivan Savenko
7e46d462b6 - compile fixes
- fixed portrait initialization for random heroes
2013-02-12 21:32:55 +00:00
DjWarmonger
b554af25d3 - Compile fix
- Fixed Basilisk spawning at Hive
- Fixed double-shot of Marksman
2013-02-11 17:23:55 +00:00
alexvins
a9d458c8f4 few more refactorings 2013-02-04 21:58:42 +00:00
alexvins
d8b068afd9 [c::b] update projects 2013-01-08 09:41:28 +00:00
Ivan Savenko
0b1c215882 - end of world, at least for autotools. Removed completely in favor of CMake 2012-12-23 19:44:37 +00:00
Michał W. Urbańczyk
bcf8cab19a Project files update/cleanup. 2012-12-19 18:23:21 +00:00
alexvins
a6388652d3 [c::b] update projects 2012-12-06 12:16:26 +00:00
DjWarmonger
c5d9110176 Compile fix for last commit. 2012-12-01 07:17:55 +00:00
Ivan Savenko
2643762f08 Mac OS patch from stopiccot 2012-12-01 06:30:52 +00:00
Ivan Savenko
0d863c83d7 - removed autogenerated by autotools files
- fixes for #386 using patches from Ixtreon
2012-11-10 21:56:19 +00:00
alexvins
2942e2e824 [c::b] update projects
-boost::iostreams
*link with release boost libs always
2012-10-06 15:12:07 +00:00
Ivan Savenko
c071a03a8a - fix for #1135
- merged wall_pos.json into town config
- removed tower_shooter field from creatures.json
2012-10-05 18:03:49 +00:00
Ivan Savenko
f113f9573d - CPack support. Works on my side, needs tweaks for Win 2012-10-05 12:38:17 +00:00
Michał W. Urbańczyk
6934ec13e2 Post-release version bump.
Minor correction for emptyAI VS project file.
2012-09-29 21:10:39 +00:00
alexvins
5118386cb4 [c::b] tweak PCH options 2012-09-16 09:12:15 +00:00
alexvins
7087be1f02 C::B project files initial import
+ workspace file (not include ERM and Battle AI)
+ project files
* svn:ignore setup
2012-09-15 18:44:55 +00:00
DjWarmonger
289b7b68d9 Mod Handler class. It is connected with engine, but doesn't do anything yet. 2012-08-10 13:07:53 +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
Michał W. Urbańczyk
edccbd4809 Rewritten many parts of query handling. Fixed several scenarios leading to a hang (including #1012). Purged boost::function from player interface (handy but impossible to serialize). VCAI will keep description for each unanswered query, so the further debugging will be easier. 2012-07-15 15:34:00 +00:00
ddaroo
758fb0679e Stub for a CMake build system. 2012-07-01 14:27:41 +00:00
Michał W. Urbańczyk
4cd77a0192 Naive solution for endianess issues. Seems to allow loading a big-endian save on little-endian build.
Fixed compile issues with CEmptyAI. Removed unnecessary methods from its.
2012-06-01 15:59:26 +00:00
Ivan Savenko
4e92859cee - fixed crash on loading of some maps
- minor fixes
2012-05-30 18:37:21 +00:00
DjWarmonger
d491bc1c3a Commanders can level up. It's non-interactive yet.
Printing secondary skills for Commanders.
2012-05-18 14:02:27 +00:00
Ivan Savenko
97aeaa9f28 - moved ColorPutter's to separate SDL_Pixels.h file
- added Channels namespace for accessing subpixels in format-independent way
- fixed several big-endian issues
- re-generated buld system
2012-05-17 10:44:48 +00:00
DjWarmonger
416c08260a - Basic Commander window
- First part of unified quests interface

This graphics package is needed:
http://forum.vcmi.eu/viewtopic.php?p=6943#6943
2012-05-16 17:29:05 +00:00
Michał W. Urbańczyk
f2642cb62c Added VCAI and EmptyAI to the VS solution. Removed from it GeniusAI.
Fixed #329, #884, #885.
2012-02-29 01:31:48 +00:00
Ivan Savenko
91c0ce33f4 - re-generated build system
- fixed several gcc issues
2011-12-31 10:03:29 +00:00
beegee1
2f5d6f2684 * CHexField renamed to CBattleHex
* CHexFieldControl renamed to CClickableHex
* CCreatureAnimation.cpp/.h moved to BattleInterface/CCreatureAnimation.cpp/.h
* Removed unused project files
* Added VCMI_client filters file for VS 2010
* Gathered common parts of StdInc.h in Global.h
* Boost.Spirit has been included in PCH for ERM project
* StopWatch renamed to CStopWatch
* GuiBase.cpp split up in UIFramework/...
2011-12-17 18:59:59 +00:00
beegee1
cce814c41b * Final commit 2011-12-13 21:35:28 +00:00
beegee1
7f04ed990b Major refactoring. First part: BattleInterface
Introduction of pre compiled headers,...
2011-12-13 21:23:17 +00:00
Frank Zago
a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
Ivan Savenko
ede7fd5a7a - (linux) Fixed gcc linking issues 2011-10-31 18:00:44 +00:00
Frank Zago
8963293c07 Avoid soname versioning for AI libraries. These libraries are dlopened so there is no need to make them versioned at all.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2011-10-06 01:21:25 +00:00
Ivan Savenko
a89895452a - (linux) fixed searching/loading of scripting libraries
- (linux) moved AI libraries to /lib/vcmi/AI/lib*, ERM lib to /lib/vcmi/Scripting/*
- gcc compile and warnings fixes
2011-06-28 14:19:16 +00:00
Frank Zago
0c3f3c67a9 Callback naming fix. 2011-05-04 02:32:35 +00:00
Frank Zago
ecb3508690 (linux) Added configure test for the icc and clang compilers, and set some extra parameters for them. 2011-04-09 17:28:51 +00:00
Ivan Savenko
2ff07fa66a - Next part of animation system:
-- Reduced memory usage for images with margins
-- Implemented RLE compression
- Linux-related changes:
-- build system updated to include changed paths
-- new dependency: boost-program-options
-- configure option --disable-debug will produce optimized build

- Several gcc compile fixes
- Optimized CPU usage on town screens
- Removed several includes from headers
- Possible fix for #496
2011-02-06 17:26:27 +00:00
Frank Zago
872a057aa7 Fixed bad prototype. 2011-01-29 19:07:49 +00:00
Ivan Savenko
3d9dc0642d - gcc compile fixes
- corrected projectiles for some units
2010-12-24 15:37:48 +00:00
Frank Zago
e252c2d06c Build files update. 2010-08-21 00:41:40 +00:00
Frank Zago
006a7d1f11 serialID is gone. 2010-08-04 03:32:24 +00:00
Frank Zago
df151cceba Various compile and warning fixes. 2010-05-12 02:32:56 +00:00
Frank Zago
3ec6cfd115 (linux) Meved version to 0.75 (at last) and regenerated the makefiles. 2010-01-25 03:19:55 +00:00
Frank Zago
1609b8fdb9 Made all paths dependent on DATA_DIR, USER_DIR, BIN_DIR or LIB_DIR. Data access can now be separated from saved games and binaries.
Fixed a file handle leak.
Bumped revision to 0.74b (linux).
Reworked the build system to remove uneeded dependencies (linux).
Removed use of PATHSEPARATOR since Windows can use / too.
2009-10-04 02:02:45 +00:00
Frank Zago
a9617b3dfd Fixed prototype. 2009-09-10 14:06:28 +00:00
Frank Zago
f92b6fc2b6 Depending on the distros, ffmpeg headers aren't always installed in the same directory. Fix from Szpak. 2009-08-29 15:52:29 +00:00
Frank Zago
a11ea59418 Video player compilation. 2009-06-20 01:40:52 +00:00
Frank Zago
8172493467 Updated autoconf generated files. 2009-05-07 04:52:40 +00:00
Frank Zago
81d2a36df6 Autoconf rework. 2009-05-07 04:45:59 +00:00
mateuszb
621400ac85 * small refactoring 2009-04-30 14:59:30 +00:00
Michał W. Urbańczyk
df25dd7efb Sound patches from Ubuntux #7 - #10:
* Some sound code cleanups
* Renamed soundBase::soundNames into soundBase::soundID
* Add a music handler destructor
* Add Archdevil and vampire pre and post movement sounds

I've applied minor change to fix CMusicHandler - GeniusAI conflict: moved sounds bimap to the .cpp file.

(vcmi_sounds_cleanup.diff
vcmi_sounds_cleanup2.diff
vcmi_sounds_cleanup3.diff
vcmi_add_sounds.diff)
2009-04-30 10:53:06 +00:00
Michał W. Urbańczyk
ade4b46edd Sound patch from Ubuntux #2
(vcmi_sounds.diff)
2009-04-22 18:48:56 +00:00
mateuszb
408411d8c3 * next ubuntux's patch 2009-04-19 15:01:33 +00:00
mateuszb
049b4de2b2 * next ubuntux's patches 2009-04-14 10:46:42 +00:00
mateuszb
4d3808cfa0 * applied ubuntux's patches
* fixed AmptyAI (it builds now)
2009-04-13 18:52:20 +00:00
Michał W. Urbańczyk
b89c951d09 * version set to 0.62
* almost redone treasure chest
* working gaining levels for heroes (including dialog with skill selection)
* corrected another typo i cr_shots
2008-08-13 00:44:31 +00:00
Michał W. Urbańczyk
62b0365e70 Improvements for netcode. AI is working. Townlist won't crash. Moving hero is wrong but won't crash. Giving starting hero is working properly. Town defs are wrong but displayed. 2008-07-27 17:07:37 +00:00
Michał W. Urbańczyk
a729484dde * battle funcs added to ICallback
* initing visiting heroes
* merging stacks in town screen
* available creature amount handled
2008-04-13 11:05:39 +00:00
Michał W. Urbańczyk
fe5bcc19cf * redone def info handling
* redone randomization (mam nadziemę, że będzie toto działać)
* no more cheating pathfinder
* minor improvements
* version changed to 0.52
2008-02-05 03:56:45 +00:00
Michał W. Urbańczyk
d3f5a1c1e7 Finished drawing selection window for treasure chest.
(trzeba dorobic jego zamykanie, zwrocenie infa, zwrot pamieci)
2007-12-27 00:11:46 +00:00
Michał W. Urbańczyk
01c996591a More stuff for selection window. 2007-12-25 16:25:53 +00:00
mateuszb
58f1a2169f faster FoW in minimap, does not work, compiler errors 2007-12-06 18:55:58 +00:00
Michał W. Urbańczyk
c8c0d0eaaf Bugfixes for AI, Callback Interface, logging macrodefs. 2007-12-06 18:32:06 +00:00
Michał W. Urbańczyk
e1b2ae0df1 Several bugfixes and half-done things. 2007-12-01 12:50:33 +00:00
Michał W. Urbańczyk
556311c9ab Partially done object scripting and interactions.
Most of 0.4 ;)
2007-11-18 22:58:28 +00:00
Michał W. Urbańczyk
8440ffb39b Probably last bugfixes for 0.3 2007-10-22 17:01:00 +00:00
Michał W. Urbańczyk
04985fce2f * added #45, #44, #43 2007-10-21 16:45:13 +00:00
Michał W. Urbańczyk
97f4fbcce8 First EmptyAI. It's not used yet, but it can be compiled.
Support for AIs I'll soon after infoboxes for towns (if there won't anything urgent)
2007-10-16 22:41:45 +00:00