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

5872 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
50f9f37ecc Revert "try adding coverity scan" 
This reverts commit 86fea3723b.
 2015-10-22 21:01:46 +02:00
Enno Rehling
86fea3723b try adding coverity scan 2015-10-22 20:55:19 +02:00
Enno Rehling
62fbee2eb3 eliminate find_spell warning for games where nobody is cursed, and you cannot summon igjarjuk 2015-10-12 18:59:15 +02:00
Enno Rehling
a3c843f90d clean up after tests 
update runtests.bat script for windows development in VS2015
 2015-10-11 14:57:35 +02:00
Enno Rehling
6a074fd294 only disable MSVC2015 warnings in MSVC2015, do not break confuse compilers. 2015-10-11 14:39:51 +02:00
Enno Rehling
e8880db447 get the code to compile under vs2015 (disable warnings) 2015-10-11 14:39:43 +02:00
Enno Rehling
c47c9dbf64 add mail_cmd tests for FACTION 2015-10-11 12:54:27 +02:00
Enno Rehling
403b8a2e7e add mail_cmd tests for REGION 2015-10-11 12:44:22 +02:00
Enno Rehling
070ed1a941 clean up hastily written tests, eliminate duplicate code 2015-10-11 12:38:05 +02:00
Enno Rehling
99c385412a fix crash in mail_cmd when order is missing a message 2015-10-10 22:50:15 +02:00
Enno Rehling
37a8081c9b handle express issues by filename 2015-10-02 11:30:14 +02:00
Enno Rehling
6162d0f16c fixing bug 2141 2015-09-25 11:31:43 +02:00
Enno Rehling
af5909a9c3 Merge pull request #303 from ennorehling/hotfix/bug-2138-familiarmage 
bug 2138 familiarmage
 2015-09-23 18:37:48 +02:00
Enno Rehling
ae513c5f23 Merge branch 'hotfix/bug-2138-familiarmage' of github.com:ennorehling/eressea into hotfix/bug-2138-familiarmage 2015-09-23 18:31:46 +02:00
Enno Rehling
1028539adb version number increase 2015-09-23 18:29:18 +02:00
Enno Rehling
e217a4b550 age_unit accidentally returned AT_AGE_REMOVE (caused by a recent change to curse_age) 2015-09-14 22:58:12 +02:00
Enno Rehling
3a1444f378 backport (failing) at_familiarmage test from 3.7 branch 2015-09-14 17:38:58 +02:00
Enno Rehling
23a7ed59ac backport familiar skill test from 3.7 development 2015-09-14 17:17:29 +02:00
Enno Rehling
ee9586bc2e crontab time changes 2015-09-12 22:47:09 +02:00
Enno Rehling
b93a75c529 Merge pull request #299 from ennorehling/master 
fix logging for sp_igjarjuk
 2015-09-12 22:44:40 +02:00
Enno Rehling
871373a0e5 be less verbose about cursing 2015-09-12 22:26:54 +02:00
Enno Rehling
7e6312441c cron fixes 2015-09-12 21:43:36 +02:00
Enno Rehling
de9fec8eed fix bug in a python script 
do not install crontab anywhere but eressea@gruenbaer
 2015-09-12 21:21:58 +02:00
Enno Rehling
a027139057 remove global variable verbosity in favor of static in main.c (use log_* functions everywhere) 2015-09-12 20:58:09 +02:00
Enno Rehling
06a04d0e20 fix logging for sp_igjarjuk, temporarily set log-levels for the game to error|warn|info 
remove some code that accesses `verbosity` variable (todo: hide it more, fix logging)
 2015-09-12 19:48:03 +02:00
Enno Rehling
28f17b6a08 release version 3.6.3 2015-09-12 19:27:11 +02:00
Enno Rehling
8f00d5293f change the release naming scheme 2015-09-12 15:42:46 +02:00
Enno Rehling
17342b7c5d add a release-tagging script 2015-09-12 15:39:36 +02:00
Enno Rehling
3f39569710 add compression scripts to installer 2015-09-12 15:26:00 +02:00
Enno Rehling
db94830040 imclude summary and express in the email (not the zip). 2015-09-10 16:01:29 +02:00
Enno Rehling
a28a35bb6c include weekly summary in the report email. 
https://bugs.eressea.de/view.php?id=2135#c6115
 2015-09-07 11:04:56 +02:00
Enno Rehling
b33babd316 fix cursed factions (broke it during bit32 changes) 2015-09-06 13:20:37 +02:00
Enno Rehling
fd3ff16723 Merge branch 'hotfix-3-6-2' 
Conflicts:
	.travis.yml
 2015-09-06 09:57:15 +02:00
Enno Rehling
9394431ddd disable travis build on osx 2015-09-05 19:54:57 +02:00
Enno Rehling
9b75f369a1 Temporarily disable osx build on Travis 2015-09-04 14:44:04 +02:00
Enno Rehling
552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133 
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
 2015-09-04 14:39:44 +02:00
Enno Rehling
6d592a4460 drifting ships do not take damage (forum debate), version update 2015-08-31 12:53:24 +02:00
Enno Rehling
f0a9cc8233 added a lua module that marks factions as cursed 2015-08-31 12:50:58 +02:00
Enno Rehling
a00fdf9316 fix hitpoints for summoned wolves 2015-08-31 12:50:47 +02:00
Enno Rehling
8c860811e2 Summon Igjarjuk only at the start of a battle, not after. 2015-08-30 23:15:04 +02:00
Enno Rehling
acb2aed30f add message for igjarjuk effect 2015-08-30 11:01:53 +02:00
Enno Rehling
7bb882b15b add a spell for igjarjuk (WIP) 2015-08-30 10:57:08 +02:00
Enno Rehling
9586d970e8 fix bad castorder creation for combat spell (some unions are the WORST) 2015-08-22 18:51:10 +02:00
Enno Rehling
dd667aa752 cursed factions get to fight a wolfhowl if they attack (WIP) 2015-08-22 17:56:36 +02:00
Enno Rehling
89bc83c4ab Merge branch 'master' into develop 
Conflicts:
	src/bind_region.c
	src/buildno.h
	src/kernel/item.c
 2015-08-20 16:58:07 +02:00
Enno Rehling
d69bf18e23 suspect some submodule shenanigans 2015-08-20 16:26:32 +02:00
Enno Rehling
853290413f fix segfault, disable intermittent test 2015-08-20 16:18:15 +02:00
Enno Rehling
f12454870f fix segfault, disable intermittent test 2015-08-20 16:17:19 +02:00
Enno Rehling
dfb0bcaccf Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
	src/laws.c
 2015-08-20 15:49:36 +02:00
Enno Rehling
1641e6ef89 remove spellbook repair code, we are done 2015-08-20 15:09:38 +02:00