games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity
4,176 Commits 21 Branches 65 Tags 121 MiB
958839668c
Commit Graph

1793 Commits

Author SHA1 Message Date
AlexVinS
3b8d0e44d4 Merge branch 'develop' into SDL2 2014-06-24 14:09:44 +04:00
DjWarmonger
79036484dd Trying to sort out project changes and compile issues. 2014-06-23 19:58:19 +02:00
Ivan Savenko
47639832b1 Probably fixed bug with map border rendering in rectangular maps 2014-06-23 20:47:09 +03:00
DjWarmonger
3ac306f501 Merge pull request #19 from vcmi/feature/mapObjects 
Feature/map objects
 2014-06-22 14:49:42 +02:00
AlexVinS
2ec8c31558 Partial fix for hero flag rendering 
(-) blue & teal heroes are still gitchy. IDN why ...
 2014-06-21 14:54:41 +04:00
AlexVinS
ac7703ffb0 Fix hero movement rendering 2014-06-21 12:13:19 +04:00
AlexVinS
8cc5363882 fix warning, cleanup 2014-06-21 11:35:08 +04:00
AlexVinS
13bd4ddcb2 Now movement can be canceled 
(-) rendering still missing
 2014-06-21 10:49:27 +04:00
AlexVinS
5fa5ba622f Start preparation for moveHero threaded implementation 2014-06-18 14:31:11 +04: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
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
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
5c431da0f9 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-15 10:01:18 +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
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
Haryaalcar
11955605b5 sorting by filename implemented for save and load screens 2014-06-11 00:03:08 +03:00
Ivan Savenko
44742814cd More cleanup: 
- moved SoundBase.h to lib since it contains shared data
- added RMG info to object format. Note that data is not yet imported in
configs
- slightly updated API of object handlers
 2014-06-05 23:51:24 +03:00
Ivan Savenko
b2e8c92383 Cleanup: 
- removed commented-out #includ'es
- renamed some files to match name of class
 2014-06-05 20:26:50 +03:00
Ivan Savenko
652ceb2bde Finally shattered CObjectHandler.cpp into tiny bits 
- This file is now split into multiple smaller files in mapObjects
directory
- CObjectHandler itself now contains only core classes (Handler itself,
CGObject and interfaces)
- Cleaned up excessive #include's through whole project
 2014-06-05 19:52:14 +03:00
Ivan Savenko
0afdfa529c Moved all object-related files to lib/mapObjects directory. 
Renamed some classes to more readable names
 2014-06-05 14:19:47 +03:00
DjWarmonger
62e9f13b08 - Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426 
- Some primitive way to randomize treasures
 2014-06-04 10:16:08 +02:00
Ivan Savenko
32b6568b65 Merged changes from upstream and fixed compilation caused by API changes 2014-06-03 22:45:18 +03:00
beegee1
a87363c0f1 - fixed mantis #783 - play sound when entering message in chat box 2014-06-01 18:48:40 +02:00
Ivan Savenko
1d17d60449 gcc update: 
- removed support for 4.6
- compilation fixes for 4.7
 2014-05-29 13:42:05 +03:00
karol57
dd33fd51a8 int3 dist2d microoptimization 2014-05-25 20:42:25 +02:00
Ivan Savenko
7f276185bd Moving files: 
- new config for objects (config/objects/generic.json)
- renamed lib/CDefObjectHandler to lib/CObjectClassesHandler
 2014-05-24 02:07:54 +03:00
Ivan Savenko
6bd6be0835 Object class handler is now a proper "handler" 
- Some changes in interfaces
- Fixed some missing fields in serialization
- Moved object names to new handler
 2014-05-24 01:56:51 +03:00
AlexVinS
8a3b997fa5 fix a few comments. No code changes. 2014-05-21 13:02:20 +04:00
DjWarmonger
1ea6723a32 Merge pull request #8 from xyzz/android-rolling 
Android port.
 2014-05-17 05:17:54 +02:00
Ivan Savenko
b5160acbac Finalization of object type handler interface 
- updated code to use new interface
- removed old DefObjHandler (todo - rename file)

Summary:
- most code but loading is now in place
- type names may deserve improvements (some of them are too similar)
- still barely compiles and not tested
 2014-05-16 23:50:02 +03:00
Ilya Zhuravlev
db7cd79cf7 Android port. 
Conflicts:
	lib/vcmi_endian.h
 2014-05-16 23:24:29 +04:00
