1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-01 00:45:26 +02:00

42 Commits

Author SHA1 Message Date
9ec431c37b Synchronization with trunk (again), elimination of some warnings 2013-03-07 19:17:23 +00:00
34427b9e43 some fixes 2013-03-03 19:28:01 +00:00
dbec99ffc7 * PlayerColor and TeamID refactoring 2013-03-03 17:06:03 +00:00
f306d7bb70 some changes towards editing H3 objects via mods. Should be stable, report if not.
- removed duplicated json loading code in handlers
- simpler and mod-friendly handling of combined artifacts
- reorganized CCreature to avoid huge number of fields in one structure
2013-03-02 16:55:51 +00:00
5f4fb22f53 Several fixes to combined artifacts added via mods. 2013-03-02 09:11:52 +00:00
602827d1ae * MSVC compilation fixes
* campaign epilogues and minor fixes
2013-02-23 19:16:14 +00:00
fbb1ae1bb8 * prologue videos (according to Randjan's list) 2013-02-22 21:03:56 +00:00
92995964f3 a bit more of prologue/epilogue screen 2013-02-20 21:01:18 +00:00
b776b93b0c * a bit of campaign prologue/epilogue screen 2013-02-19 20:39:09 +00:00
d45a554fec Significant changes to saving system. Now both client and server store their lib part.
Desync detection upon loading. Fixed many desyncs. (more remain)
Monsters won't have creature count 0 even if that is set as creature properties.
2013-02-18 22:37:22 +00:00
111312636a Fixed #1207. Some tweaks. 2013-02-17 18:53:01 +00:00
b22d8a007f - minor fixes 2013-02-17 18:25:42 +00:00
560315bc48 * SlotID refactoring 2013-02-16 14:03:47 +00:00
9e00090c42 * refactoring, a few intriguing problems remain 2013-02-13 23:55:42 +00:00
ceea466f54 [refactor] spell handling
* more config options for spells
  + mind immunity handled by config
  + direct damage immunity handled by config
  + immunity icon configurable
- removed mind_spell flag 
* more use of new spell identifacation
2013-02-13 19:35:43 +00:00
9c1a117c1c * refactoring 2013-02-12 22:24:48 +00:00
bda766b697 * refactoring 2013-02-12 19:49:40 +00:00
8a8eecd063 * refactoring 2013-02-11 19:11:34 +00:00
d540723739 * refactoring 2013-02-11 14:42:09 +00:00
86dc9386d6 * refactoring, including a generic solution for IDs 2013-02-10 23:24:57 +00:00
2f39db2375 Hero portraits in campaign bonus selection. 2013-02-09 19:19:14 +00:00
f1c78e3260 * creature ID refactoring
* double week creatures are configurable now
2013-02-07 17:34:50 +00:00
ed3d35554e [refactor] h3m reader
* reduce code duplication
* use binary reader
2013-02-07 17:02:15 +00:00
af5287c193 * fixed opening custom campaign selection window
* artifact positions refactored
* vstd::advance allows moving between enum values
2013-02-06 23:24:43 +00:00
169cf3558d * changes in campaign handling 2013-02-06 19:48:09 +00:00
3958364884 * a bit more work on campaigns; hero crossover still buggy 2013-02-06 10:16:44 +00:00
60c18f1bb8 More fixes for campaigns. 2013-02-05 21:19:08 +00:00
f8d7473f9a * fixed vector<bool> serialization
* fixed issue with loading castle event
2013-02-05 14:32:59 +00:00
a9d458c8f4 few more refactorings 2013-02-04 21:58:42 +00:00
25663ce7af * fixed vector<bool> serialization
* refactoring
2013-02-04 19:43:16 +00:00
d264f17b76 [refactor] separate h3m reader from rest of mapservice 2013-02-04 10:29:59 +00:00
8769f67c5d * JsonReader can convert to enums
* refactoring
2013-02-03 21:05:44 +00:00
b376ac8568 refactor map loading, few small tweaks 2013-02-02 17:20:31 +00:00
c4e03ef0de * enum serialization/deserialization (si32 as basetype ought to be enough for anybody)
* some fields in classes refactored to use appropriate enums (not yet finished)
2013-02-01 22:04:25 +00:00
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
080e037c54 - fix for starting towns (#1180)
- fix for creature window (#1184)
2013-01-23 22:09:58 +00:00
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
68e91ada1c [refactor]
* spells are now more configurable (unused yet, WiP)
* a few more cleanups
2013-01-15 14:20:48 +00:00
264ce77ec9 [refactor] a few more cleanups 2013-01-13 12:40:24 +00:00
6d0221c0e7 - Compile fixes 2013-01-08 18:32:47 +00:00
0311e5e6f5 - Added basic mock/test generation - Added stub for terrain editing 2013-01-06 19:30:12 +00:00
4bc2fd5519 [c::b] renamed map subfolder to workaround dependency tracking bug 2013-01-03 12:19:20 +00:00