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

177 Commits

Author SHA1 Message Date
Enno Rehling ed23853c4d add valgrind option to runtests, use in travis builds 2017-10-10 21:30:53 +02:00
Enno Rehling b70f0e9977 do not allow install from the wrong branch 2017-08-24 16:57:02 +02:00
Enno Rehling 9e213d3bcd minor optimization and using fraction code 2017-05-26 19:05:46 +02:00
Enno Rehling c44e63e763 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2017-05-08 22:06:45 +02:00
Enno Rehling 4fdfbb44b5 this config.xml was added by accident. 2017-05-08 08:15:18 +02:00
Enno Rehling 7f9c85384a build script madness, again 2017-04-22 19:06:38 +02:00
Enno Rehling 9c6108f965 Merge branch 'master' into develop 2017-04-22 19:05:58 +02:00
Enno Rehling 376fc0265c Merge branch 'master' of github.com:eressea/server 
Conflicts:
	s/build
 2017-04-22 19:05:14 +02:00
Enno Rehling 1eb189cf47 shell wants spaces around = for string compares? 2017-04-22 19:03:08 +02:00
Enno Rehling 1e3abb3df6 Merge branch 'master' into develop 2017-04-22 18:58:52 +02:00
Enno Rehling bda395d374 shell wants ==, not = for string compares? 2017-04-22 18:57:57 +02:00
Enno Rehling e938350acd add cmake as part of main project 2017-04-22 18:07:09 +02:00
Enno Rehling 8d2687ab90 print version number at end of tests. 2017-03-29 04:30:54 +02:00
Enno Rehling e8b7015c6c it seems CMAKE_INCLUDE_PATH is unused 2017-03-28 16:41:13 +02:00
Enno Rehling 2fd03a2489 fix string comparison for posix shell 2017-03-28 16:11:45 +02:00
Enno Rehling a3cdfef668 Fix find_package calls for CMake < 3.0 2017-03-27 21:10:30 +02:00
Enno Rehling f8d49e07af remove outdated custom CMake Modules. 
only keep what is not in CMake 3.6.
 2017-03-27 20:25:27 +02:00
Enno Rehling f4180638af also silence the git pull command and valgrind 2017-02-26 13:15:34 +01:00
Enno Rehling 7a1cebb259 silence the preview-build 2017-02-26 13:10:23 +01:00
Enno Rehling 114d088bb5 allow testers.txt to contain comments 2017-02-26 13:08:50 +01:00
Enno Rehling 117d37e2ea do not specify rules at command line. it is in eressea.ini 2017-02-05 14:48:43 +01:00
Enno Rehling ae83448e4a Deveron is now just E3 with a different name. 
remove a lot of duplication.
add a -c option to specify a path for eressea.ini
 2017-02-02 10:10:21 +01:00
Enno Rehling 534e5874e9 Merge branch 'gmtool' into develop 
Conflicts:
	src/util/unicode.test.c
 2017-01-31 22:19:00 +01:00
Enno Rehling 2b3617a998 build versioning for pre-release builds 2017-01-30 10:35:59 +01:00
Enno Rehling 3d8d091207 new build scripts, new versioning system 2017-01-30 10:26:08 +01:00
Enno Rehling d4e5e5f478 add a simple upgrade script for non-developers. 2017-01-27 20:22:23 +01:00
Enno Rehling 847cfb5425 game.start in eressea.ini overrides calendar 2017-01-26 18:06:15 +01:00
Enno Rehling a6dd02c111 add game id to eressea.ini 2017-01-26 18:06:15 +01:00
Enno Rehling 6d5749308d rename [eressea] section to [game] 2017-01-26 18:05:26 +01:00
Enno Rehling 5b78578939 github issue #626: installing in non-standard paths 2017-01-26 18:05:26 +01:00
Enno Rehling c38cd41194 fix the install script, issue #623 2017-01-26 18:05:26 +01:00
Enno Rehling 281cfbd009 fix the install script, issue #623 2017-01-11 10:57:42 +01:00
Enno Rehling 3ff5a3155e do not update submodules before each build. 
add tolua to .gitignore, it's not a proper submodule.
 2017-01-10 12:54:49 +01:00
Enno Rehling 31ff07cbec do not #error 2016-11-25 21:17:10 +01:00
Enno Rehling 5e49ac6fdf fix $MACHINE variable, update submodules 2016-11-25 16:01:28 +00:00
Enno Rehling a88bfa7a9a decluttering config.c (rules go into laws.c) 2016-11-16 22:46:01 +01:00
Enno Rehling d008a8167d Merge pull request #599 from ennorehling/feature/guards 
eliminate special cases for guards
 2016-11-01 17:03:12 +01:00
Enno Rehling 92d027014a Make runtests more verbose in case of errors. 
Eliminate stray ERROR messages from tests.
 2016-10-31 20:36:05 +01:00
Enno Rehling a5e63a2472 move GUARD_* flags to guard.h 2016-10-30 05:37:12 +01:00
Enno Rehling bca90d2076 buildno.h is gone, don't try to read it. 2016-10-23 09:42:43 +02:00
Enno Rehling 919001fae0 do not rmdir tolua, we need it 2016-10-16 16:41:08 +02:00
Enno Rehling 0de30cd376 remove discontinued submodules if they are checked out 2016-10-16 11:58:42 +02:00
Enno Rehling f6beda43f4 fix small typo 2016-10-03 16:16:17 +02:00
Enno Rehling 4fc4e8a588 change how lua version is determined to work with my mac 2016-09-30 22:21:26 +02:00
Enno Rehling 04333e71d6 working on a new tolua build step that supports 5.1 2016-09-30 19:47:40 +00:00
Enno Rehling ac8332c896 re-enable report tests. 
RF_LIGHTHOUSE also flags for lighthouses with size 0.
 2016-09-18 10:24:08 +02:00
Enno Rehling ad4377c0e7 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
 2016-09-16 17:08:03 +02:00
Enno Rehling 55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling dc004b2d71 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 16:30:49 +02:00
Enno Rehling 00a3a934f5 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 09:49:53 +02:00