Commit Graph

20 Commits

Author SHA1 Message Date
Enno Rehling 6a42b6231e Merge branch 'master' into develop
Conflicts:
	src/buildno.h
2015-06-21 18:32:10 +02:00
Enno Rehling 4a31bea3b9 increase build number, new version installed 2015-06-08 09:46:07 +02:00
Enno Rehling 24fc66ad1e update build no, re-enable test 2015-05-24 14:05:03 +02:00
Enno Rehling e99db198eb bugfix use_item (use_skillpotion did not use pool).
from here on, all use_* functions return the number of items used, and
use_item handles removing them from the unit (or the pool).
2015-05-24 07:17:23 +02:00
Enno Rehling 6e9fca5e2f allow version.h to declare a future version that is compatible with the current code as MAX_VERSION that save.c will accept. 2015-04-19 08:36:15 +02:00
CTD 53241bc95f Guard chance repaired
Das muss auch in den master damit es in der nächsten Auswertung wieder
richtig ist!
2015-02-22 21:45:11 +01:00
Enno Rehling f6e37bd875 bump build number 2015-02-15 18:27:26 +01:00
Enno Rehling 7b41a53d2a Merge branch 'master' into setup-cronjob
Conflicts:
	src/buildno.h
2015-02-08 13:56:49 +01:00
Enno Rehling a2e071d35b Fix broken syntax in message about effects on units.
Add some missing descriptions.
Bump version number.
2015-02-08 13:09:04 +01:00
Enno Rehling 954a649d3f version number bump 2015-02-08 10:41:05 +01:00
Enno Rehling 84da00f62d increase version number for develop branch 2015-02-06 01:42:12 +01:00
Enno Rehling da9c33268c fix preview crash in embassies.lua.
the "objects" dictionary is no longer of type hashtable, that usertype has been renamed to dict.
2015-02-01 10:03:30 +01:00
Enno Rehling e937749475 Merge branch 'version-3-3'
Conflicts:
	src/build.h
	src/kernel/faction.c
2015-01-11 01:25:10 +01:00
Enno Rehling 60e2e23414 Merge branch 'master' of github.com:eressea/server
Conflicts:
	s/cron/previews.sh
2015-01-09 20:50:43 +01:00
Enno Rehling 880b965c54 Merge branch 'version-3-3'
Conflicts:
	src/build.h
2014-12-28 17:29:34 +01:00
Enno Rehling ab71860224 Merge branch 'version-3-3'
Conflicts:
	src/build.h
	src/vortex.test.c
2014-12-12 17:24:00 +01:00
Enno Rehling a5f14e7f02 Merge branch 'version-3-3'
Conflicts:
	src/build.h
2014-11-16 12:55:58 +01:00
Enno Rehling 9c0a7c0e2e Merge branch 'version-3-3'
Conflicts:
	src/build.h
2014-11-08 22:56:53 +01:00
Enno Rehling 367307575c Merge branch 'master' of github.com:eressea/server 2014-11-01 22:12:11 +01:00
Enno Rehling 81bfb598d0 refactoring modules, cleaning out the config.c kitchen sink.
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
2014-11-01 12:09:56 +01:00
Renamed from src/build.h (Browse further)