games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
7,303 Commits 30 Branches 75 Tags
71a3852be4aca2a93197dcb0d7749b61d2d40c30
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
beegee1 e9b7044c9b Fix mantis #1859, unknown pattern in underground 2015-03-28 16:41:26 +01:00
beegee1 dafaf86eef Add some debug logging, Fix one special case when updating terrain type, Improve visual look of updated terrain types 2015-03-28 16:41:26 +01:00
beegee1 d918621d66 - fixed casting sacrifice spell (was broken and now fixed partially) 2014-08-05 19:12:56 +02:00
beegee1 c1ac95b288 - fixed Clang compiler warnings 2014-08-04 20:36:00 +02:00
beegee1 12126754fb - added all SDL2 directories to CMake (in case if any SDL2 module is installed somewhere else) 2014-08-04 20:35:23 +02:00
beegee1 5139378319 - migrated boost::function/ref/bind to std:: variants 2014-08-04 20:33:59 +02:00
beegee1 a94b7e0986 - updated changelog 2014-06-02 20:34:09 +02:00
beegee1 a87363c0f1 - fixed mantis #783 - play sound when entering message in chat box 2014-06-01 18:48:40 +02:00
beegee1 72b2e1b8fe - fixed bug when generating random map and adding player info data 2014-05-29 17:34:46 +02:00
beegee1 40ab89e179 - copy of campaign heroes can be done later (at the point where it's clear if they will be replaced) 2014-05-29 17:07:21 +02:00
beegee1 80765eb0a3 - fixed clang compiler warnings (detects now unused constant vars) 2014-05-16 19:22:21 +02:00
beegee1 60f6c00f2e Logging API: - removed unused method declaration - updated comments - ensured thread safety 2014-05-10 21:12:33 +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
beegee1 48e7b7d805 - Some performance improvements for logging 2014-04-01 19:46:47 +00:00
beegee1 fe1b16a7ec Some preparation towards mantis #1743: 
- refactored CRandomGenerator (added util methods, improved method names)
- usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced)
- refactored getArtSync method of CArtHandler -> now named pickRandomArtifact
- fixed some compiler warnings
- updated source code URL in VCMI spec
 2014-03-17 19:51:07 +00:00
beegee1 55a4561926 - fixed mantis #1729 2014-02-26 19:51:44 +00:00
beegee1 23a4abe841 - updated changelog 2014-02-26 18:54:11 +00:00
beegee1 70914cff91 - added my part to changelog for 0.95 
- updated RPM spec
 2014-02-25 18:53:44 +00:00
beegee1 674c8bc591 - Fix to previous commit (keep heroes which are in heroes pool too) 2014-02-23 16:21:30 +00:00
beegee1 d0a5a6eab4 - Implemented hero recreate handling correctly 2014-02-23 13:52:06 +00:00
beegee1 8a9f2781c2 - Fixed #1674 (Xeron should be re-created on AB campaign) 
- Remove all hero placeholders after placing campaign heroes
 2014-02-19 19:14:32 +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 5a7551388b - added missing cotire files to previous commit 2014-02-01 13:38:15 +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
beegee1 d4fd361d4b - fixed #1643 -> hero placeholder handling 
- fixed bug when loading victory/loss conditions of the 3rd scenario in the first ROE campaign
- fixed bug when loading artifacts to hero of the 3rd scenario in the first ROE campaign (due to corrupt H3M map)
- implemented function object to quickly find a object by it's sub ID in a list
- added netbackbase.h to header list in CMake
- removed false message which said that the server loaded the map successfully
 2014-01-30 18:56:31 +00:00
beegee1 22e119770a Fixed mantis #1645 2014-01-03 16:36:22 +00:00
beegee1 aff704d1ca - Fixed mantis #1643 2013-12-31 16:58:11 +00:00
beegee1 5971ceaa7f - Fixed hero / army strength handling 2013-12-31 16:11:18 +00:00
beegee1 a03d01bd3f - Updated TODOs, removed unused method declaration, updated comments 
- Fixed hero strength calculation (power, knowledge should be included as well)
 2013-12-30 20:04:24 +00:00
