1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

16974 Commits

Author SHA1 Message Date
Michał W. Urbańczyk
a78311f63d Reintagrating netcode branch to the trunk. 2008-08-06 12:27:56 +00:00
Michał W. Urbańczyk
d8eb861117 Battles:
* showing ranges
* improvements in moving
* workaround for neutrals
2008-08-05 23:33:08 +00:00
Michał W. Urbańczyk
c7bb04235c * merged changes in pregame
* portrait initialziaton
* minor
2008-08-05 22:11:32 +00:00
Michał W. Urbańczyk
1acf6e930b * slider position updated after sorting in pregame
* proper initialization of portrait in CGHeroInstance
2008-08-05 21:28:13 +00:00
Michał W. Urbańczyk
b779b6c6ef Changes in CPreGame
* replaced tamplates callbacks with boost-function
* updates settings when selecting new map after changing sorting criteria
* if sorting not by name, name will be used as a secondary criteria
* when filter is applied a first available map is selected automatically
2008-08-05 13:56:16 +00:00
Vadim Glazunov
ba59b28be8 Now MSVC and gcc must be happy :) 2008-08-04 23:19:19 +00:00
Michał W. Urbańczyk
a5354271e2 * improvements in battle support - moving creatures work though there are small graphic glitches
* @neweagle - I've replaced in VCMI_Lib.h your #ifndef with #ifdef since you modification affected (and broke) compilation only on MSVC. Is it ok now?
2008-08-04 23:04:15 +00:00
Vadim Glazunov
1bd3a677fe Little changes to fix broken gcc compilation, hope MSVC still compile 2008-08-04 20:27:47 +00:00
Michał W. Urbańczyk
a15ffb06e6 * compiles under MSVC (haven't I broken anything on gcc?)
* half-done support for battles
2008-08-04 15:56:36 +00:00
Vadim Glazunov
038dd90517 Autoconf/automake scripts to easy building. 2008-08-04 09:33:08 +00:00
Vadim Glazunov
6e737bbf3c Now netcode branch may be compiled with gcc. Sorry can't check build with MSVC 2008-08-04 09:05:52 +00:00
Michał W. Urbańczyk
f203058270 Reverted to r515.
Prosze nie eksperymentowac z tym repozytorium. Jak nie mozesz zapanowac nad swoim programem, to pocwicz na jakims innym...
2008-08-03 16:12:14 +00:00
majaczek
038e13ad8e 2008-08-03 15:56:37 +00:00
majaczek
3f5b339fc5 ratunku... :/
tak czy siak lua/src jest wykorzystywane w include
:( nie umiem zmusić mojego programu svn do współpracy, zwłaszcz z VC
2008-08-03 15:52:12 +00:00
majaczek
1932dae1d9 2008-08-03 15:46:09 +00:00
majaczek
0e2963dc79 2008-08-03 15:43:46 +00:00
majaczek
cc45909e9a 2008-08-03 15:40:45 +00:00
mateuszb
c8a6fc9cba reverted changes in r516 (what are those files for?) 2008-08-03 14:32:31 +00:00
majaczek
a7c91399c5 2008-08-03 13:45:14 +00:00
mateuszb
5ec934d6be * resolved #69 2008-08-03 13:39:34 +00:00
Michał W. Urbańczyk
cc7be20b07 Merged most of the changes from trunk.
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
2008-08-02 15:08:03 +00:00
mateuszb
e1b4331ee2 * resolved #62 and #66 2008-08-02 10:26:56 +00:00
Michał W. Urbańczyk
dc82232e70 Hover text for heroes. 2008-08-02 10:25:58 +00:00
Michał W. Urbańczyk
1f4b4364df Dismissing heroes / minor. 2008-08-01 21:41:38 +00:00
Michał W. Urbańczyk
bfad10a8e4 * added fast graphical cursor :)
* building structures should work
2008-08-01 18:13:33 +00:00
mateuszb
7aeadd5a06 * removed bug causing significant increase of CPU consumption
* slightly optimized showing of battle interface
* animation of getting hit / death by shooting is displayed when it should be
2008-08-01 14:39:29 +00:00
Michał W. Urbańczyk
e5a064f36b Improved threa-safety, almost finished building structures in towns. 2008-08-01 11:21:15 +00:00
mateuszb
86f0af12ae * resolved #59 2008-07-31 14:38:05 +00:00
Michał W. Urbańczyk
5c5c80933b Made CreatureSet serializable and using creature id. Stack moving, swapping, merging, splitting. 2008-07-31 13:21:42 +00:00
mateuszb
016e766fbb * next part of shooting in battles (there will be more of them)
* now compiles under MSVC
* small refactoring / cleaning / fixing / etc.
2008-07-31 12:59:42 +00:00
Michał W. Urbańczyk
28d5c184a9 Mines and object visitable once per week working. 2008-07-31 10:35:22 +00:00
Michał W. Urbańczyk
03287540c7 Further code for objects (mines) - not finished. 2008-07-30 21:27:15 +00:00
Michał W. Urbańczyk
b4f383f196 Slowly recovering object scripts. 2008-07-30 17:51:19 +00:00
Michał W. Urbańczyk
add34b26ed Further refactoring: merged terrain and undergroundTerrain in Mapa. 2008-07-29 19:10:28 +00:00
Michał W. Urbańczyk
08b6796545 Mainly refactoring 2008-07-29 09:53:27 +00:00
Michał W. Urbańczyk
3247a9a4dd Rewrote hero moving code. Seems to be working. 2008-07-28 12:44:08 +00:00
Michał W. Urbańczyk
001868652a Two minor fixes 2008-07-27 20:00:41 +00:00
Michał W. Urbańczyk
62b0365e70 Improvements for netcode. AI is working. Townlist won't crash. Moving hero is wrong but won't crash. Giving starting hero is working properly. Town defs are wrong but displayed. 2008-07-27 17:07:37 +00:00
Michał W. Urbańczyk
b3c5f19c0d Proper initialization of the first turn. 2008-07-26 13:57:32 +00:00
Michał W. Urbańczyk
88c9d8d72d Forgot to add this file 2008-07-26 06:42:12 +00:00
Michał W. Urbańczyk
b72d065265 Minor changes/cleanups. Adventure map is shown :) 2008-07-26 06:39:44 +00:00
Michał W. Urbańczyk
0c139e72f5 More changes for netcode/serialization
Removed not needed stuff
2008-07-25 17:28:28 +00:00
Vadim Glazunov
8209e7d090 Added new files from previous commit 2008-07-20 10:36:52 +00:00
Vadim Glazunov
8b53778417 Very little changes to compile under linux and other unix-like OS. Added autoconf/automake scripts to easy compile on all unix-like OS(try autoconf; automake --add-missing;./configure) 2008-07-20 10:32:36 +00:00
Andrea Palmate
e0755aa7b3 Standard GCC Makefile for AmigaOS4 (Linux/Macosx) 2008-07-17 07:20:56 +00:00
Michał W. Urbańczyk
d371f14ad2 More endianess checking / minor 2008-07-16 22:40:16 +00:00
Michał W. Urbańczyk
6f7b29afcc GCC/AmigaOS compatibility changes by Andrea Palmaté. 2008-07-16 18:26:15 +00:00
mateuszb
4bd39202c2 * first part shooting in battles (units cannot shoot yet)
* minor improvements
2008-07-11 09:43:13 +00:00
Michał W. Urbańczyk
358ab062eb Base for netcode 2008-07-09 17:22:28 +00:00
Michał W. Urbańczyk
c983adecc0 Compiles now 2008-07-03 16:23:11 +00:00