AlexVinS
|
76c3228afa
|
Merge branch 'develop' into FFMpeg
Conflicts:
client/CVideoHandler.cpp
|
2014-07-26 07:54:43 +04:00 |
|
DjWarmonger
|
8f946e4add
|
Denser and bigger obstacles.
|
2014-07-25 18:52:24 +02:00 |
|
DjWarmonger
|
a9ddeb665b
|
Place large obstacles first.
|
2014-07-25 17:55:48 +02:00 |
|
DjWarmonger
|
67d8a24f0b
|
Experiments with object distance.
|
2014-07-25 17:10:16 +02:00 |
|
DjWarmonger
|
1dd88d394f
|
All required objects will now constitute main paths of zone (again), which should improve their shape.
|
2014-07-25 16:26:50 +02:00 |
|
DjWarmonger
|
e65b85873c
|
Added prisons. hero experience is set to zero due to problem with leveling http://bugs.vcmi.eu/view.php?id=1804
|
2014-07-25 10:44:17 +02:00 |
|
DjWarmonger
|
c119ddf5ee
|
Reduced usage of TerrainViewPattern constructor for faster map generation.
|
2014-07-24 20:36:52 +02:00 |
|
DjWarmonger
|
156e19cdf6
|
Various optimizations based on RMG profiling.
|
2014-07-24 19:16:49 +02:00 |
|
DjWarmonger
|
21386081bf
|
Fixed formula for dwellings value.
|
2014-07-24 12:26:10 +02:00 |
|
DjWarmonger
|
4b28afcaa4
|
Fixed counting of faction-aligned zones.
|
2014-07-23 19:17:07 +02:00 |
|
DjWarmonger
|
9644314c8a
|
Removed map limit cap for objects that probably don't need them and came from H3 engine limitations.
|
2014-07-23 18:18:06 +02:00 |
|
DjWarmonger
|
1cabc8f7f4
|
- Implemented map object limit which should also distribute the objects evenly
- Fixed Magic Well limit of 1 per zone
|
2014-07-23 18:02:17 +02:00 |
|
DjWarmonger
|
8471d32334
|
Fixed not free tiles in front of required objects.
|
2014-07-23 11:42:05 +02:00 |
|
DjWarmonger
|
a842068d54
|
Merge pull request #30 from vcmi/RMG
Since there are no objections, I finally merge this branch.
|
2014-07-23 08:06:51 +01:00 |
|
Ilya Zhuravlev
|
6812ec6b7e
|
Updated .gitignore
|
2014-07-20 14:26:26 +04:00 |
|
DjWarmonger
|
eb0ea86ccb
|
Fix for Travis.
|
2014-07-18 07:40:27 +02:00 |
|
Ivan Savenko
|
4fca583062
|
Merge pull request #29 from Mixaill/nsis
CMake: add NSIS generator settings
|
2014-07-18 00:56:46 +03:00 |
|
Michael Pavlyshko
|
a6e590f220
|
cpack/nsis: do not strip files
|
2014-07-17 23:11:09 +03:00 |
|
Ivan Savenko
|
6073a08d1c
|
Merge pull request #31 from NikolayIT/develop
Added optimization flag (-O1) for the GCC compiler on Windows platform to prevent "CGameState.cpp.obj: too many sections" compile error
|
2014-07-16 13:57:33 +03:00 |
|
NikolayIT
|
3d3713ae7f
|
Added optimization flag (-O1) for the GCC compiler on Windows platform to prevent "CGameState.cpp.obj: too many sections" compile error
|
2014-07-16 11:37:57 +03:00 |
|
DjWarmonger
|
0763b9a758
|
- Implemented object per zone limit
- Various tweaks for Travis & repo
|
2014-07-15 22:33:51 +02:00 |
|
DjWarmonger
|
090abf41e8
|
Fixed sealing off parts of zones.
|
2014-07-15 19:52:58 +02:00 |
|
DjWarmonger
|
128b63a285
|
Fixed tiles around unguarded objects -> denser zones, less misplaced guards.
|
2014-07-15 19:10:03 +02:00 |
|
DjWarmonger
|
e8580229dc
|
RMG will now actually use all the settings from pregame. Till now it did not.
|
2014-07-15 16:44:07 +02:00 |
|
DjWarmonger
|
ca7fe822eb
|
Removed treacherous randomized constructor.
|
2014-07-15 15:41:53 +02:00 |
|
DjWarmonger
|
be8c9c8378
|
Correct strength of zone guards. Logs for guard strength.
|
2014-07-15 14:38:05 +02:00 |
|
DjWarmonger
|
173111955e
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
|
2014-07-15 12:27:59 +02:00 |
|
DjWarmonger
|
89c97a88bb
|
Updated Visual projects for SDL2.
|
2014-07-15 12:26:18 +02:00 |
|
DjWarmonger
|
3a19bf964a
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
|
2014-07-15 11:50:50 +02:00 |
|
DjWarmonger
|
90dcad2db7
|
Fix typo
|
2014-07-15 11:17:10 +02:00 |
|
Ivan Savenko
|
731aedf3a1
|
Split CIntObjectClasses into multiple smaller files. This should be the last change in files
|
2014-07-15 10:14:49 +03:00 |
|
Ivan Savenko
|
9f5704f8ba
|
Uploaded recreated stack queue backgrounds
|
2014-07-14 22:38:13 +03:00 |
|
Ivan Savenko
|
52da593292
|
New resolution selection button
|
2014-07-14 21:49:52 +03:00 |
|
Ivan Savenko
|
5111bff6cc
|
Implemented new button for commander window
|
2014-07-14 20:43:38 +03:00 |
|
Ivan Savenko
|
7f790f9d6a
|
Quest window now uses new background, using same gfx sources as creature window
|
2014-07-14 18:07:57 +03:00 |
|
Ivan Savenko
|
a69fcdd435
|
Fixed compilation issues caused by merge
|
2014-07-14 17:44:15 +03:00 |
|
Ivan Savenko
|
92d22bae63
|
Merge branch 'feature/creatureWindow' into refactoring/guiClasses
|
2014-07-14 17:23:24 +03:00 |
|
Ivan Savenko
|
2a0a0e81a7
|
Cleaning up includes
|
2014-07-14 17:19:44 +03:00 |
|
Ivan Savenko
|
68678f7d5a
|
Added own e-mail for Travis notifications
|
2014-07-14 17:01:44 +03:00 |
|
Ivan Savenko
|
2894f53a68
|
Merge pull request #28 from Mixaill/travis-2
Travis support
|
2014-07-14 17:00:19 +03:00 |
|
Michael Pavlyshko
|
88316f93d1
|
add NSIS generator settings
|
2014-07-14 01:23:57 +03:00 |
|
Michael Pavlyshko
|
6a23960642
|
CMake/WIN32 : add icon to client and launcher
|
2014-07-14 01:02:00 +03:00 |
|
Ivan Savenko
|
647b9c683f
|
Reorganized client source tree:
- client/widgets for reusable GUI elements
- client/windows for independent windows
- client/gui for base GUI classes which should remain internal
|
2014-07-13 20:53:37 +03:00 |
|
Ivan Savenko
|
cec9161f8f
|
Added missing files
|
2014-07-13 18:40:13 +03:00 |
|
Ivan Savenko
|
83099fdb78
|
Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree
|
2014-07-13 18:39:45 +03:00 |
|
Michael Pavlyshko
|
69ca17d985
|
Disable Clang 3.1.
|
2014-07-13 18:14:14 +03:00 |
|
Ivan Savenko
|
55ff933b7f
|
Reducing size of GUI classes. Split trade windows into a separate file
|
2014-07-13 16:31:00 +03:00 |
|
Ivan Savenko
|
09bedf9aa9
|
Reducing size of GUIClasses. Moved Garrison Int into a separate file.
|
2014-07-13 16:11:25 +03:00 |
|
Ivan Savenko
|
7e76a5dd0e
|
Moved some code from GUIClasses into two smaller files:
- CArtifactHolder.*
- CComponent.*
Goal: reorganize artifacts UI to decrease dependency on CGHeroInstance class
|
2014-07-13 14:56:30 +03:00 |
|
Michael Pavlyshko
|
5f04c596b1
|
trying to update Qt
|
2014-07-13 14:08:16 +03:00 |
|