beegee1 9d0387140f - Fixed bug when the type id of the hero placeholder is the same as a already placed hero or prisoned hero 2013-12-30 15:34:28 +00:00
beegee1 b8eddcd9a8 - Moved place bonus hero before normal random hero and starting hero placement -> same behaviour as in OH3 
- Moved placing campaign heroes before random object generation -> same behaviour as in OH3
- Refactored pickHero into pickNextHeroType (hero generation sequence) and pickUnusedHeroTypeRandomly
- Added a SIGSEV violation handler to vcmiserver executable for logging stacktrace (for convenience only)
- Fixed Fuzzy.cpp and VCAI.h compilation on Clang
- Added a handleException function in addition to our macros (no use of macros, enables debugging support, does not re-throw, catches ...-case too)
 2013-12-28 12:47:55 +00:00
beegee1 11ca1ec1f8 - Fixed custom main hero handling (map options) 
- Refactoring
 2013-12-23 15:59:37 +00:00
beegee1 68bdf71db6 - Fixed GCC compiler warnings 
- Implemented move heroes to next scenario partially
 2013-12-20 13:07:58 +00:00
beegee1 f0cbbbdb70 - Refactored method CGameState::init 2013-12-18 18:18:12 +00:00
beegee1 61fc216a6f - Fixed mantis #1421 
- Fixed initial map selection in campaign bonus screen
 2013-12-17 17:14:55 +00:00
beegee1 d1002f7e8f - Fixed starting another map from campaign bonus selection screen while playing a campaign mission 2013-12-17 12:12:25 +00:00
beegee1 b9b25ef552 - Fixed mantis #1422 (starting another scenario crashes VCMI for now) 
- Refactoring
 2013-12-16 18:39:56 +00:00
beegee1 69eee05ccc - Partially fixed mantis #1065 (Gate with hex 95 can't be attacked) 
- Fixed 'catapult tried to attack non-catapultable hex!' problem, now catapult attacks attackable wall parts only
- Fixed problem that the server performed applying damage on a wall part twice
- Added methods for checking what wall parts are attackable and if a wall part is potentially attackable
- Added functionality to trace net packages
- Added functionality to trace std::vectors
- Added tracing for CatapultAttack(CPack)
- Updated various toString methods to use {} instead of []
- Refactoring
 2013-12-08 17:54:13 +00:00
beegee1 f2cc630e2c - Show confirmation dialog when pressing Alt + F4 to quit the game 2013-12-07 18:26:15 +00:00
beegee1 30b3081ac4 - Fixed castle.json (building structures) 2013-12-07 12:23:43 +00:00
beegee1 6caac8e82b - Fixed mantis #1613 2013-12-07 10:04:17 +00:00
beegee1 2d095cf20a - Fixed days without castle counter 
- Fixed 'you have only 0 days...' message
- Checks victory/loss conditions every player turn instead of every day
- Fixed mantis #1463
 2013-12-06 19:44:11 +00:00
beegee1 36a69aaa2f - Fixed VS project files (added missing .cpp files) 
- Structured VS project files (added a filter for every subfolder)
 2013-11-30 14:22:03 +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
beegee1 3e4407593f - Refactoring for checking victory/loss conditions (use enum class instead of magic numbers) 
- Improved showing player lost message for one special case
 2013-11-17 17:57:04 +00:00
beegee1 39d3102905 - Fixed compilation errors on clang 
- Removed compiler warnings of unused variables
 2013-11-16 09:17:19 +00:00
beegee1 237e4272da Fixed mantis #1485 2013-11-10 15:04:29 +00:00
beegee1 e01ef8e36a - Fixed mantis #1576 (doesn't hang game) 
- Implemented output stream operator<< for various classes(BattleAction, BattleHex,...) to improve debugging and logging
 2013-11-09 16:25:20 +00:00
beegee1 86b7feeab3 - Fixed mantis #1248 
- Fixed spellbook page save positions for hotseat mode
 2013-11-03 18:16:25 +00:00
beegee1 94bee3fd1b - Changed visibility of curInt member of BattleInterface from public to private and provided a getter method 2013-11-03 16:44:47 +00:00
beegee1 aa1c193b88 Fixed mantis #1582 2013-11-02 20:07:45 +00:00
beegee1 9ebd4a5c00 Changes due to boost locale: 
- Updated README.linux
- Fixed missing boost locale include when compiling with unit tests
- Updated RPM spec (increased minimum boost version, added boost locale requirement)
 2013-11-02 17:16:07 +00:00
