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
fb7c8a898f
add a test for get_monsters().
...
I want to make sure I don't break this in the future.
2014-08-20 08:18:47 +02:00
Enno Rehling
acfe72f24e
add a test for get_monsters().
...
I want to make sure I don't break this in the future.
2014-08-20 07:00:58 +02:00
Enno Rehling
308b5ca358
Merge branch 'master' of https://github.com/eressea/server
2014-08-18 20:30:20 +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
7eb21611ce
Adjust the weight of young dragons to be less than regular dragons.
...
This fixes https://bugs.eressea.de/view.php?id=1677
2014-08-14 06:29:45 +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
Enno Rehling
018d4ca38e
fix quest keys to work again.
...
add a function to walk borders with a callback.
2014-07-22 10:59:47 +02:00
Enno Rehling
d7803eb318
trying to fix the museum. WIP.
2014-07-21 11:13:16 +02:00
Enno Rehling
fbe9822e9c
mpve sceipts tp the roght place.
2014-07-19 23:55:41 +02:00
Enno Rehling
5c78a3883e
cleaning up terrains, reading race flags from a JSON array
2014-06-16 22:43:40 -07:00
Enno Rehling
58fa2d4454
Merge branch 'master' of github.com:eressea/server
2014-06-07 09:26:38 +02:00
Enno Rehling
115d3a8f86
some specialized equipment
2014-06-03 07:35:45 -07:00
Enno Rehling
fa256360b9
eliminate kill_nonstarters
2014-06-03 06:29:33 +02:00
Enno Rehling
e17a3fc8fa
eliminate remaining traces of the wisps spell
2014-06-02 07:22:07 +02:00
Enno Rehling
1f41131593
remove invalid skills from E3 races
2014-06-02 00:01:24 +02:00
Enno Rehling
41c6b13111
familiars with differnt skills for different games
2014-05-10 13:50:16 -07:00
Enno Rehling
1318c8976a
e4 startup
2014-05-03 19:53:59 +02:00
Enno Rehling
75b7ac3064
new turn processing script,
...
add adamantium to config
2014-04-27 02:59:02 +02:00
Enno Rehling
921ab4947e
fixing xml config for e2 and e3
2014-04-24 06:24:35 -07:00
Enno Rehling
a485f65562
new config files
2014-04-24 09:14:29 +02:00
Enno Rehling
fa5dc43b98
reorganizing the way configuration data is read (WIP)
2014-04-20 09:36:25 -07:00
Enno Rehling
31b083a19f
E3 hatte keine flammenschwerter
...
Fixing http://bugs.eressea.de/view.php?id=1925
2013-12-27 05:47:11 +01:00
Enno Rehling
75c540992b
fix the default arda server's configuration
2013-12-27 01:58:35 +01:00
Enno Rehling
bef560d92a
Fix xml catalog references for E2 and E3.
...
Fix a bug in the new get_arg function.
2013-12-27 01:54:02 +01:00
Enno Rehling
ca79c28eaf
kill empty folder
2013-12-27 01:07:55 +01:00
Enno Rehling
b532673f89
remove deprecated commands
2012-06-17 20:22:01 +02:00
Enno Rehling
bff66773cf
update the arda server to use submodules and new cmake layout
2012-06-07 12:44:25 -07:00
Enno Rehling
10e7f0dd72
new directory layout, all tests pass
2012-06-05 07:36:33 -07:00
Enno Rehling
a65a176ba0
rename the example world. It is now called "Arda" (another Tolkien name)
2012-06-01 17:40:25 -07:00
Enno Rehling
9f06268acd
gray magic needs to contain all of the spells that any monster could cast, so add all of them for now.
2012-05-26 15:48:02 -07:00
Enno Rehling
6362d26e50
kill tybied in E3, make common spells the source for random choices
2012-05-26 14:20:01 -07:00
Enno Rehling
1ba2ed200b
remove spell-levels from XML file, we no longer read these or need these.
2012-05-26 09:41:32 -07:00
Enno Rehling
6482b748c8
remove leveled resources from fixed-level spells
2012-05-25 23:32:03 -07:00
Enno Rehling
c3cd519152
specify levels with magic attacks (step one to removing spell->level)
2012-05-24 01:45:13 -07:00
Enno Rehling
42a0fae762
fix spellbook data for example server
...
remove duplicate spells
2012-05-23 22:24:31 -07:00
Enno Rehling
1296e45109
fix spellbook data for E2 and E3
2012-05-23 22:24:00 -07:00
Enno Rehling
d4d39b43e9
add xml spellbooks for the magic schools in E2 and E3
...
this is being read, but not used by the code yet.
2012-05-23 21:50:59 -07:00