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

4570 Commits

Author SHA1 Message Date
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
Enno Rehling 1444ee58f2 kill XEBALLOON etc, fix some strings 2014-06-22 10:43:05 -07:00
Enno Rehling 2c831230a0 Added a test for expensive skills. 
When resetting the game rules, make sure basic resources (money, hp, person) are initialized.
 2014-06-22 07:55:14 -07:00
Enno Rehling 43dc69d94a copy/paste error 2014-06-21 14:44:40 -07:00
Enno Rehling d9972a9da9 call init_skills when not using JSON config 2014-06-21 14:39:56 -07:00
Enno Rehling 762f1e467b integration test for STUDY. 2014-06-21 09:17:10 -07:00
Enno Rehling bfadc4914f add JSON configuration to skills, and tests 2014-06-21 08:53:14 -07:00
Enno Rehling 46f6628a08 remove obsolete commands (PRAY) and parameters 2014-06-21 07:34:36 -07:00
Enno Rehling 198e95d6e2 slickedit project updat 2014-06-21 07:33:55 -07:00
Enno Rehling bff25f3c51 move skill_t into a separate file, give it unit tests. 
name functions the same as we did for keyword/direction earlier.
to do: json configuration and lua test.
 2014-06-20 23:59:04 -07:00
Enno Rehling ceabbebc90 switch remaining flags from unsigned to int. 2014-06-18 20:53:06 -07:00
Enno Rehling e4fa797590 Merge branch 'master' of github.com:eressea/server 2014-06-18 20:48:56 -07:00
Enno Rehling 46f68493bc eliminate debug message 2014-06-18 20:48:26 -07:00