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
