Enno Rehling
ad903e83e3
Merge branch 'master' of github.com:badgerman/eressea
2014-08-23 09:18:45 +02:00
Enno Rehling
b458c889be
Merge branch 'master' of github.com:eressea/server
2014-08-23 09:18:15 +02:00
Enno Rehling
808f343e34
make getstrtoken() return null at EOL, kill init_tokens.
...
init_order all the things!
added a bunch of new assertions to cover for oversights.
added some new tests for order parsing.
2014-08-23 09:17:58 +02:00
Enno Rehling
ee2363a4d9
use init_order, it is better than the init_tokens+skip_token pattern.
...
test for new_units.
additional testing for init_order (renamed from init_command)and init_tokens.
fixed a memory access error when kwd==NOKEYWORD.
2014-08-23 06:45:20 +02:00
Enno Rehling
6b14eae118
Merge remote-tracking branch 'eressea/master'
...
Conflicts:
src/kernel/order.c
2014-08-23 06:17:16 +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
e9ccc24895
make previews always build from master
2014-08-22 07:44:52 +02:00
Enno Rehling
dea20e94bd
New pre-release.
2014-08-22 07:41:28 +02:00
Enno Rehling
fd46b25317
Merge branch 'version-3-0'
...
Conflicts:
conf/e3/config.xml
2014-08-22 07:40:43 +02:00
Enno Rehling
8d30d73bb4
fix preview script sending to testers.txt
2014-08-21 19:50:03 +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
aed64a70fb
cut the number of allocations for order-data in half.
...
started writing a test file for orders.
2014-08-21 07:30:50 +02:00
Enno Rehling
cc0b0ad71b
added a test for addfaction.
...
removing struct player, since it is not in use.
2014-08-20 23:42:33 +02:00
Enno Rehling
7b3a381500
increase version number to 3.1
...
log an error when trying to create an order for a disabled keyword
monsters might be trying to TAX in E3?
2014-08-20 19:26:37 +02:00
Enno Rehling
bd8d28cfb7
reduce E3 chance to attack to zero for turn re-run
2014-08-20 11:55:17 +02:00
Enno Rehling
68fc4df74d
Configurable monster attack chance, default to 40%.
...
E3 chance to attack is only 10%.
2014-08-20 11:54:11 +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
5c7b93d0ce
Monster attackieren keine Einheiten in Gebäuden.
2014-08-20 08:18:26 +02:00
Enno Rehling
73d3980e72
Merge pull request #29 from badgerman/master
...
add a test for get_monsters().
2014-08-20 08:15:59 +02:00
Enno Rehling
7b8deeeba9
fixing my local checkout, I found some changes?
2014-08-20 07:16:04 +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
e69fb78e6b
Monster attackieren keine Einheiten in Gebäuden.
2014-08-19 15:31:16 +02:00
Enno Rehling
3fde10d9e8
Configurable monster attack chance, default to 40%.
...
E3 chance to attack is only 10%.
2014-08-19 15:24:30 +02:00
Enno Rehling
bc1a7624b7
Merge branch 'master' of https://github.com/eressea/server
2014-08-18 20:47:17 +02:00
Enno Rehling
01f35a2881
static code analysis results
2014-08-18 20:43:02 +02:00
Enno Rehling
408febe1e1
Merge branch 'master' of github.com:eressea/server
2014-08-18 20:33:11 +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
56ea4ec325
this file is executable
2014-08-17 08:45:09 +02:00
Enno Rehling
99124f3d6d
Merge branch 'master' of https://github.com/eressea/server
2014-08-17 07:37:50 +02:00
Enno Rehling
b385bfc4d2
Merge branch 'fixes-891'
...
Conflicts:
src/kernel/faction.c
2014-08-17 07:23:07 +02:00
Enno Rehling
138a4c10a0
properly create missing monster faction when spawning dragons.
...
remove cached monster faction (static).
Conflicts:
src/kernel/faction.c
2014-08-17 07:14:47 +02:00
Enno Rehling
8f09ab73d9
fix display of alliance status, some English translation hiccups.
2014-08-17 00:14:50 +02:00
Enno Rehling
cef068fe9b
cut the number of allocations for order-data in half.
...
started writing a test file for orders.
2014-08-16 23:26:31 +02:00
Enno Rehling
bb9d59bac5
read turn file before sending
2014-08-16 18:57:06 +02:00
Enno Rehling
d880de0b2a
fix preview send script
2014-08-16 18:23:44 +02:00
Enno Rehling
8803a9e9a8
properly create missing monster faction when spawning dragons.
2014-08-16 13:46:34 +02:00
Enno Rehling
90ec28fed3
fix missing monster factions.
2014-08-16 13:33:47 +02:00
Enno Rehling
fa52bb4192
pointless assert triggers when new units are created and placed.
...
spawning dragons was causing this to fail.
2014-08-16 13:19:00 +02:00
Enno Rehling
9587e9f0cd
remove unused variables
2014-08-16 12:02:45 +02:00
Enno Rehling
2fd085d1e5
Merge branch 'master' of https://github.com/eressea/server
2014-08-16 11:59:20 +02:00
Enno Rehling
8cc4a53077
cron for eressea previews
2014-08-16 11:43:46 +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
41d42fa248
localization of alliance status "ALL".
...
fix for https://bugs.eressea.de/view.php?id=1993
2014-08-16 03:07:37 +02:00
Enno Rehling
643e2bc40f
Merge branch 'CTD1-Bug-1525-and-1872'
2014-08-14 20:09:06 +02:00
Enno Rehling
61ebd1d6b7
fix accidental assignment instead of comparison.
2014-08-14 20:08:29 +02:00
Enno Rehling
fa0c999d3e
Merge branch 'Bug-1525-and-1872' of github.com:CTD1/eressea-server-bugfixing into CTD1-Bug-1525-and-1872
2014-08-14 20:06:14 +02:00
Enno Rehling
158d4f8d4b
MSVC: compile cleanly with level 4 warnings
2014-08-14 19:39:45 +02:00