Commit Graph

13546 Commits

Author SHA1 Message Date
Isaac Clerencia Perez
fe39a41981 Merged 2006-10-19T10:17:13Z!lari.nieminen@iki.fi into trunk 2006-10-19 15:04:36 +00:00
Lari Nieminen
ffa98deaf1 Added some filler frames for troll warrior's melee attack,
and offset-fixed the new trolls (except the troll, which isn't animated yet).
2006-10-19 10:17:13 +00:00
Isaac Clerencia Perez
da06c32232 Merged 2006-10-14T20:41:12Z!patrick_x99@hotmail.com into 1.2 branch 2006-10-19 09:15:05 +00:00
Richard Kettering
f795d15b97 New images for troll warrior and rocklobber. 2006-10-19 08:17:19 +00:00
Richard Kettering
c7da4e6b71 New images for troll warrior and lobber. 2006-10-19 08:16:07 +00:00
Rusty Russell
deb051171f Forward port of 2006-10-18T11:43:48Z!rusty@rustcorp.com.au
Fix bug 7395: Help from main screen gives terrain table titles, no
entries.  When Boucman introduced help from main screen, he didn't
realize map could be NU LL, so handed a dummy map.  NULL is handled
specially in code by not drawing terrain table at all for units.
2006-10-19 08:00:38 +00:00
Rusty Russell
12b65e215f Forward port of 2006-10-18T00:00:10Z!rusty@rustcorp.com.au
Soliton got an assert in battle_context observing game using old era data.

We should go OOS when defender weapon is impossible, as we do for
attacker weapon.
2006-10-19 07:59:31 +00:00
Rusty Russell
c47c478bfe Minor string fixes from bug #7438 (not for inclusion in 1.2) 2006-10-19 07:57:23 +00:00
Benoît Timbert
4c30ffa45d Remove not implemented fearless trait from the Dark Adept 2006-10-19 07:40:57 +00:00
Gunter Labes
ea11e9b781 remove entries that are already in the 1.2 changelog 2006-10-18 21:46:49 +00:00
Gunter Labes
650d08d649 Dark Adepts no longer get the 'strong' trait 2006-10-18 21:44:39 +00:00
Gunter Labes
53eb4ba9fc added 'fearless' to some more races
made healthy also give a +3HP bonus
made Dark Adepts not get the 'strong' trait anymore
2006-10-18 21:21:45 +00:00
Lari Nieminen
aac464cf0e ...oops. Reverted an accidental commit. 2006-10-18 19:00:16 +00:00
Lari Nieminen
10b540ab01 ...oops. Reverted an accidental commit. 2006-10-18 18:57:45 +00:00
Rusty Russell
b5302d8e71 Fix bug 7395: Help from main screen gives terrain table titles, no entries.
When Boucman introduced help from main screen, he didn't realize map
could be NULL, so handed a dummy map.  NULL is handled specially in
code by not drawing terrain table at all for units.
2006-10-18 11:43:48 +00:00
Isaac Clerencia Perez
4978f11cd4 Fixed mavorte's name 2006-10-18 07:05:29 +00:00
Patrick Parker
c9c0fd1235 two new traits ("fearless" and "healthy") 2006-10-18 03:55:31 +00:00
Rusty Russell
c1394b56b8 Soliton got an assert in battle_context observing game using old era data.
We should go OoS when defender weapon is impossible, as we do for
attacker weapon.
2006-10-18 00:00:10 +00:00
Gunter Labes
c928d99268 updated team configuration 2006-10-17 18:32:24 +00:00
Gunter Labes
88f5bdd87e updated team configuration 2006-10-17 18:20:31 +00:00
Josef Redinger
48fd4ce5fb fix bug #7473 - random range only in positive number 2006-10-17 14:34:14 +00:00
Josef Redinger
4d49b01030 fix bug #7473 - random range only in positive number 2006-10-17 14:31:40 +00:00
Jérémy Rosen
96cab1a3cf change function prototype slightly ot prevent incorrect use 2006-10-16 21:22:19 +00:00
Nils Kneuper
18d2adcff2 updated italian translation 2006-10-16 18:23:58 +00:00
Nils Kneuper
0608e503f9 updated italian translation 2006-10-16 18:23:29 +00:00
Rusty Russell
e2bdce1542 Partial revert of 2006-10-10T19:57:14Z!joerg.hinrichs@alice-dsl.de which causes OOS (see #7433). 1.2 only.
Joerg: please revert this once you've found the problem!

Unfortunately that commit 2006-10-10T19:57:14Z!joerg.hinrichs@alice-dsl.de did several things.  This keeps:
1) The renaming of status to gamestatus,
2) The use of gamestatus's snapshot member rather than a standalone.
3) Changes to firing of events in replays
2006-10-16 12:22:13 +00:00
Karen Baskins
d2c04eb0a2 Changed human loyalist halberdier idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-16 03:51:38 +00:00
Karen Baskins
0ea62bc4dc Changed human loyalist fencer idling animation...
...to take advantage of the new animation syntax.

