games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity
2,924 Commits 22 Branches 61 Tags 102 MiB
4e0881f689
Commit Graph

197 Commits

Author SHA1 Message Date
Ivan Savenko
4e0881f689 - fixed #1167 
- CLabel will print text in "{}" using title color
 2012-12-20 13:57:29 +00:00
Michał W. Urbańczyk
27f8408c52 Compile fix for MSVC. 
Fixed crash when no maps are present.
Fixed crash on opening the loading screen.
Fixed crash on starting the turn when Games/ subfolder is not present.
 2012-12-19 18:19:09 +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
94c55e2632 - string ID's for spells (not configurable due to hardcode) 
- spell chances in new towns guilds can be specified in config
 2012-12-18 10:32:11 +00:00
Ivan Savenko
62e99a1ae5 - basic loading screen, no progress bar 
- startGame() call will run in separate thread if loading screen is used (looks OK so far)
 2012-12-17 18:01:17 +00:00
Ivan Savenko
ff146a80fe - fixed empty tavern in new towns 
- by default new heroes\new towns will be enabled on maps (no effect without mods)
 2012-12-17 12:55:29 +00:00
Ivan Savenko
e36bc50504 - support for new heroes and hero classes 
- moved hero-specific data from text handler to CHero
- moved hero classes-specific data into heroClasses.json
 2012-12-16 13:47:53 +00:00
Ivan Savenko
ffe8b99369 - reorganized hero classes 
- artifact iconIndex should work
- new file with hardcoded string constants: lib/StringConstants.h

Note: some minor bugs, will fix soon:
- slow to open hero window
- hero adventure map images serialization is broken\incorrect
 2012-12-14 15:32:53 +00:00
Ivan Savenko
1c5a4c669c - merged minimap.json into terrains.json 
- removed no longer used fields from Graphics + portraits.json
 - work on pregame:
 - - new code for map options window icons + popups
 - - fixed bugs related to new towns
 - - less hardcoded magic numbers
 2012-12-10 14:28:27 +00:00
Ivan Savenko
c9dd80ea6d - moved json-related functions (e.g. ParseBonus) into JsonUtils namespace 
- replaced JsonNode::toStdVector with more universal convertTo
- some renaming in StartInfo
 2012-12-02 12:21:44 +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
