Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
7685 commits 10 branches 0 tags 41 MiB
Commit graph

141 commits

Author SHA1 Message Date
Philipp Dreher
8200fdb6c2 moved files for flyingship to subdir "spells" 2015-11-02 15:40:26 +01:00
Philipp Dreher
3fa4c18e87 added files for new module "flyingship" 2015-11-02 00:26:23 +01:00
Enno Rehling
678169d7d4 add skeleton test suite for piracy 2015-10-12 11:54:59 +02:00
Enno Rehling
521519805d refactor piracy code into a module, separate from move. 2015-10-11 21:19:38 +02:00
Enno Rehling
3055f517dc move guard implementation into a module (WIP) 2015-09-12 22:53:54 +02:00
Enno Rehling
09efd9c2a9 fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +02:00
Enno Rehling
f1476c2167 refactoring: split out a module for race prefixes 2015-09-12 12:24:10 +02:00
Enno Rehling
d29d38f710 refactor donations into a seaprate code module, add a basic test 2015-09-09 15:45:20 +02:00
Enno Rehling
8562a6d072 add test suite for seen_region logic (empty) 2015-09-08 10:07:29 +02:00
Enno Rehling
9312b44f8e move seen_region logic to a separate seen.[hc] module for testing. 
currently failing test:

  1) Failure (tests.report.test_lighthouse):
  ./scripts/tests/common.lua:1051: true expected but was false
 2015-09-08 09:56:56 +02:00
Enno Rehling
71dea1eca7 backfill missing tests for herbsearch (alchemy). 2015-08-27 13:19:58 +02:00
Enno Rehling
a9ecd1f55e replace all at_travelunit code with travelthru_map calls. 
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
 2015-08-19 14:37:51 +02:00
Enno Rehling
ebe365fd6e move travelthru logic to a separate module. todo: split off the report writing from the collection of units. 2015-08-18 18:57:04 +02:00
Enno Rehling
b8a2b9d0b7 Merge pull request #7 from ennorehling/feature/bug-2101-study-teach-testing 
bug 2101: increase max printed length of orders
 2015-08-06 17:05:32 +02:00
Enno Rehling
11e1fab0d0 Merge branch 'hotfix-3.4.1' into feature/travis-migration 
Conflicts:
	.travis.yml
	s/build
	s/cmake-init
	s/runtests
	s/travis-build
	src/kernel/region.c
 2015-07-12 04:12:32 +02:00
Enno Rehling
cfb1812f24 fix building on RasPi 2015-07-12 03:08:29 +02:00
Enno Rehling
27835dc4e1 unit tests for STUDY and TEACH commands. 2015-07-09 13:24:21 +02:00
Enno Rehling
cc3c5580d4 rewrite and unit tests 2015-07-07 20:23:24 +02:00
Enno Rehling
80deef30b0 additional clang warning for tautological comparisons. 
added to catch a /Wall VS warning in Travis builds.
 2015-06-01 08:04:46 +02:00
Enno Rehling
59400b1e27 Merge branch 'release-3-5' into develop 
Conflicts:
	s/runtests
	src/buildno.h
 2015-05-24 14:10:42 +02:00
Enno Rehling
e99db198eb bugfix use_item (use_skillpotion did not use pool). 
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
 2015-05-24 07:17:23 +02:00
Enno Rehling
32298bd50d gcc: do not error on warnings that Visual Studio doesn't know about. 2015-05-20 07:30:59 +02:00
Enno Rehling
70eda58604 Merge branch 'develop' of github.com:eressea/server into develop 
Conflicts:
	src/CMakeLists.txt
 2015-05-17 17:52:41 +02:00
Enno Rehling
9418051cd3 make gcc warn about signed/unsigned comparisons, just like Visual Studio does 2015-05-16 22:35:07 +02:00
Enno Rehling
df325b243a enable stricter conversion checking for gcc < 4.9, fix code 2015-05-15 20:35:36 +02:00
Enno Rehling
062237b0d1 let CMake test for gcc 4.9 before enabling -Wfloat-conversion 2015-05-15 17:15:54 +02:00
Enno Rehling
eac4ef7ddc reduce conversion warning to float only 2015-05-15 13:32:22 +02:00
Enno Rehling
a46d60aa97 enable -Wconversion on gcc/clang builds 
fix some of the warnings coming out of that for battle.c
 2015-05-13 03:17:30 -07:00
