[Gemrb-commits] gemrb: branch master updated. v0.6.2-848-g3212612

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  32126125e818d3a87785c8fce1b9237d6df24af8 (commit)
       via  075ecaa9ca89c14cce5c23767ddb1abb26b68239 (commit)

Summary of changes:
 gemrb/override/pst/effects.ids                     |    2 ++
 gemrb/override/{bg1/arrowex.pro => pst/iknife.pro} |  Bin 768 -> 768 bytes
 gemrb/override/pst/speak.eff                       |  Bin 0 -> 272 bytes
 gemrb/override/pst/stories.pro                     |  Bin 0 -> 512 bytes
 .../override/{how/prtl_op.spl => pst/stories.spl}  |  Bin 202 -> 250 bytes
 5 files changed, 2 insertions(+), 0 deletions(-)
 copy gemrb/override/{bg1/arrowex.pro => pst/iknife.pro} (66%)
 create mode 100644 gemrb/override/pst/speak.eff
 create mode 100644 gemrb/override/pst/stories.pro
 copy gemrb/override/{how/prtl_op.spl => pst/stories.spl} (51%)
      from  c6c7c0af85c0d1e2423577aba5e3654922bd56a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=32126125e818d3a87785c8fce1b9237d6df24af8

commit 32126125e818d3a87785c8fce1b9237d6df24af8
Merge: 075ecaa c6c7c0a
Author: Avenger <ave...@so...>
Date:   Fri Mar 4 21:04:46 2011 +0100

    Merge branch 'master' of ssh://gemrb.git.sourceforge.net/gitroot/gemrb/gemrb


http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=075ecaa9ca89c14cce5c23767ddb1abb26b68239

commit 075ecaa9ca89c14cce5c23767ddb1abb26b68239
Author: Avenger <ave...@so...>
Date:   Fri Mar 4 21:03:54 2011 +0100

    projectile game data and new effect names

diff --git a/gemrb/override/pst/effects.ids b/gemrb/override/pst/effects.ids
index 2fa676c..476ea73 100644
--- a/gemrb/override/pst/effects.ids
+++ b/gemrb/override/pst/effects.ids
@@ -197,6 +197,7 @@ IDS
 0xc3	TintScreen
 0xc4	SpecialEffect
 0xc5	MultipleVVC
+0xc6	ModifyGlobalVariable
 0xc9	Overlay
 0xcb	Curse
 0xcc	Prayer
@@ -207,4 +208,5 @@ IDS
 0xd1	HostileImage
 0xd2	DetectEvil
 0xd3	JumbleCurse
+0xd4	SpeakWithDead
 425	ControlUndead2
diff --git a/gemrb/override/pst/iknife.pro b/gemrb/override/pst/iknife.pro
new file mode 100644
index 0000000..e5eef72
Binary files /dev/null and b/gemrb/override/pst/iknife.pro differ
diff --git a/gemrb/override/pst/speak.eff b/gemrb/override/pst/speak.eff
new file mode 100644
index 0000000..7b9cf74
Binary files /dev/null and b/gemrb/override/pst/speak.eff differ
diff --git a/gemrb/override/pst/stories.pro b/gemrb/override/pst/stories.pro
new file mode 100644
index 0000000..8c08570
Binary files /dev/null and b/gemrb/override/pst/stories.pro differ
diff --git a/gemrb/override/pst/stories.spl b/gemrb/override/pst/stories.spl
new file mode 100644
index 0000000..56ef6b7
Binary files /dev/null and b/gemrb/override/pst/stories.spl differ

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator