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

4525 Commits

Author SHA1 Message Date
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 576c963029 these tests are part of make test now 2014-02-21 23:17:48 -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 5cf31189e6 remove obsolete unity build 
I used to speed up compilation by reducing the number of compilation
units with this hack. It's no longer done this way, so let me kill the
supporting files here.
 2014-02-17 11:25:53 -08:00
Enno Rehling 716b1ed498 update submodules, determine number of CPU cores. 2014-02-17 19:50:57 +01:00
Enno Rehling b795602b5d const-correctness: fumbles are not allowed to change castorder 2014-02-17 02:26:59 -08:00
Enno Rehling 3db9fcf82f Rename some German symbols to English. 
I felt like I needed to make a commit today.
 2014-02-17 02:20:54 -08:00
Enno Rehling 8e611d759d eliminate intellisense warnings. 
OCD kind of stuff. Visual Studio complains about these, but they aren't
really anything severe.
 2014-02-16 13:48:07 -08:00
Enno Rehling 3e2ee057c6 Merge pull request #1 from hochl/master 
Mentoring session
 2014-02-15 19:19:29 -08:00
Thomas Troeger 59d5c1e94f added missing case for `AT_DRAIN_EXP' (bug 1514). 
added assert that triggers if a unit has no faction.
 2014-02-16 04:12:31 +01:00
Thomas Troeger 2da0d0f783 Merge branch 'master' of git://github.com/eressea/server 2014-02-16 03:25:04 +01:00
Enno Rehling 55b1a9038c fix this test to work in E2 and E3 2014-02-16 03:24:23 +01:00
Thomas Troeger c431b5cdac Merge branch 'master' of git://github.com/eressea/server 2014-02-16 03:08:03 +01:00
Enno Rehling cb23d88a2e add a test for bug 1514, proving that shadowmaster display is broken 2014-02-16 03:06:56 +01:00
Thomas Troeger 10434706f6 Merge branch 'master' of git://github.com/eressea/server 2014-02-16 00:55:17 +01:00
Enno Rehling 2e626be090 add a test to make sure that elvenhorses require riding 5 2014-02-16 00:51:43 +01:00
Thomas Troeger 0d917ae76e Merge branch 'master' of git://github.com/eressea/server 2014-02-15 23:27:16 +01:00
Enno Rehling 138e0dcc40 add a test to check that demons eat peasants 2014-02-15 23:09:18 +01:00
Enno Rehling 1594c7a71b fix a bug in the lua binding for writing a single unit 2014-02-15 23:08:48 +01:00
Enno Rehling 6ff110ae36 add a configuration option to stop peasant growths, for testing 2014-02-15 23:08:11 +01:00
Thomas Troeger cc830bb124 - added `build.lua' script published by Enno. 2014-02-07 19:35:30 +01:00
Enno Rehling 29124b92e2 Bug 1984: length of ship description is longer than a name, size buffer 
appropriately.
 2014-02-06 10:45:52 +01:00
Enno Rehling a774f882e5 fix a test that compared structs 2014-01-07 06:47:20 +01:00
Enno Rehling e0ce8877a5 increase buffer size for descriptions to 8K. http://bugs.eressea.de/view.php?id=1984 2014-01-05 19:13:06 -08:00
Enno Rehling 0f0cda214f fix http://bugs.eressea.de/view.php?id=1983 
message-type hashes were not initialized.
 2014-01-05 12:50:13 -08:00
Enno Rehling 99151e209b type conversion binds stronger than trinary operator 2014-01-04 20:15:16 +01:00
Enno Rehling 0d0b827699 make submodules refer to public URLs 2014-01-04 01:23:58 +01:00
Enno Rehling b214fc10cc Merge branch 'master' of github.com:eressea/server 2014-01-02 22:08:15 -08:00
Enno Rehling 5af91b21aa compile on VS2010, without C11 2014-01-02 22:00:52 -08:00
Enno Rehling 6412d3bbf8 remove the fallback password. 2014-01-01 20:29:08 -08:00
Enno Rehling 3660c47afb remove os.[hc] in favor of generated config.h 
new cmake files to find lua
 2014-01-01 19:14:26 +01:00
Enno Rehling 4a08cdd23e repair UTF8 order parsing 
probably broke the old latin1 parsing, but who cares?
 2013-12-31 09:27:42 -08:00
Enno Rehling 96b3e302be fix a bug reading gamedata 
n is not a loop variable, it is purely for use as a temporary here.
 2013-12-31 08:37:17 -08:00
Enno Rehling 6b5a28cd98 updated submodule 2013-12-31 10:35:16 +01:00
Enno Rehling 24000ec5a3 Merge branch 'master' of github.com:eressea/server 2013-12-31 10:29:40 +01:00