Steffen Mecke
b41049da53 test good/bad dreams 2015-05-06 18:15:10 +02:00
Steffen Mecke
79d2c76c3f refining spy tests 2015-05-04 14:30:59 +02:00
Enno Rehling
9664f2b191 Implement an optional JSON report writer. Currently writes readable maps for Tiled. 2015-03-29 14:03:56 +02:00
Enno Rehling
7bfb14b4e6 Resolve naming confusion, rename object and bind_hashtable. 
They implement a dict-style thing, so let's call it that.
 2015-01-17 13:34:48 +01:00
Enno Rehling
4b6d65fb16 separate the game into a static library shared by server and tests. 2015-01-10 17:27:18 +01:00
Enno Rehling
8971f59ecc move more things out of config.c. 
- lighthouses into their own module.
- lastregion/firstregion into reports.c.
 2014-12-17 17:22:26 +01:00
Enno Rehling
2da1d11277 move chaos to a separate module (it is an old E2 feature) 2014-12-13 11:44:14 +01:00
Enno Rehling
1024dd5c81 Refactoring morale into a separate module. 
Not all of it yet, because it is inconveniently part of kernel/region.
 2014-12-10 19:04:02 +01:00
Enno Rehling
143fab9653 Some changes after talking to Don. 
moved locale change into its own module.
made monsters get a report by default.
reoved old creation.c code, it was dead.
 2014-11-06 07:15:53 +01:00
Enno Rehling
b2140f54fd refactor, move give_cmd into give.c 2014-11-03 08:44:26 +01:00
Enno Rehling
1af315ebf2 move magic out of kernel, into src. 
clean up/remove a ton of includes, especially of types.h (include in header if you need it, not in every .c file).
 2014-11-01 12:57:01 +01:00
Enno Rehling
81bfb598d0 refactoring modules, cleaning out the config.c kitchen sink. 
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
 2014-11-01 12:09:56 +01:00
Enno Rehling
4527ffdda2 refactoring and tests for wormhole module. 2014-09-29 23:19:59 +02:00
Enno Rehling
cf1f3972b6 cleaning out config.c, there is too much code in there. 
rules should be in their own modules. here:
upkeep is a concept all by itself, should have its own tests, etc.
movement code should be in move.c.
cleaning up some superfluous include directives.
 2014-08-31 16:50:37 +02:00
Enno Rehling
ae9ed99cd9 fixing linux build 2014-08-29 07:47:47 +02:00
Enno Rehling
932a615837 refactoring: special directions into their own file (vortex.c). 
moving spells.c out of spells.
figured that movewhere should be in move.c
 2014-08-27 21:30:24 +02:00
Enno Rehling
a9a0455207 reorganized directory structure. 
flattening the directory structure, moving some modules to the src/ directory.
making stealth a separate file, under test.
more tests for some stuff.
 2014-08-27 06:40:35 +02:00
Enno Rehling
804734d013 MSVC: disable level 4 warning C4100 for tolua-generated code (unused variable) 
make a single object from all generated binding code.
this setup is unusual, but easier to maintain.
 2014-08-14 19:39:17 +02:00
Enno Rehling
91eead0993 fix test runner 2014-08-07 13:23:11 +02:00
Enno Rehling
d9457a2488 rewrite of the Lua module system. 
At this time, only E2 is working.
Fixing a lot of old code (monster is no longer id 0).
package.paths configured from eressea.ini
install directory configured from eressea.ini
moving building_action into a seaprate module (it's deprecated)
 2014-07-26 22:52:25 +02:00
Enno Rehling
a4675c61fd installing resource files through cmake. 2014-07-17 15:55:50 +02:00
Enno Rehling
162375842b introducing new callback system 2014-07-03 05:10:53 -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
eb567918e5 forgot to init the bindings for game.pkg 
next problem to solve: skills
 2014-06-17 23:50:13 -07:00
Enno Rehling
125fd519a8 rename test files. 
add tests for keyword.c, incomplete.
 2014-06-16 08:01:59 -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
e27bde06ac bindings for error logging, phase 1. 
better error reporting for json parse errors.
 2014-06-13 13:02:03 -07:00
Enno Rehling
b84bf7ba56 add json configuration parser to lua bindings. 2014-06-12 17:39:09 -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
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
1588d31a7e fix test runner 2014-04-24 15:39:14 +02: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
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
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
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
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
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
ca79c28eaf kill empty folder 2013-12-27 01:07:55 +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
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
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
dd3f204a69 removing and moving to make a clean eressea-only repo 2010-03-06 14:32:20 -08:00
Enno Rehling
0e47409d6b duplication 2010-02-27 21:00:57 +00:00
Enno Rehling
a17bb2b9d9 making shit compile with cmake on unix 2010-02-27 20:36:48 +00:00