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

190 Commits

Author SHA1 Message Date
Enno Rehling a8c9576937 fix mac build 2018-02-04 14:59:01 +01:00
Enno Rehling 3c8ff4e76e CMAKE_BUILD_TYPE is a cache variable 2018-02-03 09:58:56 +01:00
Enno Rehling 5094705ba0 make s/cmake-init more intelligent. 2018-02-02 18:39:05 +01:00
Enno Rehling 041c0fdfaa export LUA_DIR to find the right LUA_INCLUDE_DIR 2018-01-11 17:13:49 +01:00
Enno Rehling a79e22984b cppcheck disabled, it is too slow 2017-12-31 20:47:40 +01:00
Enno Rehling 55479c960c break up the cppcheck tests, they time out on travis 2017-12-31 20:26:24 +01:00
Enno Rehling 0c1562c14f add include directories for cppcheck 2017-12-08 21:11:54 +01:00
Enno Rehling 5e435a7c0b pass cppcheck v 1.54 default checks 2017-12-08 19:26:26 +01:00
Enno Rehling 0857e363e5 fix travis shellcheck 2017-12-03 16:26:02 +01:00
Enno Rehling 4619f77af9 add a shellcheck test, fix some scripts 2017-12-03 16:12:48 +01:00
Enno Rehling 4fa9e041bf fix cppcheck report (missing curly race) 2017-11-20 14:57:04 +01:00
Enno Rehling af9f263266 add cppcheck to travis build 2017-11-20 08:41:17 +01:00
Steffen Mecke 2f35feee3e minor, obvious fixes 2017-11-14 12:51:04 +01:00
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