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

395 Commits

Author SHA1 Message Date
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
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 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 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 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 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 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 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 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 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 d9972a9da9 call init_skills when not using JSON config 2014-06-21 14:39:56 -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 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 eb567918e5 forgot to init the bindings for game.pkg 
next problem to solve: skills
 2014-06-17 23:50:13 -07:00
Enno Rehling 3625ba6a95 remove static variables optimizations, they create global state that is bad for testing 2014-06-17 23:10:55 -07:00
Enno Rehling 8166519d30 add a list of valid coasts to ship definition in JSON. 
fix endless loop in error-line counting.
 2014-06-17 21:33:42 -07:00
Enno Rehling b6b790d7e7 add a config.reset function to clear configuration state before tests. 2014-06-17 08:46:22 -07:00
Enno Rehling 0675c50c7f keyword lookup macro 2014-06-16 23:05:39 -07:00
Enno Rehling 5c78a3883e cleaning up terrains, reading race flags from a JSON array 2014-06-16 22:43:40 -07:00
Enno Rehling 33928568cf finally have all the scaffolding to write a test with ships. 
configure terrain flags from json.
ships are always allowed to enter SEA regions.
 2014-06-16 22:19:19 -07:00
Enno Rehling b40ddaeaa1 add test for keyword aliases, add keyword to strings for reverse lookup 2014-06-16 20:41:08 -07:00
Enno Rehling 0af5e96e3a Renaming keyword tokens to English. 2014-06-16 20:16:06 -07:00
Enno Rehling 249a4390c4 read keyword translations from JSON configuration. 2014-06-16 11:30:23 -07:00
Enno Rehling 645a7fcde6 fix keyword translations, they use critbit, not tokens 2014-06-16 10:32:30 -07:00
Enno Rehling 6a20594fd3 renamedtest files in the rest of the makefiles, too. oops. 2014-06-16 08:07:08 -07:00
Enno Rehling 125fd519a8 rename test files. 
add tests for keyword.c, incomplete.
 2014-06-16 08:01:59 -07:00
Enno Rehling c8dc6be6f2 rename get_keyword, because something else should have that name. 2014-06-16 07:19:22 -07:00
Enno Rehling 64e0c221ec directions can now be read from json configuration. 
rename a couple of functions for more consistency across modules.
 2014-06-15 22:17:08 -07:00
Enno Rehling acbef7a3a0 fix missing locales initialization 2014-06-15 21:19:47 -07:00
Enno Rehling a9f0538d8e keyword_t and direction_t are moving into their own module. 
direction parser gets new initialization function, for use in jsonconf later.
add unit tests for directions.
 2014-06-15 18:34:39 -07:00
Enno Rehling 812cb98dff begin binding locales (need to init_locales in the right place, still). 
fix indentation in some places.
add some assertions.
 2014-06-14 07:52:32 -07:00
Enno Rehling 24dc006e43 fix json config for terrains, some other stuff. 2014-06-13 17:36:05 -07:00
Enno Rehling 97c17b1afa Merge branch 'master' of github.com:eressea/server 2014-06-13 08:29:01 -07:00
Enno Rehling 6e56c56d39 read ships from config file (only very basic) and create them in a lua test. 2014-06-13 08:28:33 -07:00
Enno Rehling 5a82350037 fix broken xmlreader after most recent cahnges to 
race/ship_type/building_type creation functions.
 2014-06-12 22:30:13 -07:00
Enno Rehling d503937999 working on making json config understand ships and buildings. 
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
 2014-06-12 22:14:07 -07:00
Enno Rehling fa98528d72 remove old SQL patch code, we have sqlite now. 
rearrange the SlickEdit projects.
 2014-06-11 22:21:52 -07:00
Enno Rehling 28726e2bea update cmake to compile without sqlite3, curses or libxml2 installed. 
This is not actually recommended, but your system may not have
this,and you should still be able to contribute. also, libxml2 is on
the way out, I am beginning to really hate it.

Moving a couple of files around.
 2014-06-11 20:30:34 -07:00
Enno Rehling 42a86fc910 make sure that the skill bonus for races is signed, even on ARM where 
that is not necessarily the default.
 2014-06-09 21:36:43 -07:00
Enno Rehling 3dda5d3033 apply USE_LIBXML consistently, so tests can be built without libxml2 2014-06-09 20:51:29 -07:00
Enno Rehling a304b981d5 remove archetypes, they are not used by any existing game. 
make compiling with libxml2 optional (USE_LIBXML2)
disable xml reports
 2014-06-09 19:05:17 -07:00
Enno Rehling 3c4b6b9dd4 rename message.[hc] to messages.[hc] in kernel because of naming conflict with util/ 
begin json config files (WIP)
 2014-06-09 09:56:49 -07:00
