games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
4,050 Commits 30 Branches 75 Tags
a96cd51c5a1c82fe02bf396bb89aff7955351a32
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexVinS ec7e58786d Merge branch 'SDL2' into develop 2014-07-06 21:34:04 +04:00
Alexander Shishkin b761645a50 Merge pull request #24 from Mixaill/cmake 
CMake/SDL2: add ability to find SDL2 without pkg-config
 2014-07-06 21:32:06 +04:00
AlexVinS 0edd10078f Fix usage of fillRect. 
* proper fix for slider drawing
 2014-07-05 01:52:11 +04:00
AlexVinS e70e68a56b Fix puzzle map fade. 2014-07-03 23:06:11 +04:00
AlexVinS 74d3effa98 More safe way of update locking 2014-07-03 22:30:56 +04:00
AlexVinS 9b8ad51cd3 Run all rendering with pim lock if possible 2014-07-03 22:05:59 +04:00
AlexVinS 30d6eab20b Do not render fully hidden tiles 2014-07-03 20:41:42 +04:00
AlexVinS 8a488aeb86 Cleanup 2014-07-03 19:57:21 +04:00
AlexVinS 57f82f2bed Add a comment. 2014-07-03 18:46:23 +04:00
AlexVinS f3067878dd Force full redraw for sliders. This fixes backgroung glitches with SDL2. 
(!) there should be better fix
 2014-07-03 18:44:25 +04:00
AlexVinS ecc7b8e05a Draw cursor on each frame. Fix TTF rendering under cursor. 2014-07-03 18:05:07 +04:00
AlexVinS e521e6687a centralize cursor drawing 2014-07-03 15:10:01 +04:00
AlexVinS 022f71c26e fix deletion in in-game console 2014-07-03 14:58:56 +04:00
AlexVinS 397f4cf8b6 Workaround for TFF font glitches under cursor in pregame 2014-07-03 14:10:15 +04:00
AlexVinS c948891fc6 Fix threaded handlers initialization, cleanup 2014-07-03 12:26:15 +04:00
AlexVinS dbb7526040 fix uninitialized flag 2014-07-02 23:53:49 +04:00
AlexVinS 5a029c88d1 cleanup 2014-07-02 23:53:23 +04:00
AlexVinS 9437bc52c1 Merge remote-tracking branch 'remotes/origin/develop' into SDL2 2014-07-02 22:42:10 +04:00
AlexVinS 3e4e810888 More ColorKey cleanup 2014-07-02 22:41:11 +04:00
AlexVinS 638dac90af centralize key color management 2014-07-02 22:20:54 +04:00
AlexVinS 082c9a506e Fix battle absolute obstactes rendering 2014-07-02 21:38:15 +04:00
AlexVinS 7b75b19d1a Fix hero flags rendering 2014-07-02 21:09:49 +04:00
AlexVinS 9606aed4a3 Using int3 for color is weird 2014-07-02 20:12:15 +04:00
AlexVinS e57dbbde15 Extract startTextInput & stopTextInput 
(*) these functions do nothing with SDL1 - this is by design - less ifdef`s
 2014-07-02 19:41:30 +04:00
AlexVinS 9797372dbe Implement Unicode support for ingame console 2014-07-02 19:16:05 +04:00
AlexVinS 195eae48ca Merge branch 'develop' into SDL2 
Conflicts:
	client/CPlayerInterface.cpp
 2014-07-02 17:15:12 +04:00
AlexVinS 50dfe05cd1 [C::B] Small projects fix 2014-06-30 11:19:55 +04:00
AlexVinS f63b1256d3 [ERM] Fix build 
* update project
 2014-06-27 12:12:45 +04:00
AlexVinS aea5a7ba75 add comment. no code changes. 2014-06-26 20:49:18 +04:00
AlexVinS c28b5f6633 fix mingw build 2014-06-26 20:41:27 +04:00
AlexVinS 4e4ba6654c fix Eye of magi, also fix #1608 
Conflicts:
	lib/CObjectHandler.cpp
 2014-06-24 18:20:28 +04:00
AlexVinS c7772aa5a4 Merge branch 'develop' into SDL2 
Conflicts:
	lib/NetPacks.h
	lib/NetPacksLib.cpp
 2014-06-24 18:19:57 +04:00
AlexVinS c7dc4c05b8 fix mingw build 
(?) does this brake *nix build?
 2014-06-24 18:17:25 +04:00
AlexVinS b371c7ef74 fix build 2014-06-24 15:23:37 +04:00
AlexVinS 3b8d0e44d4 Merge branch 'develop' into SDL2 2014-06-24 14:09:44 +04:00
AlexVinS 46d92f11cb Project update, fix build 
(!) register types as usual too huge
 2014-06-23 10:24:49 +04: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
AlexVinS 5fdc63ab5b tiny fixes 2014-06-16 14:32:37 +04: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
AlexVinS f212c8221d [RMG]Fix gcc build, remove some unused variables 2014-05-31 16:11:20 +04:00
AlexVinS c40c79fa94 Make gcc happy 2014-05-25 13:02:15 +04:00
AlexVinS 8a3b997fa5 fix a few comments. No code changes. 2014-05-21 13:02:20 +04:00
AlexVinS 6f65d2484b Extract battleStackIsImmune from battleIsImmune 
This fix possible problems with rising spells as now immunty is handled on stack level not on hex level
* battleIsImmune in now protected - only used in canCastThisSpellHere
 2014-05-19 13:44:38 +04:00
AlexVinS c22908651c Tweak Earth, Air elemantals immunities. Also fixes #1553 2014-05-19 12:04:49 +04:00
AlexVinS eff801f39a Extract "inherit node" function 2014-05-19 02:28:44 +04:00
AlexVinS e90fae9638 More simplification to spell configuration using inheritance semantic. 2014-05-18 21:16:10 +04:00
AlexVinS 2fc16b231f Implemented inheritance semantic for spell level configuration. 
This allows more simplification.
 2014-05-18 21:16:10 +04:00
AlexVinS b4e702a1d2 Simpify timed.json 
* also move Titan bolt to offensive spells
 2014-05-18 20:05:29 +04:00
AlexVinS dca047cb52 Simplify other.json 
* also fix CURE: expert cure is massive spell
 2014-05-18 19:19:54 +04:00
AlexVinS 3f32218dd8 Simplify offensive.json 2014-05-18 19:09:34 +04:00
AlexVinS aef5471f3a Simplify adventure.json 2014-05-18 19:05:44 +04:00
AlexVinS 93a440d201 simplify ability.json 2014-05-18 19:03:41 +04:00
AlexVinS f2b61f7e69 Spell configuration: introduce simplifaction mechanism for level conficuration 
* also aviable for other handlers
 2014-05-18 18:47:18 +04:00
AlexVinS 950ca1156a Use absoluteLimit 
* all "old" limits are now absolute
 2014-05-18 17:55:26 +04:00
AlexVinS 3209114393 Spell configuration. Introduce absoluteLimit. 
* limit will be made negatable.
* now limit and immunity will look more solid.
* unused ATM
 2014-05-18 17:22:02 +04:00
Alexander Shishkin 708958c1e9 Merge pull request #11 from alexvins/SpellsRefactoring 
Spells refactoring&tweaks
 2014-05-18 06:07:19 -07:00
AlexVinS ababd0d995 there can`t be resistance to rising spell (immunities are handled seperately) 2014-05-18 17:03:02 +04:00
AlexVinS afd74ff649 Remove more hardcoded immunity handling. 
* ANIMATE_DEAD already limited to UNDED
* make DEATH_STARE immunties absolute
 2014-05-18 17:03:02 +04:00
