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

331 Commits

Author SHA1 Message Date
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 19a21772e4 stop tests from crashing 2014-05-04 15:54:56 -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 1588d31a7e fix test runner 2014-04-24 15:39:14 +02:00
Enno Rehling 921ab4947e fixing xml config for e2 and e3 2014-04-24 06:24:35 -07:00
Enno Rehling e5b54ba953 Merge branch 'master' of github.com:eressea/server 2014-04-24 14:41:21 +02:00
Enno Rehling c1b840b0b2 remove -Cef, parse any arguments as a file to run. 
new xml config file, work in progress, xinclude is broken
 2014-04-24 14:41:04 +02:00
Enno Rehling 2cc21b265d remove GM command, remove gm-attributes from data when writing. 2014-04-22 21:42:32 -07:00
Enno Rehling 45168eb7e9 Merge branch 'master' of github.com:eressea/server 2014-04-22 07:21:34 -07:00
Enno Rehling 0d05ae77a3 remove stupid pragmas 2014-04-22 07:21:29 -07:00
Enno Rehling fa5dc43b98 reorganizing the way configuration data is read (WIP) 2014-04-20 09:36:25 -07:00
Enno Rehling ae68a1beaf add a script that runs all tests 
clean up the build scripta bit
bind ship type
 2014-04-12 05:25:21 +02: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 e99b69d76e need to cast this to (char) after all, for non-arm architectures. 2014-04-11 18:25:07 -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 dde8d35b3d test that EXPORT_REGIONS doesn't export anything else 2014-03-22 17:46:08 +01:00
Enno Rehling 6e0286b9a9 fix broken test 2014-03-22 17:43:34 +01:00
Enno Rehling a986640ef6 json export for planes. untested. old tests broken. WIP 2014-03-22 01:56:00 -07:00
Enno Rehling 52e64ac418 this single-use macro doesn't belong there 2014-03-17 00:42:46 -07:00
Enno Rehling 1ec18b8fd9 better SWAP() macro 2014-03-17 00:28:13 -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 edae097591 updated bindings 2014-03-17 04:01:52 +01:00
Enno Rehling a32e1cd127 fix missing includes 2014-03-16 22:34:05 +01:00
Enno Rehling 632322a445 additional testing 
improved directory detection in build script
 2014-03-16 14:19:51 -07:00
Enno Rehling eba61c1cda handle empty world 
and add tests for it
 2014-03-16 11:17:47 -07:00
Enno Rehling e350b8a146 rebuild lua bindings 
fix json export
add a script to reset submodules
 2014-03-16 02:12:49 -07:00
Enno Rehling 7845de0403 json import of regions 
this is terribly untested, it barely compiles.
 2014-03-16 01:51:08 -07:00
Enno Rehling 3c706cf29b replace bool.h with autoconf 
Most of the bool configuration was already happening there, no reason
for a separate file.
 2014-03-15 22:24:18 -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 1a4cb16ea8 fix the unused macro, remove inline functions 
simplification is good
 2014-03-15 20:33:43 -07:00
Enno Rehling 8e42cb8143 remove old inline cruft 
fewer macros = better
 2014-03-15 14:52:04 -07:00
Enno Rehling 8db8dbeefd fix usage of access() 
those were the wrong constants.
 2014-03-15 14:36:55 -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 fc1a56d46a rename export to json. 
this may or may not have been a good idea, but for now, that is what I
choose.
 2014-03-14 22:30:07 -07:00
Enno Rehling 7256b4c04f fix json export test 
using features from new storage module version.
 2014-03-13 23:59:26 -07:00
Enno Rehling dd3de9a1d7 bindings for the json export. 
+ unit test (incomplete).
 2014-03-13 15:33:44 +01:00
Enno Rehling e8b28725e1 do not run tolua inside MSVC 
The cmake rules for this do not work.
 2014-03-08 04:28:04 -08:00
Enno Rehling e9bc92608c add the .pkg files so we do not need to build them. sometimes tolua is not installed. 2014-03-08 10:30:39 +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 804b8192ea Merge branch 'master' of https://github.com/eressea/server 2014-03-06 19:14:16 -08:00
Enno Rehling 528dd4b81f remove latin1 characters from some files 
experimenting with .gitattributes some more
 2014-03-06 19:12:12 -08:00
Enno Rehling 40d7d236ac export to a stream 
can write a dict of simple regions now.
 2014-03-06 08:05:26 -08:00
Enno Rehling 18203cfdbf begin writing a map exporter 2014-03-06 07:15:43 -08:00
Enno Rehling afe355e9b9 begin creating a make install target. 
add a script to set up PATHs for cmake
 2014-03-02 12:20:49 -08:00
Enno Rehling ace886a2d3 added a test for saving/loading descriptions (bug 1984). 
added bindings for ship descriptions.
fixed test framework, so make test will show failures in lua.
 2014-03-02 10:55:35 -08:00
