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

167 Commits

Author SHA1 Message Date
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