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

8041 Commits

Author SHA1 Message Date
Enno Rehling ada05ff55f Merge pull request #614 from ennorehling/master 
fix bug 2261: bit manipulation error in STEALTH FACTION.
 2016-12-03 23:46:05 +01:00
Enno Rehling afac66e213 fix bug 2261: bit manipulation error in STEALTH FACTION. 
https://bugs.eressea.de/view.php?id=2261
 2016-12-03 23:38:53 +01:00
Enno Rehling 2de3c3179a develop branch is now base for 3.11 2016-11-28 08:39:07 +01:00
Enno Rehling cd2842ef38 Merge branch 'develop' 
Conflicts:
	src/buildno.h
	src/util/unicode.test.c
 2016-11-27 18:48:01 +01:00
Enno Rehling aa7cc69fe1 Merge pull request #613 from ennorehling/develop 
new address, finishing 3.10
 2016-11-27 17:13:56 +01:00
Enno Rehling bf70792da6 make kn-bremen.de official email address 2016-11-27 16:07:46 +01:00
Enno Rehling 641239e388 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-26 17:18:36 +01:00
Enno Rehling 06ba427a77 fix VS2015 build: config.h not found 2016-11-26 17:17:14 +01:00
Enno Rehling daae6dd375 Merge pull request #612 from ennorehling/debian-x32 
fix compilation with glibc >= 2.20, no autoconf
 2016-11-26 17:12:04 +01:00
Enno Rehling 6079293fea the _BSD_SOURCE macro was deprecated with glibc 2.12 2016-11-26 16:54:19 +01:00
Enno Rehling 43b8ff1ea8 fix strdup compilications when compiling with gcc and autoconf. 2016-11-26 16:21:41 +01:00
Enno Rehling 68ce6907f3 new storage module (without textstore and snprintf) 2016-11-26 07:24:19 +01:00
Enno Rehling 7870b63655 fix VS 2015 build 2016-11-26 07:04:18 +01:00
Enno Rehling 14b5c0f922 mac builds using gcc do not need autoconf. 
need to find a differnt way to test autoconf.
 2016-11-25 22:19:59 +01:00
Enno Rehling 2f81dc16b2 fix autoconf usage, force my OSX build to use it 2016-11-25 21:57:47 +01:00
Enno Rehling 31ff07cbec do not #error 2016-11-25 21:17:10 +01:00
Enno Rehling 0208304b07 use autoconf when not MSCVER or GLIBC 2016-11-25 21:12:14 +01:00
Enno Rehling e52cf75c59 remove autoconf.h from platform.h, fix lots of includes 2016-11-25 20:15:11 +01:00
Enno Rehling 5e49ac6fdf fix $MACHINE variable, update submodules 2016-11-25 16:01:28 +00:00
Enno Rehling c9c4f5dd37 gcc complains about BSD_SOURCE now 2016-11-25 09:54:05 +00:00
Enno Rehling 78e63ed4c6 misleading indentation 2016-11-25 09:48:38 +00:00
Enno Rehling 0cb8e36877 Merge pull request #610 from ennorehling/develop 
house cleaning prior to 3.10
 2016-11-23 19:30:57 +01:00
Enno Rehling ecd74c53f5 More PVS-Studio warnings eliminated. 2016-11-23 19:19:04 +01:00
Enno Rehling 91adf420bc strncat error V645 2016-11-23 19:18:54 +01:00
Enno Rehling 7f9313f1a7 static analysis warnings. 
PVS-Studio warnings reduced or suppressed.
 2016-11-23 18:56:40 +01:00
Enno Rehling ea6cd2ca32 remove unguard trigger. 
it is unused by the code
 2016-11-23 17:55:44 +01:00
Enno Rehling 13c29c136c eliminate config.h from triggers. 
was only used once, for a single fset macro
 2016-11-23 17:52:57 +01:00
Enno Rehling 88f5bfaf47 move wages and related functionality to buildin.c 2016-11-23 17:36:39 +01:00
Enno Rehling 09f22ba0bc move findrace into race.c 2016-11-22 12:32:28 +01:00
Enno Rehling 925d65c206 move entertainmoney to economy 2016-11-22 12:22:07 +01:00
Enno Rehling ec4060cb9a fix curse-vigour calculation math. 
also fix a ton of small other niggles from pvs-studio.
 2016-11-20 19:08:39 +01:00
Enno Rehling a8f3cad143 remove bad umlaut encodings, make sources US-ASCII. 2016-11-20 18:09:08 +01:00
Enno Rehling f5da163d18 Merge pull request #609 from ennorehling/develop 
BUG: broken ship names
 2016-11-20 15:23:55 +01:00
Enno Rehling 9ac74ceecc fix constant conversion error 2016-11-20 15:14:03 +01:00
Enno Rehling ae951ee780 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-20 14:50:49 +01:00
Enno Rehling 55a0388eb2 fix truncated names that split a utf8 sequence. 2016-11-20 14:50:38 +01:00
Enno Rehling 19a0c2ddb3 quelling some static analysis complaints. 2016-11-19 20:57:10 +01:00
Enno Rehling eabaf8bebb fix last commit. 2016-11-19 16:27:37 +01:00
Enno Rehling 3de1dec4a5 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-19 15:19:57 +01:00
Enno Rehling 531da88b2a squash some static analysis warnings. 2016-11-19 15:19:23 +01:00
Enno Rehling 77c0af3785 Merge pull request #607 from ennorehling/develop 
refactoring and cleanup
 2016-11-18 23:03:02 +01:00
Enno Rehling 14b4ae5859 set volcano acitvation chance to 0 during test. 
should fix issue #606 for good.
also: additional tests for renumbering ships, Xolgrim is wrong.
 2016-11-18 22:31:06 +01:00
Enno Rehling ecbd0ba83c github issue #606 
disable volcano terrain change for snowglobe test
 2016-11-18 13:30:30 +01:00
Enno Rehling 7d874f1606 fix clang builds 2016-11-18 13:24:50 +01:00
Enno Rehling 4fc747fd83 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-18 11:39:14 +01:00
Enno Rehling 4d5c00be90 git rm --cached tolua, to fix travis builds? 2016-11-18 11:38:50 +01:00
Enno Rehling 8b46e1323a declare struct before use 2016-11-18 11:11:21 +01:00
Enno Rehling a08563e846 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-17 22:10:53 +01:00
Enno Rehling dc2452e2c1 config.h globals cleanup. 2016-11-17 22:10:41 +01:00
Enno Rehling aef475f663 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-17 22:09:51 +01:00