beegee1 aa7ab847c7 - Updated RPM spec 2013-10-02 18:01:11 +00:00
beegee1 d6dfd8bfbc - Fixed a bug when starting a random map with a town added by a mod 2013-08-22 18:08:42 +00:00
beegee1 fd9995ff82 - Missing thing to previous commit... 2013-08-19 18:46:30 +00:00
beegee1 a13d72b636 - Fixed GCC warning 
- Small refactoring
- Added RPM spec to SVN again (it's better to keep it there :) )
 2013-08-19 18:20:11 +00:00
beegee1 1ac328635a - Added handler classes CRmgTemplateStorage and CTerrainViewPatternConfig to LibClasses 
- Re-organized CMapGenerator
- Created CZone and CTemplate objects in the heap and used pointers
- Added stub classes CZoneGraphGenerator and CZonePlacer (include warnings of unused variables, please ignore them)
- Fixed CRandomGenerator bug that always the same number was produced
- Better structure of Visual Studio project files with using filters
- Updated project files (VS, CMake)
- Excluded compiler warning mismatched-tags (false positive)
- Fixed a bug when compiling with unit tests enabled
 2013-08-17 12:46:48 +00:00
beegee1 56534bc3fb - Bug fix to previous commit 2013-05-21 19:26:31 +00:00
beegee1 5328beb8e7 - Fixed some bugs when starting a RMG map - Checks if there is a template for the chosen options(rejects if not) - Added a few templates for development(2 to 4 players, medium maps are supported) - Refactoring 2013-05-21 19:08:06 +00:00
beegee1 42c2c29976 - Added support for RMG templates(subset of OH3) - Added template "Small Ring" for testing 2013-05-11 17:36:11 +00:00
beegee1 298f862d86 - Implemented updating additional terrain types fully(including 2 special cases) 2013-05-03 10:15:59 +00:00
beegee1 3358a8efec - Added terrain & object selection classes - Added CComposedOperation - Refactored clear terrain, it is now an operation - Added rough support for updating terrain type if required 2013-04-29 15:51:39 +00:00
beegee1 9776fa9f18 - Added the last two missing patterns 2013-04-27 08:57:04 +00:00
beegee1 0f7d175896 - Fixed all unit test failures and a few more bugs - Simplified view generation algorithm 2013-04-26 15:57:47 +00:00
beegee1 23f7be2a54 - Fixed a few bugs related to the terrain view generation - Updated CMakeLists in /test(copy resources if no source files has been changed too) 2013-04-25 16:09:48 +00:00
beegee1 7a3f5dc23b - Replaced exceptions with assert for internal-API code 2013-04-22 16:04:17 +00:00
beegee1 8d82c49a99 - Compile fix - Renamed map operations 2013-04-22 15:08:04 +00:00
beegee1 dd78205ce8 -Added test subfolder and updated CMakeLists for unit testing - Added a test case for the DrawTerrainOperation class(does not pass all tests successfully, 6 failures left to fix) - Fixed a few bugs 2013-04-22 14:49:28 +00:00
beegee1 03c2aa9153 - Refactored CMapEditManager(added structure for undo functionality) - Refactored CMap(terrain pointer is private, safe access via getTile) 2013-04-19 11:43:11 +00:00
beegee1 45fccfb1a6 - Added new trace macro LOG_TRACE which autom. appends leaving func message - Removed old trace macros - Small refactoring in CMapEditManager - Changed documentation comments to /// style for various mapping header files 2013-04-16 13:16:58 +00:00
beegee1 feea589648 - Bug-fixing for last commit - Moved CMapGenOptions to CMapGenerator 2013-04-15 17:18:04 +00:00
beegee1 44bde4a1d3 - Fixed indentation for various files, sorry... 2013-04-14 19:24:31 +00:00
beegee1 c10266ed97 - Reduced complexity to use the CMapGenerator(simpler interface) - Removed h3m.txt and tchar_amigaos4.h 2013-04-14 18:52:05 +00:00
beegee1 b1428bcd24 - Compile fix for editor - Renamed /Editor to /editor and Scripting/ERM to scripting/erm - Removed unused ipch folder and format file - Removed ancient lua folder 2013-04-13 11:07:32 +00:00
beegee1 f10ba48c77 - Fully integrated new logging API(ERM, Editor, missing parts) - Removed old logger 2013-04-11 15:58:01 +00:00
beegee1 e6bb9d3887 - Integrated the logger API into the ERM project 2013-04-11 12:04:44 +00:00
beegee1 6827fcdb53 - Integrated the logging API into the server project - Simplified CBasicLogConfigurator usage(exception handling, logging, log file appending) 2013-04-10 17:18:01 +00:00
beegee1 abf96a5b66 - Integrated the logging API into the AI subprojects - Added macros for tracing the control flow - Added methods isDebug/TraceEnabled for performance-critical sections 2013-04-10 16:28:14 +00:00
beegee1 c7c2686379 - Integrated the logging API into the client and the lib - Remove some more comments and switched to /// style - Fixed recursive locks - Added Global.h to CMakeLists(now visible in qt-creator) - Removed usage of shared_mutex - Added unique_ptr to CLogger targets 2013-04-09 14:31:36 +00:00
beegee1 30bcec42c6 - Renamed client/BattleInterface to client/battle and client/UIFramework to client/gui 2013-04-07 11:52:07 +00:00
beegee1 ee51c5beb5 - Renamed /lib subfolders to lowercase 2013-04-07 10:48:07 +00:00
beegee1 89ad007b44 - Renamed Logging to logging 2013-04-07 10:30:01 +00:00
beegee1 b82f232e50 - Moved the private part of the logging API to CLogger.h/.cpp 2013-04-07 10:17:55 +00:00
beegee1 1bb79ed187 - Removed some documentation comments 2013-04-06 18:34:06 +00:00
beegee1 de01ea54b0 - Added stream-like logging - Schema refactoring 2013-04-06 17:45:02 +00:00
beegee1 fc41d24164 - Deleted RPM-related stuff from SVN 2013-04-06 16:18:06 +00:00
beegee1 0baa261dfc - Implemented the new logging API(not used currently) - Added lock typedefs to Global.h - Some layout updates to Global.h 2013-04-05 10:29:46 +00:00
beegee1 96ec6e71a4 - Updated RPM spec 2013-02-02 19:04:52 +00:00
beegee1 db2f468341 - Fixed some bugs when generating terrain view IDs (mock map seems to be OK) - Enabled RMG by default 2013-01-26 13:48:20 +00:00
beegee1 a4129f43f2 - Correct handling of who manages which players(player count may differ from initial start options for a RMG map) - Fixed warning 2013-01-21 20:49:19 +00:00
beegee1 1cab54b87a - Fixed bug when starting random map with 1 player - Refactoring - Fixed compile bug - Heroes can be selected in map selection screen(RMG map) - Main town gen 2013-01-20 14:43:58 +00:00
beegee1 6d0221c0e7 - Compile fixes 2013-01-08 18:32:47 +00:00
beegee1 0311e5e6f5 - Added basic mock/test generation - Added stub for terrain editing 2013-01-06 19:30:12 +00:00
beegee1 53169abea7 - Foundation for starting a random map is done - Moved StdInc.h to header file in some /Map and /RMG compilation units(better syntax highlighting, should have no negative impact) 2012-11-20 17:53:45 +00:00
beegee1 e08db9790b * Map size can be any integer value * Changed new_*; to new_*(); for zero-parameter c-tors (=code convention; stack allocated objects without parantheses as ever to avoid c++ most vexing parse) 2012-11-13 18:01:31 +00:00
beegee1 c336abcf4a * Added RMG tab to pregame(disabled by default, activate with: enableRMG=true in settings.json) * Fixed tab intendation * Renamed colors to more comprehensible names 2012-11-11 12:23:31 +00:00
beegee1 105083dd70 * Code convention updates * Default values for CMap types * Updated BinaryReader c-tor * Converted "bool" int types to bool in CMap classes * Removed map event operators in favor of member methods 2012-11-06 16:39:29 +00:00
beegee1 a878f5f79a * Separated map loading from the map object * Moved map classes to lib/Map * Renamed map.h/cpp to CMap.h/cpp * Profiling of map loading is now optional * Updated CMemoryStream 2012-11-03 13:30:47 +00:00