AlexVinS b6b12ad8f6 Merge and simplify resistance calculation 2014-05-18 17:03:01 +04:00
AlexVinS 7cf64a0628 Made onlyAlive flag a part of TargetInfo 2014-05-18 17:03:01 +04:00
AlexVinS 6bf4140145 Just remove hardcoded targetting for DEATH_RIPPLE & DESTROY_UNDED. 
It will now affect all creatures (massive, non smart). Immunities are handled separately.
 2014-05-18 17:03:01 +04:00
AlexVinS 1431fcedf7 handleSpellCasting: Handle immunity before RESISTANCE. Now immune creatures shouldnt show resisted animation 2014-05-18 17:03:00 +04:00
AlexVinS c5ba8b9b4b Tweak death ripple immunity. 2014-05-18 17:03:00 +04:00
AlexVinS d9368ca5ba Use new battleGetStacksIf method 2014-05-18 17:02:59 +04:00
AlexVinS 0e93ec28c5 Add new general method for battle stack access 2014-05-18 17:02:59 +04:00
AlexVinS 0e3f59294c fix for #1779 
"val" of SPELLCASTER bonus = spell level. Set it to expert for archangel.
 2014-05-18 16:52:54 +04:00
AlexVinS 0412fe29b0 Tweak absolute immunities for spells accordint to FizMiG 2014-05-18 11:25:09 +04:00
AlexVinS 9dad229440 Fix #1737 2014-05-17 16:07:19 +04:00
AlexVinS 5be005ee36 Try to fix #1763 and a small refactoring 2014-05-17 11:24:26 +04:00
AlexVinS 3e101d89ef few formatting. Mostly space-> tab 2014-05-07 03:58:58 +04:00
AlexVinS 1d7c63da57 Split spell config. 
It`s aready large and will grow more.
 2014-05-07 03:58:57 +04:00
AlexVinS 2947bdedfc [c::b] configure Test project dependencies 2014-04-30 22:09:26 +04:00
AlexVinS 4a4584f53c [c::b] +working Test project file 2014-04-07 10:06:03 +04:00
AlexVinS 246e146eca More .gitignore configuration 2014-04-07 10:05:25 +04:00
AlexVinS 8c4506144c create initial .gitignore 2014-04-07 08:58:51 +04:00
AlexVinS 0682c2fa60 add Test project to workspace 2014-04-07 08:58:21 +04:00
alexvins 13f72e581e [c::b] +tests project 2014-04-02 04:39:15 +00:00
alexvins 67450dfed6 config\creatures\neutral.json syntax fix 2014-04-02 04:24:55 +00:00
alexvins 1aff899f5b Hotfix 2 
* fix loading range attribute
* fix config for massive spells
 2014-03-17 14:39:28 +00:00
alexvins 8cc586ab7f hotfix 2014-03-17 14:06:32 +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
alexvins 9f01a92f4c fix crash in jsonschema in case of invalid typename 2014-03-10 15:58:13 +00:00
alexvins c959fdcce0 SpellHandler: cleanup, formatting, simplification. 2014-03-08 23:18:51 +00:00
alexvins afcb7072eb Implemented #1379 
+ added new flag for special spells. Special spells can be obtained only with BONUS::SPELL.
* made Titans` thunder special.
 2014-03-07 16:10:20 +00:00
alexvins 33935ceb67 cmake/msvc project updates. untested. 2014-03-07 13:23:30 +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
alexvins c7f57406eb Fix bonus schema to support array in duration 2014-03-01 18:42:31 +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