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

4795 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
5647905db3 Merge branch 'master' of github.com:eressea/server 2014-03-16 22:19:06 +01:00
Enno Rehling
480891ea2b new cutest submodule 2014-03-16 22:18:42 +01: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
82aeb4b241 fix windows slashes 
cmake doesn't like backslashes, but has the tools to fix them
added a build script for VS2013 (Version 12)
 2014-03-15 22:02:49 -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
d4caf29d4f remove the wrong constants. 2014-03-15 22:39:32 +01:00
Enno Rehling
8db8dbeefd fix usage of access() 
those were the wrong constants.
 2014-03-15 14:36:55 -07:00
Enno Rehling
2996f32e00 Visual Studio 2010 build script. 
more environment variables for easier customization.
 2014-03-15 14:04:45 -07:00
Enno Rehling
98b5d2a842 update autoconf for gcc (access) 2014-03-15 21:18:36 +01: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
4e8dd5f509 fix path specification 2014-03-15 12:17:20 -07:00
Enno Rehling
60b6f3ef45 rename file so it doesn't match the build directories by accident 2014-03-15 20:10:12 +01:00
Enno Rehling
60a7407a79 CLI build script for Visual Studio 2012 
This is just a test, isn't working yet.
 2014-03-15 12:06:19 -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
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