Enno Rehling
7249630e3c
Eliminate some Visual Studio warnings, rename itemnames->resourcenames.
2014-06-29 15:41:04 -07:00
Enno Rehling
16be68ada3
Merge branch 'master' of github.com:eressea/server
2014-06-29 13:29:23 -07:00
Enno Rehling
28d2984bc8
disable castle tests, they aren't good yet
2014-06-29 13:29:12 -07:00
Enno Rehling
2e4adddb8f
Merge branch 'master' of github.com:eressea/server
2014-06-29 21:51:41 +02:00
Enno Rehling
2af434cfef
installing build 676 in production
2014-06-29 21:51:28 +02:00
Enno Rehling
1000c1f911
random encounters in land regions only (nobody will ever enter a firewall, and astral plane shouldn't have it either)
2014-06-29 12:47:11 -07:00
Enno Rehling
6bd2b3be26
add a test for stone golems building castles.
...
fix a bug when stone golems use themselves up.
2014-06-28 23:58:00 -07:00
Enno Rehling
0187567010
disable castle tests
2014-06-28 16:58:56 -07:00
Enno Rehling
a48cca5db8
building naming function configured from JSON (this needs work).
...
started writing tests for castles.
2014-06-28 16:55:28 -07:00
Enno Rehling
ba53c90b9c
Release/Debug builds support
2014-06-28 16:54:10 -07:00
Enno Rehling
612dfea36f
Merge branch 'master' of github.com:eressea/server
2014-06-28 16:39:54 -07:00
Enno Rehling
89e7a7826f
added some tests for building buildings.
2014-06-28 16:19:46 -07:00
TomBraun
c31c436cc7
change u->number >> 0 to u->number>0
2014-06-28 20:45:17 +02:00
Enno Rehling
34ce9a0573
JSON configuration can read strings, with test.
2014-06-28 10:37:40 -07:00
Enno Rehling
9cf03d081e
missing compilation unit
2014-06-27 07:57:48 -07:00
Enno Rehling
9e21f1d05e
Merge branch 'master' of github.com:eressea/server
2014-06-27 07:50:08 -07:00
Enno Rehling
9b01b71a19
config returns a value, so we can assert corrrect JSON syntax
2014-06-27 07:36:18 -07:00
Enno Rehling
7012740172
testing rules for riding
2014-06-26 23:41:07 -07:00
TomBraun
b346788e43
Merge remote-tracking branch 'eressea/server'
2014-06-27 07:35:21 +02:00
Enno Rehling
39f78354b9
Merge branch 'master' of github.com:eressea/server
2014-06-26 22:06:38 -07:00
Enno Rehling
06d92181fe
option for release builds
2014-06-26 22:05:17 -07:00
Enno Rehling
68aa903130
make tests pass through valgrind
...
introduce more #ifdef LOMEM to bitfield structs.
2014-06-26 21:48:01 -07:00
Enno Rehling
c5cf8bb3be
add some asserts, chasing a valgrind message
2014-06-26 21:27:50 -07:00
Enno Rehling
5e835618f3
fix weight calculation, uninitialized value
2014-06-26 21:02:03 -07:00
Enno Rehling
dba51bf0f7
remove duplicate handling of "speed" attribute in JSON
...
add weight and capacity in this test (still broken)
2014-06-26 19:11:34 -07:00
TomBraun
6ced596b13
Chang "git submodule update --init" with "clone --recursive"
2014-06-26 14:59:54 +02:00
TomBraun
99da4de9ad
Define "pf_generic cast = 0" and "pf_generic fumble = 0" early
...
Visual Studio 2013 express don't compile without errors if
this definition comes to late.
2014-06-26 07:20:59 +02:00
TomBraun
be4e02cc16
Merge remote-tracking branch 'upstream/master'
2014-06-26 07:37:30 +02:00
Enno Rehling
d0e2ad542a
tests for basic movement
2014-06-25 14:30:24 -07:00
Enno Rehling
12e15978b8
read weight, capacity and flags of items
2014-06-25 08:00:09 -07:00
Enno Rehling
af77a1d8e5
speed up float params, exploiting alphabetic sorting
2014-06-25 07:25:54 -07:00
Enno Rehling
07d10d9ab0
add tests for get_param functions
2014-06-25 07:22:39 -07:00
TomBraun
50ff812bb8
Add test Iron Golems now use the corect number of iron.
...
Test also Iron Golems can now create dwarfen only items
(makes irongolems usable for dwarfs)
2014-06-25 13:26:34 +02:00
TomBraun
d4fdddbc27
Iron golems can now create dwarfen only items
...
(makes irongolems usable for dwarfs)
2014-06-25 13:24:06 +02:00
TomBraun
0400bcafad
Iron and Stone golems now use the corect number of stones / iron.
...
0001946: Eisengolems stellen keine Waren her
http://bugs.eressea.de/view.php?id=1921
2014-06-25 13:22:42 +02:00
TomBraun
fa9ac186d7
Test a bug that crasehed the server
...
when Stonegolems created a new building and
the whole unite was consumed during this process
(could not enter the new building as no one was left in the unit)
2014-06-25 13:20:00 +02:00
TomBraun
84fb776d1c
Fixed a bug that crasehed the server
...
when Stonegolems created a new building
and the whole unite was consumed during this process
(could not enter the new building as no one was left in the unit)
2014-06-25 13:15:37 +02:00
Enno Rehling
a75d91fb6d
remove the last of the static item_type variables.
2014-06-24 23:13:18 -07:00
Enno Rehling
31c0e5c2a4
read items from JSON, with no properties yet
2014-06-24 22:54:10 -07:00
Enno Rehling
92f43a7b51
eliminate it_find calls, replace it_find with something backed by rt_find
2014-06-24 22:44:05 -07:00
Enno Rehling
9d24c3c291
testing resource caching
2014-06-24 19:51:06 -07:00
Enno Rehling
dc8a8cdd71
rt_find -> get_resourcetype optimization
2014-06-24 08:19:11 -07:00
Enno Rehling
d581737744
optimization: caching resource types in get_resourcetype.
...
eliminate some it_find calls.
eliminate static variables, they make testing hard.
2014-06-24 07:42:45 -07:00
Enno Rehling
98470ac3c3
Merge branch 'master' of github.com:eressea/server
2014-06-23 20:45:20 -07:00
Enno Rehling
958c04a8dd
Merge branch 'stm2-fix_block_movement'
2014-06-23 20:45:12 -07:00
Enno Rehling
a0c1d4a995
Merge branch 'stm2-fix_block_movement'
2014-06-23 20:43:47 -07:00
Enno Rehling
7adb8498aa
Merge branch 'fix_block_movement' of github.com:stm2/server into stm2-fix_block_movement
...
Conflicts:
scripts/tests/eressea.lua
src/kernel/move.c
2014-06-23 20:34:07 -07:00
Enno Rehling
77ee0b7af7
remote the item_t enum for good
2014-06-23 19:17:13 -07:00
Enno Rehling
73da14e305
getting rid of the olditemtypes[] array
...
reduce use of statics
reduce use of item_t enum
2014-06-23 07:28:10 -07:00
Enno Rehling
740b646e54
fix keywords
2014-06-22 12:38:11 -07:00