Enno Rehling bf2bb7449b move bindings into src/ make the code compile from scratch again. 2014-02-22 00:32:59 -08:00
Enno Rehling d9abce13a1 add lua integration tests to `make test`. 2014-02-18 06:08:37 +01:00
Enno Rehling 636f50e503 Merge branch 'master' of github.com:eressea/server 2014-02-18 06:05:52 +01: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
Enno Rehling 3a824eb859 Do not try to load a default lua file. 
The default behavior is now that the game goes to the console without
loading setup.lua, unless setup.lua is specified in eressea.ini as the
script to be run.
Should add an option to override this from the command line, too.
 2014-02-17 11:51:57 -08:00
Enno Rehling b795602b5d const-correctness: fumbles are not allowed to change castorder 2014-02-17 02:26:59 -08:00
Enno Rehling 07a57fadaa fix gcc errors, mostly reading unsigned values. 2013-12-31 10:29:00 +01:00
Enno Rehling 77ab9133c2 use the storage submodule everywhere. 
make most magic use float instead of double.
 2013-12-31 01:06:28 -08:00
Enno Rehling 1b88d13e75 fixing library dependencies and include paths 2013-12-31 09:05:52 +01:00
Enno Rehling a2d6881f61 fix use of curses on windows. 
workaround for curses defining its own boolean type.
 2013-12-28 22:58:39 -08:00
Enno Rehling c070cb5df8 delete obsolete files 2013-12-27 02:15:43 +01:00
Enno Rehling bef560d92a Fix xml catalog references for E2 and E3. 
Fix a bug in the new get_arg function.
 2013-12-27 01:54:02 +01:00
Enno Rehling ca79c28eaf kill empty folder 2013-12-27 01:07:55 +01:00
Enno Rehling 6fe246114c import local changes from gelbbaer. 
fix argument parsing to not crash when arguments are missing.
 2013-12-26 22:57:43 +01:00
Enno Rehling 63a8c10f84 split the cflags settings over more files 2013-05-04 17:29:39 -07:00
Enno Rehling 935ba67d27 update to latest CMakelists.txt build files 2013-05-04 15:47:53 -07:00
Enno Rehling 7975249f6a moving the find_package calls out into the parent project(s). 2013-05-04 14:20:30 -07:00
Enno Rehling 18c0d034d2 Merge branch 'master' of bitbucket.org:enno/eressea 2013-05-02 03:52:36 +02:00
Enno Rehling b4b8c49934 use getters/setters to access unit::race 2013-05-02 03:50:24 +02:00
Enno Rehling 71fd2a4739 include curses in linker and include flags 2013-05-01 13:24:53 -07:00
Enno Rehling 64046250d4 confusion, merge latest changes 2013-02-23 17:27:50 -08:00
Enno Rehling f19f4b3037 add an easy configuration script 
update core and cmake submodules to latest version
now using lua 5.2
now using bool where available
 2013-01-22 00:38:54 -08:00
Enno Rehling 3d7be88bad Working on http://bugs.eressea.de/view.php?id=1946 (WIP) 2012-10-21 19:48:40 -07:00
Enno Rehling f7edcf589a update to latest version of the eressea module 
fixes for bool type
fixes for lua 5.2
fixes for some intermittent tests
 2012-07-09 02:51:48 +02:00
Enno Rehling ecc03a7f2c make e3 server work with new bindings library 2012-06-10 22:33:05 +02:00
Enno Rehling bff66773cf update the arda server to use submodules and new cmake layout 2012-06-07 12:44:25 -07:00
Enno Rehling 10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling 4e7a758a75 making server compile with new github repository layout 
todo: fix scripts and config files
 2012-06-04 21:45:25 -07:00
Enno Rehling bc8ae48cc9 Make this stuff compile on MSVC 2012-06-03 23:39:32 -07:00
Enno Rehling 8c5c6aa911 complete rewrite of cmake files 2012-06-03 18:55:52 -07:00
Enno Rehling aa16d796f2 fix some slight compilation issues 2012-06-01 18:04:50 -07:00
Enno Rehling 09336e35e8 make tests 
do not write a logfile during tests
 2012-06-01 17:59:01 -07:00
Enno Rehling 889ef08189 Moving some things around in the external directory. 
I am deliberately breaking the VS2010 projects with this.
I am probably breaking the Eressea server.
 2012-05-30 19:17:08 -07:00
Enno Rehling 8ca04a02aa fix region owner when a building transfers 2012-05-26 10:43:37 -07:00
Enno Rehling 10ff86f34e mages have spellbooks now 2012-05-26 08:19:30 -07:00
Enno Rehling f2598e8bdc comparisons to boolean constants are dumb. 2012-05-23 22:23:32 -07:00
Enno Rehling f2643e79b6 fix find_spell and create_spell to only create each spell once. 
kill register_spell
make some critbit changes (need to transfer them upstream)
 2012-05-22 18:44:54 -07:00
Enno Rehling e2a6bbbb72 better command line parsing 
fix compilation problem
 2012-05-22 14:53:46 -07:00
