1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

7263 Commits

Author SHA1 Message Date
Frank Zago
2bb0eab5f9 Split CMusicHandler into CMusicHandler, CSoundHandler and CAudioHandler. Audio handler is now audioh instead of mush. 2009-05-06 02:32:36 +00:00
Michał W. Urbańczyk
6aacc95945 Patch from Ubuntux:
* Revert a change from rev 826 that breaks compilation under gcc.

( vcmi_fix_linux_no_compile.diff )
2009-05-03 23:43:07 +00:00
Michał W. Urbańczyk
2900e75818 PreGame patches from Ubuntux:
* fromnewgame use was just broken. Replaced it with something more clear.
* Cleanup printMaps. Remove unused arguments. Can handle empty lists. Add comments.
* Try to behave when no map is present.

( vcmi_fix_fromnewgame.diff
vcmi_printmap2.diff
vcmi_fix_nomap.diff
vcmi_fix_moveByOne.diff
vcmi_sort_maps.diff )
2009-05-03 23:38:08 +00:00
Michał W. Urbańczyk
ab1a759458 * reduntant quotation marks from artifact descriptions are removed
* fixed map scrolling with ctrl+arrows when some windows are opened
2009-05-03 23:15:18 +00:00
mateuszb
51821ad5c4 * missing change for previous commit 2009-05-03 16:15:22 +00:00
mateuszb
047590427f * support for new hero bonuses (BLOCK_MORALE, SECONDARY_SKILL_PREMY (archery), AIR_SPELL_DMG_PREMY, EARTH_SPELL_DMG_PREMY, FIRE_SPELL_DMG_PREMY, WATER_SPELL_DMG_PREMY, BLOCK_SPELLS_ABOVE_LEVEL, SPELL_IMMUNITY, BLOCK_MORALE, FIRE_SPELLS, AIR_SPELLS, WATER_SPELLS, EARTH_SPELLS, SPELL, SPELLS_OF_LEVEL). It means that following artifacts are now supported:
- Orb of the Firmament
- Orb of Silt
- Orb of Tempestuous Fire
- Orb of Driving Rain
- Bow of Elven Cherrywood
- Bowstring of the Unicorn's Mane
- Angel Feather Arrows
- Tome of Fire Magic
- Tome of Air Magic
- Tome of Water Magic
- Tome of Earth Magic
- Recanter's Cloak
- Orb of Inhibition
- Pendant of Dispassion
- Pendant of Second Sight
- Pendant of Holiness
- Pendant of Life
- Pendant of Death
- Pendant of Free Will
- Pendant of Negativity
- Pendant of Total Recall
- Spellbinder's Hat
- Spirit of Oppression
- Sphere of Permanence
I hope I listed them all here :). Please try them and report if something's wrong.
2009-05-03 16:14:16 +00:00
mateuszb
e9ed648415 * support for sorcery secondary skill 2009-05-02 17:43:57 +00:00
Michał W. Urbańczyk
1661da2fcb * fixed selecting new path
* always restoring default cursor when movng mouse out of the terrain
* fixed herolist scrolling
* fixed picking guarded resources
2009-05-01 22:08:03 +00:00
Michał W. Urbańczyk
e10ab66631 Patches from Ubuntux:
* clicking on "advanced options" a second time now closes the tab instead of refreshing it.
* Fix position of maps names. Made the slider cursor much more responsive. Speedup the map select screen.
* CPlayerInterface::delComps was not initialized.
* Add a few missing inits.

