1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

3058 Commits

Author SHA1 Message Date
alexvins
53b684180d [refactor]
* use spells configuration (all timed effects for battle spells)
* a few more cleanups
+register erm resource types (useful in future and less noise in log now)
2013-01-16 11:19:04 +00:00
DjWarmonger
a86b5c1e2e Artifacts can now have multiple types of bearers. Fixed problems with Commander arts impossible to wear. 2013-01-16 07:37:51 +00:00
alexvins
0741639baf fix c++ standard violation. 2013-01-15 15:24:52 +00:00
alexvins
68e91ada1c [refactor]
* spells are now more configurable (unused yet, WiP)
* a few more cleanups
2013-01-15 14:20:48 +00:00
alexvins
264ce77ec9 [refactor] a few more cleanups 2013-01-13 12:40:24 +00:00
Ivan Savenko
2f83b211ca - fix for text on kingdom overview (#1172 + some other similar cases)
- removed unused code from text handler
2013-01-12 19:28:38 +00:00
alexvins
055e922e4d [refactor] a few more cleanups 2013-01-12 18:08:33 +00:00
alexvins
f4ee750d64 [refactor] a few more cleanups 2013-01-12 13:53:02 +00:00
alexvins
daf2c285e9 [refactor] reduce some code duplication, get rid of few magic nombers.
*fix deletion of empty pandora box
2013-01-12 10:32:03 +00:00
Ivan Savenko
7e7d12095b - basic support for dependencies\conflicts for mods
- adventure map objects transparency should be more similar to h3
2013-01-10 18:53:49 +00:00
DjWarmonger
d31277c3cc Minor compile fix, not sure why it's necessary. 2013-01-09 08:58:58 +00:00
beegee1
6d0221c0e7 - Compile fixes 2013-01-08 18:32:47 +00:00
alexvins
d8b068afd9 [c::b] update projects 2013-01-08 09:41:28 +00:00
beegee1
0311e5e6f5 - Added basic mock/test generation - Added stub for terrain editing 2013-01-06 19:30:12 +00:00
Michał W. Urbańczyk
d4c30667b8 Fixed #1168 and #1170. 2013-01-06 04:48:05 +00:00
alexvins
4bc2fd5519 [c::b] renamed map subfolder to workaround dependency tracking bug 2013-01-03 12:19:20 +00:00
mateuszb
2848fb6fef Gernsworth's patch for bug #1118 2012-12-30 18:29:15 +00:00
DjWarmonger
c0e09679f1 - Mod artifacts can have components
- Mod artifacts can be for commander / stack
- Commander / stack artifacts will be automatically disabled from random spawning is related module is disabled
2012-12-27 11:00:28 +00:00
Ivan Savenko
e023b7d6bc another OS X patch from stopiccot 2012-12-27 09:21:30 +00:00
DjWarmonger
1807a8a536 - Bonus subtype will now be resolved using string identifiers.
- Registered secondary skills and resource names in identifier pool
2012-12-26 09:46:09 +00:00
DjWarmonger
91175f377b Removed redundant default parameters from artifact config. 2012-12-25 19:55:34 +00:00
DjWarmonger
d50f9c8d34 Moved combo artifacts to config file, they are now handled by string id.
TODO: use same solution for new mod artifacts.
2012-12-25 19:04:15 +00:00
DjWarmonger
743a0fc3f4 Added string identifiers to artifacts.
Some of them have lost some abilities, needs more work.
2012-12-25 17:23:26 +00:00
Ivan Savenko
96cc88ba91 - removed autotools files from ERM
- fixed misplaced town label
2012-12-25 15:39:06 +00:00
alexvins
9051731755 [c::b] reorganize workspace 2012-12-24 15:55:19 +00:00
alexvins
9b106bb0f7 fix build 2012-12-24 15:52:56 +00:00
alexvins
616cedb2f2 get rid of few more magic numbers (obj types)
+stub for wog objects
2012-12-24 15:07:30 +00:00
alexvins
889031a95a get rid of few magic numbers (obj types) 2012-12-24 10:18:30 +00:00
alexvins
399fbb4dfa [config] small cleanup 2012-12-23 23:17:33 +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
Ivan Savenko
da6cb0ae12 - trade windows work with new creatures\artifacts
- removed some duplicated code in creature loading
2012-12-23 10:23:41 +00:00
Michał W. Urbańczyk
fa3d32925e A patch from Gernsworth that fixes #166. CGStatusBar is extended to support alignment, old CStatusBar class is removed. 2012-12-22 20:05:08 +00:00
Ivan Savenko
8824f5e2d5 - H3 creatures use subset of mod creature format (todo - unify code)
- creatures configs moved into confg/creatures files, similar to factions.
 - creatures ID's use same camelCase format as the rest of the game
2012-12-22 16:47:12 +00:00
alexvins
406d43dc27 [c::b] update workspace 2012-12-20 14:04:34 +00:00
Ivan Savenko
4e0881f689 - fixed #1167
- CLabel will print text in "{}" using title color
2012-12-20 13:57:29 +00:00
alexvins
00e7a913a1 [ERM] exclude black template magick from PCH.
this fixes build with PCH enabled
2012-12-20 13:56:57 +00:00
alexvins
92e3e12993 [c::b] update ERM.cbp
*disable PCH for now to fix build
2012-12-20 13:40:21 +00:00
alexvins
61a0a0363f [c::b] update projects 2012-12-19 18:40:20 +00:00
Michał W. Urbańczyk
bcf8cab19a Project files update/cleanup. 2012-12-19 18:23:21 +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
DjWarmonger
0e06ac15ad - Commanders are now a part of faction config
- Support for external dwellings for new towns
2012-12-19 16:35:58 +00:00
alexvins
c0ce8712c1 add some missing licence headers 2012-12-19 14:54:10 +00:00
alexvins
66d9edf76e small refactor secskill limit check. 2012-12-18 11:24:13 +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
alexvins
e775ad8804 small cleanup 2012-12-16 16:54:20 +00:00
alexvins
2ddb9e50e7 [c::b] add configs to lib project 2012-12-16 14:06:39 +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