Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,421 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

5421 Commits

Author SHA1 Message Date
Enno Rehling e99db198eb bugfix use_item (use_skillpotion did not use pool). 
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
 2015-05-24 07:17:23 +02:00
Enno Rehling 72e4ee8e9f Merge pull request #188 from badgerman/develop 
fixes to Solthar's commit
 2015-05-13 20:25:10 +02:00
Enno Rehling 2df0743439 Merge remote-tracking branch 'origin/develop' into develop 2015-05-13 03:18:55 -07:00
Enno Rehling c57907e340 setup new games defaulting to turn 0 2015-05-12 14:30:49 -07:00
Enno Rehling 0fb547f7c2 Beispiel Trolle -> Schlümpfe 
Test des Atom Editors
 2015-05-12 08:41:14 -07:00
Enno Rehling 3574d4a0b9 fix a Visual Studio /Wall warning 2015-05-12 00:12:58 -07:00
Enno Rehling bf5fae2ef5 Fix visual studio compilation for Solthar's curse changes (float/int conversions, uninitialized variable). 2015-05-11 23:54:21 -07:00
Enno Rehling 94929be51f Merge pull request #187 from badgerman/develop 
Convert all XML files to UTF-8
 2015-05-11 23:29:28 -07:00
Enno Rehling a0c6bbb9aa fix encoding conversion errors from previous commit 2015-05-11 23:20:32 -07:00
Enno Rehling a4774be652 Convert all XML files to UTF-8, to allow editing with Atom. 2015-05-11 16:55:11 -07:00
Enno Rehling a4de46dab5 Merge pull request #181 from stm2/missing_curse_name 
fix crash of Analyze Magic (mantis bug 2099)
 2015-05-10 19:49:57 -07:00
Enno Rehling 7f1ee527d9 Merge pull request #186 from badgerman/develop 
newplayer script updates, small gmtool fixes
 2015-05-10 14:05:39 -07:00
Enno Rehling 82d020701f consistent naming of new players file across scripts and autoseed 2015-05-10 13:56:24 -07:00
Enno Rehling dc0897b122 fix gmtool and setup script to match the GM guide document. 2015-05-10 13:41:48 -07:00
Enno Rehling 628af4f6ad Merge pull request #182 from stm2/dreams_fix 
refactoring + tests for good/bad dreams
 2015-05-08 09:37:22 -07:00
Enno Rehling ac2099aa0f Merge pull request #185 from stm2/race_attacks 
apply possible number of racial attacks consistently
 2015-05-08 09:30:54 -07:00
Steffen Mecke 2d27442681 apply possible number of racial attacks consequently 2015-05-08 13:02:54 +02:00
Steffen Mecke 05ffb95c65 deactivated write_reports in test, because it's irritating 2015-05-07 18:28:44 +02:00
Steffen Mecke d9f8479055 removed duplication in good/bad dreams code 2015-05-07 17:54:59 +02:00
Steffen Mecke ca89213295 fixed mallorn curse message 2015-05-07 17:51:44 +02:00
Steffen Mecke 94ae774fed fix spelling of spell titles 2015-05-07 17:51:43 +02:00
Steffen Mecke 9407b4c9c0 fixed crash of analyze magic 
because of missing spell/curse description
 2015-05-07 17:51:43 +02:00
Steffen Mecke dedf9f2009 clear CURSE_ISNEW explicitly in age(), not implicitly in write/read 2015-05-07 17:51:43 +02:00
Steffen Mecke 553cf23e9e crash more gracefully on missing description 2015-05-07 17:51:38 +02:00
Steffen Mecke 231f9bb39a check for existence of spell descriptions 2015-05-07 13:31:19 +02:00
Steffen Mecke 22e8e39a99 check that analyze magic works 2015-05-07 13:28:37 +02:00
Steffen Mecke b41049da53 test good/bad dreams 2015-05-06 18:15:10 +02:00
Enno Rehling 03084a7ee7 set_origin: renaming German function name to English, add a simple test for it. 2015-05-05 09:47:44 -07:00
Enno Rehling 42783ff02c binding a magician's spellbook to Lua, with test. 2015-05-05 08:44:58 -07:00
Enno Rehling 0db74d1c09 re-enable unit spells binding to Lua, remove some TODOs from the code. 2015-05-05 08:07:20 -07:00
Enno Rehling 031826902d Merge remote-tracking branch 'upstream/develop' into develop 2015-05-05 14:20:52 +02:00
Enno Rehling 5291b32459 new players are now read from a players.txt file 
check for duplicates
start with better miners
 2015-05-05 14:20:19 +02:00
Enno Rehling e55c2d63bf remove email address 
should not put player emails in the source of this script, obfuscating to prevent misuse
 2015-05-04 22:23:18 +02:00
Enno Rehling 5f0a02ecb9 Merge pull request #180 from stm2/spy_expand_april 
expand spy messages, rebased
 2015-05-04 20:30:40 +02:00
Steffen Mecke 0fc7364533 fixed errors introduced by rebase 2015-05-04 14:46:32 +02:00
Steffen Mecke 79d2c76c3f refining spy tests 2015-05-04 14:30:59 +02:00
Steffen Mecke d4aa6e834e check for number of arguments as good as possible and cleaning up test 2015-05-04 14:30:59 +02:00
Steffen Mecke e28222c5be fix missing kampfstatus 2015-05-04 14:30:59 +02:00
Steffen Mecke 2cc8c1f871 trying to solve spy message bug #1604 
Conflicts:
	src/kernel/CMakeLists.txt
 2015-05-04 14:30:59 +02:00
Enno Rehling 24dbe64ef7 new players: more money, entertainers. 2015-05-03 23:23:21 +02:00
Enno Rehling fe3d96517e Merge pull request #178 from stm2/typ 
Tippfehler und englische Texte für Health.
 2015-05-03 23:12:01 +02:00
Enno Rehling b603001760 Merge pull request #179 from badgerman/develop 
Unlimitierte Personen-Übergabe in E2
 2015-05-03 11:15:08 +02:00
Enno Rehling 01969dfb40 Merge remote-tracking branch 'upstream/develop' into develop 2015-04-30 16:02:33 +02:00
Steffen Mecke a9a14a79d0 fixed messed up english strings for wounds 2015-04-30 15:47:29 +02:00
Enno Rehling 6c4e74bc25 as-hoc scripts for seeding new players into old game 2015-04-30 15:22:06 +02:00
Enno Rehling ce94c9805d rules.give.max_men == -1 für unlimitierte Übergaben in E2 2015-04-28 17:40:41 +02:00
Steffen Mecke 81e96c121a typo 2015-04-27 15:14:42 +02:00
Enno Rehling 4dd0ffefe1 Merge pull request #176 from badgerman/develop 
Umlaute Reparatur
 2015-04-26 23:20:11 +02:00
Enno Rehling 38fe2b1144 Hier hat ein commit aus dem github-Editor das Encoding zerstört, scheint mir. 2015-04-26 23:02:37 +02:00
Enno Rehling 25305d93cb Merge pull request #175 from badgerman/develop 
Fix keepitem flag in XML ("Menschen geben nichts ab")
 2015-04-22 12:39:32 +02:00