beegee1
80765eb0a3 - fixed clang compiler warnings (detects now unused constant vars) 2014-05-16 19:22:21 +02:00
DjWarmonger
1dbc0c7177 Compilation fix. This will be released as VCMI 0.95b. 2014-05-02 12:19:50 +02:00
DjWarmonger
fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup 
Conflicts:
	client/CKingdomInterface.cpp
 2014-05-02 12:03:02 +02:00
Macron1Robot
9976fcc671 Update GUIClasses.cpp 
spaces change
 2014-04-29 22:25:30 +04:00
Macron1Robot
fd1640f931 Update GUIClasses.cpp 
Removed excessive check for tavernVideo string
 2014-04-29 13:06:55 +04:00
DjWarmonger
4a71442c80 Missing changes. 2014-04-27 14:38:20 +02:00
DjWarmonger
f418b468c4 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-04-27 12:49:29 +02:00
Macron1Robot
8ec7a9b919 Moved "max heroes on map per player", "max heroes available for player" to "defaultMods.json" 2014-04-27 10:43:46 +04:00
Macron1Robot
907caedb13 Added "produce" section in "building" structure. Changed dailyIncome. 2014-04-26 18:23:35 +04:00
Michał Janiszewski
bece1e5b1f fixed possible nullptr dereference 
* Fixed a switch() statement in InfoBoxHeroData::getValueText that
  could result in nullptr dereference. If 'type' was HERO_MANA and
  'hero' was nullptr, a fallthrough would occur to HERO_EXPERIENCE,
  where 'hero' would we be dereferenced.
* Fixed line endings.
 2014-04-25 14:31:11 +02:00
Macron1Robot
9123c7a787 Fix for map tavern (video set to standard) 2014-04-25 01:06:14 +04:00
Macron1Robot
b7b890acff Added "tavernVideo","guildBackground" to "faction" JSON config and schema. If "primaryResource" is set to "gold", silo will generate 500 gold per day 2014-04-24 23:36:18 +04:00
DjWarmonger
9e7013de77 Backup for my own MVS project configuration 2014-04-24 21:07:43 +02:00
beegee1
1d57b75bc5 - random number generation refactoring 
- fixed mantis #1743
 2014-04-10 19:22:32 +02:00
Ivan Savenko
43ba3d30ea Breaking things - first commit towards configurable object(s). 
- New files: lib/CObjectWithReward.h/cpp
- Classes that will be replaced by configurable object are now in this
fil

Status: far from functional, currently at "it compiles" point, some
essential pieces are still missing.
 2014-04-06 23:14:26 +03:00
DjWarmonger
30b79588db - Moved gameState::guardingCreaturePosition() to CMap so it doesn't need to be recalculated many times for every player. 
- Some optimizations with local cb pinter in VCAI.
 2014-04-01 11:53:28 +00:00
Ivan Savenko
771c1ce255 - some effords to get rid of bottlenecks in AI code 
- fixes, probably partially #1577
- enabled code for reading map object templates from json, still not
used
- disabled PCH for launcher due to speed issues.
 2014-03-23 16:36:16 +00:00
Ivan Savenko
9c0df68cb8 Fixing spelling mistakes. Patch from josch, fixes #1759 2014-03-23 12:59:03 +00:00
Ivan Savenko
760ae7d44a Changes related to Debian packaging, based on josch patch 
- AUTHORS file is now in UTF-8
- tags for desktop files
- fixed some typos
- better reaction on --help and --version commands
- vcmibuilder should work with both avconf and ffmpeg
 2014-03-20 18:17:40 +00:00
beegee1
fe1b16a7ec Some preparation towards mantis #1743: 
- refactored CRandomGenerator (added util methods, improved method names)
- usages of std::minstd_ran are replaced by CRandomGenerator (not in entire code base, C rand() usages are still not replaced)
- refactored getArtSync method of CArtHandler -> now named pickRandomArtifact
- fixed some compiler warnings
- updated source code URL in VCMI spec
 2014-03-17 19:51:07 +00:00
alexvins
9cac0af7be [Spells] More spell related refactoring 
+ smart target modifier
- CREATURE_EXPERT_MASSIVE target type
* save format changed

spell format changes already documented in http://wiki.vcmi.eu/index.php?title=Spell_Format
 2014-03-17 13:11:10 +00:00
alexvins
065b8366fb [Spells] Added basic support for icons and sounds 
* few changes in spell format
* save format changed
 2014-03-10 16:00:58 +00:00
Ivan Savenko
d2ae847ecf - files in local directories (saves & configs) now always have higher 
priority than mods. Fixes #1685 and #1733
- fixed possible crash on exit in dispose() function
- (vcmibuilder) fixes problem with partial mp3 -> ogg conversion
 2014-03-08 16:05:23 +00:00
alexvins
4203d69525 Part 2 of new spell configuration 
1) spell handler refactored to support modding in general way
2) imunnity icons moved to WoG as they depends on wog`s graphics
3) introduced new class template for handlers (todo: use this in other handlers)
4) save format changed
5) introduced "absolute immunity" - unaffected by "the Orb" etc. (todo: use it in config)
6) new format documented on wiki, added json schema.

* more split of registertypes - fixes 32 mingw build
 2014-03-07 13:21:09 +00:00
Ivan Savenko
5cbec833c2 - (linux) XDG filesystem support 
BIG NOTE TO LINUX USERS
All user data has been moved according to XDG specs:
- Game data (H3 files and mods) and saves: from ~/.vcmi to ~/.local/
- Temporary files, including logs: from ~/.vcmi to ~/.cache/vcmi
- Config files: from ~/.vcmi/config to ~/.config/vcmi

For compatibility VCMI will read game data from ~/.vcmi as well but this
is temporary behavior and will be removed
 2014-03-04 14:51:10 +00:00
stopiccot
7356145c3a updated LD_RUNPATH_SEARCH_PATHS 2014-03-04 03:51:17 +00:00
Michał W. Urbańczyk
2c52617c1d Fixed video flickering in the campaign intro screen. 2014-03-01 18:50:50 +00:00
Michał W. Urbańczyk
f6c2c96cdc Copyright update. 2014-03-01 18:46:54 +00:00
Michał W. Urbańczyk
03fbd4e8a7 Fixed tracking autosaves. 2014-03-01 17:35:56 +00:00
Michał W. Urbańczyk
a6f68d6870 Fixed #1726. 2014-03-01 13:42:23 +00:00
DjWarmonger
b8b809bd50 Fixed #1667, #1669 2014-02-28 17:49:56 +00:00
Michał W. Urbańczyk
93856dbe98 Quick solution for #1688. 2014-02-27 20:44:20 +00:00
Ivan Savenko
e101caa997 Fixed possible buffer overflow on visiting tavern 
Introduction of unicode made fixed-length buffers too short in some
cases
 2014-02-26 21:20:36 +00:00
Ivan Savenko
78609871ae bugfixing: 
- fixed parsing of campaign bonuses (conversion to building ID)
- CONTROL event condition can be also fulfilled by allies
- fix for crash on opening exchange window in Russian version
 2014-02-26 17:32:42 +00:00
Ivan Savenko
8d36bcabce Split registerTypes into multiple files, now in lib/registerTypes 
directory in order to reduce huge memory usage by gcc
 2014-02-24 19:57:33 +00:00
Michał W. Urbańczyk
1e555a8ee3 Improved serializer. See: http://forum.vcmi.eu/viewtopic.php?p=11562#11562 
Save format changed, removed compatibility workarounds.
 2014-02-19 01:04:27 +00:00
alexvins
d01b84b460 [mechanics] fix copy-paste errors in magic skill arrays 
[c::b] few tweaks to configuration
 2014-02-15 09:40:33 +00:00
Ivan Savenko
48d6e2cd59 - move campaigns description into new config file, campaignSets.json 
- campaigns parser uses binary reader, fixes #1711
- fixed description of change resolution button
 2014-02-14 22:46:06 +00:00
Ivan Savenko
e6f433795b - fixed some crashes on staring a map/campaign 2014-02-08 21:05:24 +00:00
Ivan Savenko
562dc02b3b - fixed crash on decompressing some files from gzip stream (reported on 
forums)
 2014-02-08 10:30:10 +00:00
beegee1
95034b9fa0 - Updated PCH to use our StdInc.h as the prefix header (not generated one from cotire) -> no exclude headers from ffmpeg/etc... statements required 
- Fixed compilation error (VCAI ResourceSet logging)
 2014-02-05 20:25:36 +00:00
Michał W. Urbańczyk
55271e621b Possibility to switch autoskip in the runtime. 2014-02-02 14:39:32 +00:00
Michał W. Urbańczyk
55165a8535 Fixed #1686. Compatibility measures to be removed later, when format changes become to big. 2014-02-02 14:31:56 +00:00
Ivan Savenko
14535c1c7b - fixed crash on finishing a campaign. 2014-02-01 14:32:09 +00:00
beegee1
df0a28d9cb - added PCH compilation for CMake using cotire module (PCH is OFF per default, can be enabled with ENABLE_PCH=ON) 2014-02-01 13:37:26 +00:00