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

28 Commits

Author SHA1 Message Date
Enno Rehling ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling ecc3b1b441 Dragons re using the new LOOT command. 
Fixing the income message (missing ")").
 2014-11-02 11:10:26 +01:00
Enno Rehling bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 2014-11-02 10:02:30 +01:00
Enno Rehling 6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling 96d5544b1f Bug 2032: rename FIGHT back to COMBAT 2014-10-20 17:13:32 +02:00
Enno Rehling f4f9e74e90 Merge branch 'master' of github.com:eressea/server 2014-10-19 05:56:41 +02:00
CTD 1c7075573b Plündern 
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
 2014-10-16 14:45:21 +02:00
Enno Rehling 595dc1334e fix new harbor code, add tests. 
- alliances were checked in the opposite direction
- code crashed when harbor has no owner
 2014-10-03 21:26:11 +02:00
Enno Rehling 68730749fb fix astral space special direction, vortex (translation issue). 2014-09-29 21:19:07 +02:00
Enno Rehling 3e829e2880 support for itoab with smaller bases and larger numbers. 
also a missing English message (museum-related)
 2014-09-29 18:32:12 +02:00
Enno Rehling baffbbf154 Merge branch 'master' of github.com:eressea/server 2014-09-04 21:20:15 +02:00
Enno Rehling 2211111b29 Remove a German-only piece of text, to reduce the footprint of fleets in the report a little. 
Fix English score message in NR.
Small fixes to meet Visual Studio warning level 4.
 2014-08-25 00:45:32 +02:00
Enno Rehling e87b1cf372 an experiment to have deterministic sort order for known factions in the report. 2014-08-25 00:06:33 +02:00
Enno Rehling 5befbad7c7 Merge branch 'version-3-1' 
Conflicts:
	src/laws.c
 2014-08-24 00:30:12 +02:00
Enno Rehling beacb850c6 fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:37:33 +02:00
Enno Rehling b2dc6a3a9d fix MAKE TEMP, for real this time. I hate skip_token and all that stuff. 2014-08-23 00:35:06 +02:00
Enno Rehling 1dcb14cfb9 Revert "silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013" 
This reverts commit 911992b04d.
 2014-08-22 20:15:44 +02:00
Enno Rehling a84e628522 Repair MAKE, which broke when I changed MAKE TEMP. 
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
 2014-08-21 07:31:28 +02:00
Enno Rehling 308b5ca358 Merge branch 'master' of https://github.com/eressea/server 2014-08-18 20:30:20 +02:00
Enno Rehling 41e8c13a0c I do not like contractions. 2014-08-17 18:20:04 +02:00
Enno Rehling 59ccf23db6 Repair MAKE, which broke when I changed MAKE TEMP. 
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
 2014-08-17 14:47:39 +02:00
Enno Rehling a289eee06f Merge branch 'master' of github.com:eressea/server 2014-08-17 12:15:26 +02:00
Enno Rehling f8ad9e92e7 Fix some English message translations. 
clean up and improve some scripts, too.
 2014-08-17 11:19:04 +02:00
Enno Rehling 8f09ab73d9 fix display of alliance status, some English translation hiccups. 2014-08-17 00:14:50 +02:00
Enno Rehling c79dd33bfb smarter processing of MAKE TEMP. 
the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state.
 2014-08-16 11:41:19 +02:00
Enno Rehling 9ca206ec3f remove reference to thieves and spies from this spell for non-E2 games. 
this fixes https://bugs.eressea.de/view.php?id=1548
 2014-08-14 07:05:12 +02:00
Enno Rehling 911992b04d silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013 
this broke when I replaced the new_itemtype function. I owe a test for it.
 2014-08-14 03:48:39 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts). 
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
 2014-07-28 14:27:30 +02:00