DjWarmonger
f5ddc44827 - Compile fix - unique_ptr can't be serialized 
- Linking fix - now MapGenOptions have DLL-interface (but probably shouldn't be called directly from client anyway)
 2012-11-13 12:55:47 +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
Ivan Savenko
0d863c83d7 - removed autogenerated by autotools files 
- fixes for #386 using patches from Ixtreon
 2012-11-10 21:56:19 +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
Ivan Savenko
fc85e08a64 - clang and gcc 4.5 compatibility 
- autotools update
- debian build system fixes
 2012-11-03 19:31:16 +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
beegee1
720deba838 * Added comments to map.h * Refactoring(renamed attributes, some steps towards coding guidelines, ..) 2012-10-26 17:51:05 +00:00
Ivan Savenko
da7a6234b1 - some tweaks towards new towns 
- it is possible for faction to have 0 available heroes
 2012-10-06 08:47:13 +00:00
Ivan Savenko
306d64b0c4 - it is possible to read json file with vector 
- town configuration:
- - all town-related texts are now in TownHandler
- - alignments are now part of faction
- - removed CTown::bonus field
 2012-10-05 13:11:26 +00:00
Michał W. Urbańczyk
f8a27a9fdb * Moved CConfigHandler from client to lib, CMake/Makefile need updating. I believe other projects besides client also need access to settings. (surprisingly there was a "server" category used only by client... and now VCAI.) 
* It is possible to set the battle ai that'll be used by neutrals by typing in VCMI console:
setBattleAI <AIName>
VCAI also respects that setting and uses given AI as its battle back-end.
 2012-09-29 10:59:43 +00:00
mateuszb
8dca88c3c8 * start map in campaign button is properly disabled/enabled (I hope) 
* exported json for artifact bonuses; no limiters/propagators yet, so it's not used
* minor changes
 2012-09-26 18:10:29 +00:00
Ivan Savenko
15a7f43e11 - fixed #1075, #1080, #1081 
- fixed some warnings from cppcheck
 2012-09-26 13:13:39 +00:00
mateuszb
7fe2692bf8 * support for campaign scenarios with no bonuses 2012-09-24 19:23:11 +00:00
mateuszb
18bd898cb1 * fixed bug when starting certain maps in campaigns 
* introduced TPlayerColor typedef
 2012-09-24 16:14:53 +00:00
Ivan Savenko
3fcba4fb5c - fixed crash on start of some campaigns 
- allowed on map factions is now set instead of bit field
 2012-09-23 14:32:49 +00:00
mateuszb
00c079f7dc * improvements for HERO campaign bonus 2012-09-23 11:26:26 +00:00
mateuszb
9acfa0d136 * more or less working HERO campaign bonus 
* minor improvements
 2012-09-22 17:23:28 +00:00
mateuszb
82e21f8b6e * minor campaign related improvements 2012-09-22 15:16:45 +00:00
mateuszb
8e3de98059 * restoring campaign features 
* minor improvements
 2012-09-21 17:59:54 +00:00
mateuszb
fb2f19b4c5 * some work on campaigns 2012-09-18 17:47:52 +00:00
Ivan Savenko
44cc848edc first part of town configuration: 
- moved almost all loading to TownHandler
- CBuildings and CStructures are now part of CTown
- merged hall.json into buildings.json

Should not cause any crashes or glitches
 2012-09-02 10:33:41 +00:00
Ivan Savenko
eec4d3579d - fixed crash on missing videos 
- fixed savegames name selection
 2012-08-11 11:34:49 +00:00
Michał W. Urbańczyk
cd63c177e2 * std::unordered_map implementation in MSVC 10 has terribly slow destructor. Since bug is fixed only in VC11, I replaced it with boost::unordered_map. 
* fixed crash with invalid .lod archive (some H3 installations have fake 1 byte .lod "archives"
* fixed crash when parsing invalid map file
* minor random optimizations (rv-refs, etc)
 2012-08-08 08:25:27 +00:00
Ivan Savenko
9cbc1f1058 - merged basicCreatures and upgradedCreatures into single array 
- missing fix for savegames
 2012-08-07 21:46:24 +00:00
Ivan Savenko
8040a81eec - fixed save games issues (#1044) 
- hopefully some speedup for filesystem loading (#1048)
 2012-08-07 11:28:52 +00:00
Ivan Savenko
708ad6ac7f - music player uses URI's instead of enum from music base 
- #1045 and #1046 should be fixed
- moved pregame backgrounds to config/mainmenu
- animation can be overriden with .json multiple times
 2012-08-06 07:34:37 +00:00
Ivan Savenko
e67f8afdd9 - removed multiple unused files 
- config folder with all json files is used via new FS API
- fixed campaigns loading. Replaced "detect h3m starts" heuristics with CCompessedStream::getNextBlock()
 2012-08-02 11:03:26 +00:00
Ivan Savenko
b3c17d2788 large filesystem update. Filesysytem is now fully functional, everything should work. 
- completely replaced CLodHandler, removed bitmaph and spriteh
- replaced CLodStream in favour of CCompressedStream (2 new files)
- renamed CResourceLoaderFactory and ResourceIndetifier to shorter names
NOTES:
- campaign loading is currently broken. Will fix.
- I am going to remove several unused files in several days (e.g. LodHandler)
 2012-08-01 12:02:54 +00:00
Ivan Savenko
13de841e10 - minor tweaks to quest window 
- fixed #531
- fixed query crash (empty funciton)
 2012-07-21 20:16:54 +00:00
Ivan Savenko
613172fa45 - fixed #582, #1019 and #1022 
- linux readme tweaks
 2012-06-27 20:44:01 +00:00
Ivan Savenko
9d2711fb51 - rewrote most of classes from adventure map window 
-- new files: client/AdventureMapClasses.*
-- implemented all missing details from infobox
- textinput can handle numbers as input
- fixed several bugs caused by CIntObject changes
- fixed #988
 2012-06-13 13:04:06 +00:00
Frank Zago
5dff7d64f6 Allows to load campaigns from the user directory too. 2012-06-09 14:26:41 +00:00
Michał W. Urbańczyk
e7d82a9702 Rewritten CLoadFile::openNextFile to be cleaner and not leak. Desperate messing around for #989. 2012-06-08 00:12:31 +00:00
Ivan Savenko
d60f2d57a0 - first part of CIntObject API clean-up. 
- - mostly remove usage of (de)activateSomething functions
- - CIntObject's can be safely deleted in active state or without removing from parent first
- - Added CWindowObject to use as base of all windows (will be required for such features as shadows)

Report any crashes or glitches - it should not cause any issues apart from more console output. 

TODO:
- remove redundant (de)activate and show(All) calls
- decrease usage of blitAtLoc\printAtLoc methods
- switch all windows to new base
 2012-06-02 15:16:54 +00:00
Ivan Savenko
faaf799d95 - fixed some extra warnings. Mostly harmless. 
NOTE: Please check changes in BattleState.cpp and GameHandler.cpp for possible bugs
 2012-05-28 19:29:32 +00:00
Ivan Savenko
7ddf76a081 - fixed #967 
- removed unused settings.txt
- fixed player flags on info windows.
 2012-05-26 17:59:00 +00:00
Ivan Savenko
59255a4cad - background for main menu can be scaled. Won't work as default due to non-scalable video 2012-05-20 11:03:21 +00:00
Ivan Savenko
a13a62537b - fixed crash in hero window (#963) 
- added unused for now image scaling algorithm
 2012-05-19 21:38:01 +00:00