AlexVinS
5fa5ba622f
Start preparation for moveHero threaded implementation
2014-06-18 14:31:11 +04:00
DjWarmonger
637f4894bc
Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG
2014-06-18 10:31:41 +02:00
DjWarmonger
d3134a1290
Add free tiles around unguarded objects.
2014-06-18 10:31:08 +02:00
DjWarmonger
f84e25fa78
Somewhat better algorithm for paths, helps balance object distribution.
2014-06-18 09:57:36 +02:00
AlexVinS
c2dd696e96
simplify CGuiHandler::handleEvents()
...
Threre is no need to allow (and I doubt is was in fact possible with old code) new events to arrive during processing events. Let them to be processed in next frame.
2014-06-18 08:30:23 +04:00
Ivan Savenko
0a71e89f58
Created large number of missing objects in configs
...
Minor bugfixes in code
2014-06-17 14:57:47 +03:00
Ivan Savenko
09d595e385
- Implemented "mapObject" entry for hero classes
...
- Updated schemas
- Some bugfixing
2014-06-16 19:27:26 +03:00
AlexVinS
5fdc63ab5b
tiny fixes
2014-06-16 14:32:37 +04:00
Ivan Savenko
89b89ff85d
Bugfixing. Game seems to be working without major bugs.
2014-06-15 23:25:10 +03:00
DjWarmonger
60df94a3f5
Placing towns according to template.
2014-06-15 21:23:53 +02:00
DjWarmonger
91336b346a
Placing towns according to template.
2014-06-15 21:23:32 +02:00
DjWarmonger
8e66b7168a
Corrected paths & guard for large objects.
2014-06-15 19:56:58 +02:00
Ivan Savenko
836c466f81
- Implementation of overrides for towns
...
- Converted dwellings.json into new format
- Implemented "mapObject" entry in town format
- Removed capital/fort/village fields from town in favor of overrides
2014-06-15 19:43:01 +03:00
DjWarmonger
e56f41b8be
Fixed monster strength selection.
2014-06-15 12:00:34 +02:00
DjWarmonger
01355a77d8
Added "monster strength" info to templates.
2014-06-15 11:08:06 +02:00
DjWarmonger
5c431da0f9
Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
2014-06-15 10:01:18 +02:00
DjWarmonger
890f29fa7e
Improved guard placement for large objects.
2014-06-15 09:39:30 +02:00
DjWarmonger
aa54803c50
Refactoring, clearing logs.
2014-06-15 08:48:46 +02:00
DjWarmonger
79da7b92ce
Templates now contain info about mines.
2014-06-14 20:05:19 +02:00
Ivan Savenko
7cfd9a0903
First part of implementation of some type-specific handlers.
...
TODO:
- merge dwellings.json into object configs
- proper implementation of overrides for towns
- fully connect new API to RMG/H3M
2014-06-14 18:42:13 +03:00
DjWarmonger
93b44de63c
Handling "terrain type" and "match terrain to town" options.
2014-06-14 17:14:59 +02:00
Ivan Savenko
216ce3f588
Merge pull request #18 from Haryaalcar/develop
...
Fix for "0001766: Disassembling artifacts in hero and hero meeting screen doesn't work."
2014-06-14 17:50:38 +03:00
Haryaalcar
fee9f0c1a0
"0001766: Disassembling artifacts in hero and hero meeting screen doesn't work." fix
2014-06-14 16:52:30 +03:00
DjWarmonger
6cbcfbf0a9
Sealed-off treasure piles will be discarded and filled with obstacles.
2014-06-13 12:04:17 +02:00
DjWarmonger
edd46d87c1
Treasure pile entrance/guard will always be aimed at the center of the zone.
2014-06-13 08:00:26 +02:00
AlexVinS
c7390316b7
small cleanup
2014-06-13 07:55:50 +04:00
AlexVinS
d707e55472
restore inGuiThread flag
2014-06-13 07:55:50 +04:00
AlexVinS
41a0319985
remove separate GUI thread
...
+ this fixes OGL
- has some issues(f.e. hero movement)
2014-06-13 07:55:49 +04:00
AlexVinS
0bf7d2b84c
fix server project configure
2014-06-13 07:55:49 +04:00
AlexVinS
15fe37133c
Fix compilation with SDL1
...
+ seems to be fully backward compatible (need more testing)
2014-06-13 07:55:48 +04:00
AlexVinS
56c74bc46a
+More build target to support both SDL1 and SDL2 builds
2014-06-13 07:55:48 +04:00
AlexVinS
bbd0312b45
Tweak configuration
2014-06-13 07:55:47 +04:00
Ivan Savenko
c424677736
- Hotfix: overlay was a pointer
2014-06-13 07:55:47 +04:00
Ivan Savenko
6205d07223
Re-enabled video player, should now work with SDL 2
2014-06-13 07:55:46 +04:00
AlexVinS
47979d28bb
Remove broken assertion
...
* this restores music support
2014-06-13 07:55:46 +04:00
Ivan Savenko
8eb661461c
- vcmi compiles with SDL2 on Linux, video player is disabled for now
2014-06-13 07:55:45 +04:00
AlexVinS
3db7fb4f63
Still try to fix opengl backend
...
- no success
+ make backend selection configurable
2014-06-13 07:55:45 +04:00
AlexVinS
d289c6a34a
Prefere opengl rendering
...
- broken ...
2014-06-13 07:55:44 +04:00
AlexVinS
5bb3d859eb
Nice fullscreen mode++
2014-06-13 07:55:44 +04:00
AlexVinS
04aa76b842
Fix arrow keys moving on adventure map
2014-06-13 07:55:43 +04:00
AlexVinS
6474e37b76
try to fix hotkeys
2014-06-13 07:55:43 +04:00
AlexVinS
ac2896da42
Implemented SDL2 unicode input. Hotkeys are sill broken.
2014-06-13 07:55:42 +04:00
AlexVinS
d50976bf4a
restore some SDL1 code in CMT.XXX
2014-06-13 07:55:41 +04:00
AlexVinS
0ef16feca9
Refactoring towards backward compatibility (WiP)
2014-06-13 07:55:41 +04:00
AlexVinS
1597254399
just a few tweaks and it works!
...
* enable video again
* set default bpp to 32 - SDL2 dont like 24 bit resolution
* now almost everything looks as expected (some issues are present though)
2014-06-13 07:55:40 +04:00
AlexVinS
6890c2650b
fix keyboard state access
...
* is somewhat playable already!
2014-06-13 07:55:40 +04:00
AlexVinS
cd81e85a61
fix loading to pregame. Looks awful. More work to do.
...
* video temprorary disabled
* multithread loading seems to be broken - disabled
2014-06-13 07:55:39 +04:00
AlexVinS
e072b2664f
fix pixel format
...
* now it shows intro video (but then crash ...)
2014-06-13 07:55:39 +04:00
AlexVinS
62d42465de
fix compilation
...
* may not even run
* text input disabled
2014-06-13 07:55:38 +04:00
AlexVinS
796905ec42
change VCMI_client.cbp to new externals layout
...
* it will not compile of course
2014-06-13 07:55:38 +04:00