vcmi_missing_init.diff
vcmi_infowin.diff
vcmi_fix_advoptions.diff
vcmi_fix_printMaps.diff
2009-05-01 16:14:29 +00:00
mateuszb
bb8e505ccd * refactoring 2009-05-01 14:37:25 +00:00
mateuszb
b0e2d13b4e * new spells:
- precision
- slayer
* refactoring
2009-05-01 13:42:41 +00:00
Michał W. Urbańczyk
8c6c0df45e Sound patch from Ubuntux #11: Add music infrastruture + some musics in various places
[With mine minor fixes and updated MSVC project]
vcmi_music.diff
2009-04-30 23:25:17 +00:00
mateuszb
621400ac85 * small refactoring 2009-04-30 14:59:30 +00:00
Michał W. Urbańczyk
df25dd7efb Sound patches from Ubuntux #7 - #10:
* Some sound code cleanups
* Renamed soundBase::soundNames into soundBase::soundID
* Add a music handler destructor
* Add Archdevil and vampire pre and post movement sounds

I've applied minor change to fix CMusicHandler - GeniusAI conflict: moved sounds bimap to the .cpp file.

(vcmi_sounds_cleanup.diff
vcmi_sounds_cleanup2.diff
vcmi_sounds_cleanup3.diff
vcmi_add_sounds.diff)
2009-04-30 10:53:06 +00:00
Michał W. Urbańczyk
6ccd9c2701 Sound patch from Ubuntux #6 - adds sound to units during combats
(vcmi_sound_battle.diff)
2009-04-25 23:31:39 +00:00
Michał W. Urbańczyk
92671947a0 Sound patch from Ubuntux #5 - fixes a bug in stopSound where all channels would be stopped if -1 is given in parameter.
(vcmi_sound_stop_one_channel.diff)
2009-04-25 22:51:16 +00:00
Michał W. Urbańczyk
275ec5f640 Added sounds to several objects, minor improvements. 2009-04-23 21:09:10 +00:00
Michał W. Urbańczyk
992ce92ae5 Sound patch from Ubuntux #4 - sounds for hero movement
(vcmi_sound_hero_moving.diff)
2009-04-23 19:50:27 +00:00
Michał W. Urbańczyk
a81378617f Little more events
[Still need more work]
2009-04-23 15:48:53 +00:00
Michał W. Urbańczyk
ff131a3b2f Sound patch from Ubuntux #3
(vcmi_sounds_sets.diff)
2009-04-22 18:50:22 +00:00
Michał W. Urbańczyk
ade4b46edd Sound patch from Ubuntux #2
(vcmi_sounds.diff)
2009-04-22 18:48:56 +00:00
Michał W. Urbańczyk
d625066449 Sound patch from Ubuntux #1 2009-04-22 18:28:01 +00:00
mateuszb
d14083272d * new spells
- protection from air
- protection from fire
- protection from water
- protection from earth
* a bit of refactoring in spell handling code
2009-04-22 10:03:13 +00:00
mateuszb
e88ba16ffa * ubuntux's patch (vcmi_fix_res2) 2009-04-22 07:46:27 +00:00
mateuszb
35f63bdc5f * new spell (disrupting ray)
* a few code cleanups
2009-04-21 17:32:43 +00:00
Michał W. Urbańczyk
c8b6858716 * mostly done Events objects handling
* some moving hero code improvements
* fixed Blacksmith
* minor changes
2009-04-20 22:57:07 +00:00
mateuszb
408411d8c3 * next ubuntux's patch 2009-04-19 15:01:33 +00:00
mateuszb
899be22db0 * added new spells
- dispel
- armageddon
* spellbook cannot be opened by L-click on hero in battle when it shouldn't be possible
* minor changes
2009-04-17 14:01:22 +00:00
mateuszb
1dcb99254c * ubuntux's levelup patch 2009-04-17 09:12:24 +00:00
mateuszb
7319e5cb0e * canceling of casting a spell by pressing Escape or R-click (R-click on a creatures does not cancel a spell)
* new spells:
- frost ring
- fireball
- inferno
- meteor shower
- death ripple
- destroy undead
* spellbook button is inactive when hero cannot cast any spell
* obstacles will be placed more properly when resolution is different than 800x600
* minor changes
2009-04-16 14:01:27 +00:00
Michał W. Urbańczyk
06bb6dcce9 Improvements for CMessage::breakText.
[ http://vcmi.antypika.aplus.pl/forum/viewtopic.php?p=2260 ]
2009-04-16 13:32:45 +00:00
mateuszb
cc631b1362 * next ubuntux's patch
* normalized line endings (CR+LF)
* translated comments in CMessage.cpp
2009-04-16 11:14:13 +00:00
Michał W. Urbańczyk
d80afb1902 * server sends confirmation (given later to player interface) after applying request (will be needed for AI)
* created new package for injuring multiple units - needed for area spells (not tested)
* proper screen updating on garrison change
* spell effects will be removed when they time out
* Corpse (Skeleton) will be accessible from all directions
* new objects supported:
- Corpse
- Lean To
- Wagon
- Warrior's Tomb

* several minor improvements
2009-04-16 00:28:54 +00:00
mateuszb
f9ae91d88c * further changes towards support for ranged spells
* added info about author & license in files
2009-04-15 14:03:31 +00:00
mateuszb
aa87e1ff16 * next ubuntux's patch 2009-04-15 10:20:47 +00:00
Michał W. Urbańczyk
38b680ed30 * Patch from Ubuntux: fix to avoid resources becoming negative [on handling timed events]
* improvements for Garrison Window
* some changes towards Events support
* minor fixes
2009-04-14 23:29:26 +00:00
mateuszb
ece364f735 * partial implementation of SRSL parser (although it's enough for almost all Heroes III spells)
* config/spell_info.txt is now less unholy (its size is no more 666 bytes) :)
2009-04-14 14:48:57 +00:00
Michał W. Urbańczyk
d2e1c8d782 Uh... fix for previous fix :/ 2009-04-14 14:26:58 +00:00
Michał W. Urbańczyk
f3ffeea72e Minor fixes. 2009-04-14 14:19:46 +00:00
Michał W. Urbańczyk
985b4930e4 Major changes to the GUI. Introduced list of interfaces (listInt) containing pointers to all shown interfaces / windows. Only top layer is active and regularly updated.
Windows should be shown using pushInt and closed with popInt or PopIntTotally (if interface needs to be also deleted).
Some things are not working yet properly, I'll try to fix them ASAP.
2009-04-14 12:47:09 +00:00
mateuszb
049b4de2b2 * next ubuntux's patches 2009-04-14 10:46:42 +00:00
mateuszb
4d3808cfa0 * applied ubuntux's patches
* fixed AmptyAI (it builds now)
2009-04-13 18:52:20 +00:00
Michał W. Urbańczyk
de71191307 * Neutral creatures can join or escape depending on hero strength / army (partially done)
* Diplomacy secondary skill support
2009-04-12 01:48:50 +00:00
Michał W. Urbańczyk
f9aebcc4bd * Started making support for garrison window. Leaving guardians in flagged mines. 2009-04-12 00:58:41 +00:00
Michał W. Urbańczyk
d72d988a9c * fixed crash on closing application
* unified yes/no and selection dialog interface calls
* VCMI won't anymore be always giving all three stacks in the starting armies
* fix for drawing starting army creatures count
* support for School of Magic
* support for School of War
* support for Pillar of Fire
* minor changes
2009-04-11 01:32:50 +00:00
Michał W. Urbańczyk
7a9e323297 * fixed 8 hero limit to check only for wandering heroes (not garrisoned)
* srand at the beginning of handleConnection
2009-04-09 15:05:20 +00:00
Michał W. Urbańczyk
e3222fd34f * fixed mana limit info in the hero window
* added support for Scholar object
* possibly fixed problems with handling obstacles info
2009-04-08 19:55:50 +00:00
mateuszb
b74b6ecc01 * minor bugfixes 2009-04-07 17:51:50 +00:00
mateuszb
ee61a02d12 * further console improvements 2009-04-05 14:37:14 +00:00
mateuszb
47bc007d8c Common changes (ours):
* Improvements for console
* Speed bonus support
* Minor improvements
2009-04-04 19:26:41 +00:00