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

4325 Commits

Author SHA1 Message Date
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 a9986329d3 configuration data for E3, with new catalog. 2014-04-20 19:20:36 +02: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 bcc116825b latest cutest revision 2014-04-11 09:51:37 -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 5374332c00 Merge branch 'master' of github.com:eressea/server 2014-03-22 21:48:54 +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 443583a6d6 fix intermittent test for e3 building owners 2014-03-17 08:52:33 +01: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 0a0d70bb1d fix recruiting tests. peasant growth is too random to calculate. 
add current critbit module
 2014-03-17 06:47:57 +01:00
Enno Rehling edae097591 updated bindings 2014-03-17 04:01:52 +01:00
Enno Rehling fe7eb0bdeb fix gitmodules urls 2014-03-16 23:24:38 +01:00
Thomas Troeger d2267db53a - minor spelling fix. 2014-03-16 23:18:00 +01:00
Thomas Troeger 33b68ecc19 - moved test for bug 1738 to better location. 2014-03-16 23:17:48 +01:00
Thomas Troeger 5b86fcb744 - added test to reproduce bug 1738. 2014-03-16 23:16:40 +01:00
Enno Rehling a32e1cd127 fix missing includes 2014-03-16 22:34:05 +01:00
Enno Rehling ac3401431c all build scripts get smart directory detection 2014-03-16 14:19:52 -07:00
Enno Rehling 632322a445 additional testing 
improved directory detection in build script
 2014-03-16 14:19:51 -07:00
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