For inclusion in trunk only.
2006-10-16 03:37:35 +00:00
Rusty Russell
8d19660966 Fix aggression calculations (bug #7432)
1) harm_weight is 1 - aggression, but we were handing aggression
directly in all but one place!  This lead to negative aggression
settings becoming actively masochistic: rewarding self-damage!
Changed battle_context constructor to take aggression and convert
internally, since that is how it was being used.

2) aggression was only taken into account when comparing chance to
kill, not damage.  This means that the bug above only showed up in
cases where there was a chance to kill.  This may re-balance some
scenarios slightly.

I suspect this may have been involved in bug #6095 (AI too uncautions
with its leader).
2006-10-16 01:58:47 +00:00
Karen Baskins
b691155bab Changed goblin wolf rider idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-16 01:11:51 +00:00
Patrick Parker
330408863d make trunk compile again. 2006-10-16 00:52:03 +00:00
Karen Baskins
49ebeed811 Changed goblin spearman idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-16 00:27:01 +00:00
Karen Baskins
6eeb31b573 Changing the goblin direwolf rider idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-16 00:14:35 +00:00
Karen Baskins
7ccd057232 Changed elvish archer idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-16 00:03:16 +00:00
Karen Baskins
987fa9dcf7 Changing dwarf steelclad idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-15 23:51:15 +00:00
Karen Baskins
71a4d8aab6 Changed dwarf runemaster idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-15 23:35:40 +00:00
Karen Baskins
b8b8eb4ed7 Changed dwarf guardsman idling animation...
...to take advantage of new animation sytax.

For inclusion in trunk only.
2006-10-15 23:18:28 +00:00
Karen Baskins
63d25305e9 Changed dwarf fighter idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-15 22:56:01 +00:00
Karen Baskins
1b5bf3d438 Changed dwarf berserker idling animation...
...to take advantage of new animation syntax.

For inclusion in trunk only.
2006-10-15 22:48:04 +00:00
Jérémy Rosen
939259648a remove a high maintainance cost/low benefit feature of animation, no user impact 2006-10-15 21:20:55 +00:00
Jérémy Rosen
f5ebed8a80 remove the last bits of game logic from animations,
animations can now be skiped entirely during fast replay
2006-10-15 19:43:55 +00:00
Jérémy Rosen
8853743de2 forgot to remove a couple of warnings 2006-10-15 19:14:16 +00:00
Jérémy Rosen
5d2f781f7b new low level animation engine,
should ease the macroification and tuning of animations once they are
converted (backward compatible).
2006-10-15 18:19:08 +00:00
Nobuhito Okada
0479e64173 updated Japanese translation 2006-10-15 17:22:20 +00:00
Patrick Parker
a351011d26 use imgsel_style for add-on dialog menu 2006-10-15 06:12:10 +00:00
Patrick Parker
3df196b778 scale the images in the Get Add-ons dialog to maximum 72x72 (relative_size) 2006-10-15 02:18:00 +00:00
Patrick Parker
19fae4eec1 fixes FR #7266
- uses the menu help string to show the full map filename on the MP
  create screen
2006-10-14 21:33:45 +00:00
Patrick Parker
e4cc0b6e85 fix logical error in menu::process_help_string 2006-10-14 20:41:12 +00:00
Elias Pschernig
84d14271bf Improved the current ".py.unchecked" renaming by the CS somewhat:
- The CS renames files on upload instead of download now, and gives a
  warning message to the user.

- Approval of files now is possible by simply renaming the files back
  to ".py" on the CS.

- If approved ".py" files are unchanged or only renamed/moved, they
  are not renamed.

- When downloading a campaign with ".py.unchecked" files in it, a
  message is displayed to the user.

The first three items only affect campaignd.
2006-10-14 16:59:43 +00:00
Benoît Timbert
0022d9654e Proven by the Sword: tell Deoran to go to Westin if the citadel is secured
(fixes #7360) Can't apply it to 1.2 because of string freeze.
2006-10-14 16:31:17 +00:00