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

4498 Commits

Author SHA1 Message Date
Enno Rehling 54a3c2e070 recycle quota is always 0.5 in every game, no reason to toch this. 2014-06-30 19:25:08 -07:00
Enno Rehling 927ada92b6 improve construction data in JSON. 
test castle naming function
 2014-06-30 19:21:42 -07:00
Enno Rehling e39336e87a move declaration to top of block 2014-06-29 20:09:21 -07:00
Enno Rehling 5e356bc5fe Merge branch 'TomBraun-master' 2014-06-29 20:06:16 -07:00
Enno Rehling 7a6b237de0 Merge branch 'master' of github.com:TomBraun/server into TomBraun-master 
Conflicts:
	src/kernel/build.c
	src/kernel/item.c
 2014-06-29 20:05:44 -07:00
Enno Rehling 9dcf5bbf4c fix a crash for invalid race enums 2014-06-29 19:15:03 -07:00
Enno Rehling 12661fc373 new_itemtype has been replaced, delete it. 2014-06-29 19:09:37 -07:00
Enno Rehling 22f64abaf2 caching get_race() calls 2014-06-29 19:04:30 -07:00
Enno Rehling c3dfbdea18 eliminate new_race array in favor of a function (TODO: make it fast) 2014-06-29 18:10:02 -07:00
Enno Rehling 11a264742b appearance is something only items have, so move it to item_type 2014-06-29 17:35:37 -07:00
Enno Rehling 2a00301949 unused variable 2014-06-29 17:31:33 -07:00
Enno Rehling 062ba71bd7 fix reading items in xmlreader (still has no tests) 2014-06-29 17:29:41 -07:00
Enno Rehling 5d32896407 rt_register is no longer required, new_resourcetype replaced by rt_get_or_create. 2014-06-29 17:02:45 -07:00
Enno Rehling 95929a99b5 we are about to remove rt_register, but not quite yet. 2014-06-29 16:46:42 -07:00
Enno Rehling 773f3767d3 eliminate cb_items 2014-06-29 16:41:03 -07:00
Enno Rehling 7ee6f0444d reduce use of cb_items, because we want to remove it. 2014-06-29 16:39:53 -07:00
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