Enno Rehling 338a0fae4a commandline argument parsing improved. 2012-05-21 18:10:42 -07:00
Enno Rehling 8168a6c5ec new test file. this project structure needs to be redone sometime 2012-05-19 11:27:32 -07:00
Enno Rehling 07a75b6660 new gcc spouts more warnings, fix them. 2012-05-18 21:25:21 -07:00
Enno Rehling 3d50745d77 ship and building owners encapsulated in accessors 2012-05-17 15:23:44 -07:00
Enno Rehling 76ba2b9303 begin making shipowner use ship->owner. 2012-05-17 00:14:05 -07:00
Enno Rehling 1f0d5f205e rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:12 -07:00
Enno Rehling ecac1adb1b rename _log_error to log_error and get rid of the cumbersome #define 2012-05-16 16:52:01 -07:00
Enno Rehling 3c1982da4c improve logging verbosity 
adapt to changes in log module
 2012-05-16 09:49:28 +02:00
Enno Rehling 5de2e790a3 I believe that these are alsways non-zero. 2012-05-15 15:02:21 -07:00
Enno Rehling 5a8a1704e7 disable and remove wisps, because they are so very, very broken. 2012-05-12 12:39:49 -07:00
Enno Rehling ea7eaf87aa spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:23:40 -07:00
Enno Rehling c6b8f4c491 unused variables are unused 2012-05-09 18:37:31 -07:00
Enno Rehling fda365cd84 Remove some unused variables to make gcc happy. 2012-05-10 03:34:48 +02:00
Enno Rehling 06a4a7051b combat spell functions have the same interface as spells now. 2012-05-09 18:28:03 -07:00
Enno Rehling 360f00d44f cleaning up castorder, unifying access to target region and caster. 2012-05-09 14:16:51 -07:00
Enno Rehling 4f0bdca3ba improved familiar race selection. 2012-05-09 10:42:11 -07:00
Enno Rehling 2c28ea1c41 replace spellid_t with unsigned int 2012-05-09 03:13:49 -07:00
Enno Rehling 03f74f0a47 fix a crash where wolves have not enough firce 2012-04-16 06:58:03 +02:00
Enno Rehling 3c51bc1138 Merge branch 'master' of /home/eressea/repo/eressea 2012-03-05 04:25:26 +01:00
Enno Rehling d9a41301d4 add missing return, stop a crash 2012-03-05 04:25:23 +01:00
Enno Rehling 71d9f68b3e faction stealth is only selectively enabled in E3 
do not show spell messages when no items are given (in seduce)
 2012-03-04 19:24:27 -08:00
Enno Rehling 05aba860f0 http://bugs.eressea.de/view.php?id=1855 
fixing delayed-action potions.
 2011-06-04 11:20:04 -07:00
Enno Rehling 835f51c512 eliminate region_list usage from the monster pathfinder 2011-04-25 22:20:27 -07:00
Enno Rehling d8abd09076 rconnect is not as nice as get_neighbours 2011-04-24 17:44:00 -07:00
Enno b95f663087 compiling with -pedantic on linux 2011-03-08 08:42:31 +01:00
Enno Rehling 01acb1e7f6 indentation rules, slightly updated 2011-03-07 08:24:52 +01:00
Enno d940f29a6c indentation rules, slightly updated 2011-03-07 08:24:48 +01:00
Enno 347a888b67 indentation rules, strictly applied 2011-03-07 08:03:10 +01:00
Enno Rehling 27e435850e indentation rules, strictly applied 2011-03-07 08:02:35 +01:00
Enno Rehling 71988d9912 remove cvector.[hc] completely 2011-02-27 20:53:19 -08:00
Enno Rehling 7d4205a3d1 Fix carts in E3. 
Store fighters in a quicklist, not a cvector.
 2011-02-27 12:04:29 -08:00
Enno Rehling 1898dbe13a We have put the spoils code into the open source parts of the code. 2011-02-27 00:37:08 -08:00
Enno Rehling 9fcf31f44e Merge branch 'master' of ssh://eressea_git/home/eressea/repo/eressea 2011-02-26 00:31:31 -08:00
Enno Rehling e8aa30c673 spell_list removal in shared code needs to be reflected in eressea. 2011-02-26 00:30:54 -08:00
Enno e882033359 Merge branch 'master' of /home/eressea/repo/eressea 2011-02-25 16:28:51 +01:00
Enno Rehling e3dbd71137 test alliance memberlist 2011-02-25 07:28:27 -08:00
Enno Rehling c9f0391177 The list of alliance members is now also a quicklist, and the lua binding for faction_list iteration can disappear. 2011-02-25 07:23:02 -08:00
Enno 44e4c44a2d Merge branch 'master' of /home/eressea/repo/eressea 2011-02-24 08:27:31 +01:00
Enno Rehling 0ad43a9586 Jamfiles are history. CMake is the future and the present. 2011-02-23 23:26:58 -08:00
Enno Rehling 85d9aff2e9 Added quicklist, a linked list with better cache characteristics. 2011-02-23 22:18:58 -08:00
Enno 4a91dcdc73 Merge branch 'master' of /home/eressea/repo/eressea 2011-02-22 07:01:43 +01:00