Enno Rehling dceff481d7 json config files, beginning with races 2014-06-07 22:17:48 -07:00
Enno Rehling f43d8a3297 remove old gamecode-diabling logic 
it was old, and not in use.
 2014-06-07 10:36:50 -07:00
Steffen Mecke dc3eea0c70 take best unit and count amulet at most once for guards blocking movement 2014-06-04 11:04:17 +02:00
Enno Rehling 9940025a96 eliminate multiple warnings about missing default order 
fix e3 catalog file syntax
 2014-06-02 07:31:46 +02:00
Enno Rehling e17a3fc8fa eliminate remaining traces of the wisps spell 2014-06-02 07:22:07 +02:00
Enno Rehling 08c3d08d7d fix config.xml for test games 
update log levels for some common messages.
 2014-06-02 05:42:56 +02:00
Enno Rehling 6f29e4dab5 improve logging information (missing race, log levels) 
do nothing when thre is no peasant blood
 2014-06-01 11:07:22 +02:00
Enno Rehling d388a94f36 report missing itemtype before crashing 2014-05-24 20:35:00 -07:00
Enno Rehling 7038b021de fix counting of units, making it slower but more correct 2014-05-24 20:25:06 -07:00
Enno Rehling 649a43a27e sqlite updater, rewrite 2014-05-16 22:49:28 -07:00
Enno Rehling 515b582144 Merge branch 'master' of github.com:eressea/server 2014-05-10 11:45:14 -07:00
Enno Rehling c2329f7f2b changing unsigned flags to regular ints 
the storage library does not understand unsigned at the moment, and using the highest order bit causes trouble
new version of datafile
 2014-05-10 18:57:04 +02:00
Enno Rehling 0d087d6bb1 Merge branch 'master' of github.com:eressea/server 2014-05-05 19:15:32 -07:00
Enno Rehling 1e7e5877a1 Merge branch 'master' of github.com:eressea/server 2014-05-05 19:14:55 -07:00
Enno Rehling 86bc4e7aef reading and writing the NPC flag was broken, because flags were a fully loaded unsigned int. making it an int instead, and adding a test. 
fixing a bad test in which shadowmasters were deserting to faction null (causing a crash).
 2014-05-05 19:11:40 -07:00
Enno Rehling 465f3f7ce9 Merge branch 'master' of github.com:eressea/server 2014-05-05 00:00:10 -07:00
Enno Rehling cb458db9a1 updating eressea.db, not with a fixed game-id 2014-05-04 22:49:06 +02:00
Enno Rehling 535a9e6e53 fix number of units in the report header 2014-04-26 12:24:51 -07:00
Enno Rehling 35c2baafbe do not read turn file for turn 0 2014-04-25 07:47:23 +02:00
Enno Rehling 0d05ae77a3 remove stupid pragmas 2014-04-22 07:21:29 -07:00
Enno Rehling 9aeb0f6b86 make build script figure out how many jobs to run 2014-04-11 19:41:17 -07:00
Enno Rehling 7358c48580 removing some naming conflicts that hapen when trying to re-enable amalgamation builds. 2014-04-11 19:41:17 -07:00
Enno Rehling b769be0f60 invalid tests for some architectures (char is not guaranteed to be signed or unsigned) 
fix tests on ARM
 2014-04-11 09:46:03 -07:00
Enno Rehling 0d8a196491 create report directory before writing reports.txt 2014-03-22 23:14:36 +01:00
Enno Rehling b399356971 Revert "remove GM command" 
there is a saved attribute that needs this
This reverts commit 7e529f2b4c.
 2014-03-22 21:49:18 +01:00
Enno Rehling a986640ef6 json export for planes. untested. old tests broken. WIP 2014-03-22 01:56:00 -07:00
Enno Rehling 6e3ed568ea fix lua test for blessed harvest. 2014-03-17 08:21:35 +01:00
Enno Rehling 7e529f2b4c remove GM command 
this was a command from the very early days, when we had player-made
quests. It is no longer in use.
 2014-03-16 23:40:51 -07:00
Enno Rehling 0ae8737062 rename MIN/MAX to _min/_max 2014-03-16 05:03:17 +01:00
Enno Rehling 70cee3c6e5 remove any dependency on stat. 2014-03-15 20:41:58 -07:00
Enno Rehling 9fc926864e Fixes for Visual C++ 
snprintf and strncasecmp are not that.
_access needs to be fixed on gcc, next.
 2014-03-15 12:35:20 -07:00
Enno Rehling 1a7d892a96 use cmake for autoconf, slim down platform.h 2014-03-15 19:29:11 +01:00
Enno Rehling e9b9c9783a export factions, too 
give this a header and some flags so we can choose in detail what to
export.
 2014-03-07 08:03:53 -08:00
Enno Rehling 03c247c788 I am killing the core/ directory. 
Lots of files are moving to a new location in src/
Some intersting CMake changes.
 2014-02-18 05:45:00 +01:00