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

8432 Commits

Author SHA1 Message Date
Enno Rehling 0ebb9dfcce Merge pull request #702 from ennorehling/2342-plant 
BUG 2342: PFLANZE vs ZUECHTE Trennung
 2017-06-24 13:47:52 +02:00
Enno Rehling 1273abb967 Getrennte Befehle fuer PFLANZE und ZUECHTE 2017-06-24 13:36:18 +02:00
Enno Rehling 60c939289c Merge pull request #701 from ennorehling/develop 
merge hotfixes back into develop
 2017-06-18 22:12:39 +02:00
Enno Rehling 3ceeb54006 Merge branch 'master' into develop 2017-06-18 22:05:20 +02:00
Enno Rehling 2737f39029 Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-06-18 21:59:10 +02:00
Enno Rehling 75ae22e5b6 BUG 2340: endloser Sturmelementar 
CURSE_NOAGE is a weird thing.
 2017-06-18 21:48:47 +02:00
Enno Rehling 147af9ecda Merge remote-tracking branch 'upstream/master' 2017-06-18 16:44:58 +02:00
Enno Rehling 8178f3f1e6 BUG 2334: Nochmal Ponnuki 
Monsters cannot attack or guard when they are fleeing
 2017-06-18 14:20:01 +02:00
Enno Rehling eed93b7470 BUG 2334 and 2339: fix script update and init calls 
Ponnuki and Portals scripts are working.
Ponnuki may still attack? More testing required.
 2017-06-18 12:23:19 +02:00
Enno Rehling 69ef2c7ce7 Merge branch 'master' into develop 
Conflicts:
	src/magic.c
 2017-06-18 01:11:40 +02:00
Enno Rehling 843fbbc5f0 Merge remote-tracking branch 'upstream/master' 2017-06-18 01:10:57 +02:00
Enno Rehling 802dfbe124 Merge remote-tracking branch 'upstream/develop' into develop 2017-06-18 01:10:35 +02:00
Enno Rehling 7c5427d4cc Merge pull request #699 from ennorehling/master 
BUG 2322, 2332, 2333
 2017-06-11 20:51:26 +02:00
Enno Rehling 3ec1476da2 improve the mailcmd test 2017-06-11 17:13:31 +02:00
Enno Rehling f6ba5b6a53 BUG 2333 NMR-Anzahl im WB falsch 
https://bugs.eressea.de/view.php?id=2333
 2017-06-11 17:06:13 +02:00
Enno Rehling bcf103f581 fix raindance_effect message in E2 2017-06-11 15:17:04 +02:00
Enno Rehling 2c9c4c23f0 convert warning to debug output 2017-06-11 14:47:33 +02:00
Enno Rehling 72d46df7d7 Merge pull request #698 from ennorehling/develop 
fix failing preview build for E2 turn 1028
 2017-06-04 14:40:09 +02:00
Enno Rehling 3e0bc4f26d cannot assert that free_unit has no faction (complicated reasons) 2017-06-04 14:35:15 +02:00
Enno Rehling 728f7ed389 Revert "fix some failing tests." 
This reverts commit 8c11cb676f.
 2017-06-04 14:33:13 +02:00
Enno Rehling 8c11cb676f fix some failing tests. 2017-06-04 14:18:28 +02:00
Enno Rehling 5b807e2057 crash casued by spell conversion. 
remove unit from faction, not only region!
also remove spammy warning that has no value.
 2017-06-04 14:13:05 +02:00
Enno Rehling 06d7b7f9f1 Merge pull request #697 from ennorehling/develop 
begin work on 3.13 release
 2017-05-28 13:02:56 +02:00
Enno Rehling 1687e31d5f starting a new release 2017-05-28 12:51:41 +02:00
Enno Rehling 8052ff8b23 Merge remote-tracking branch 'upstream/develop' into develop 2017-05-28 12:50:51 +02:00
Enno Rehling 3306488641 Merge pull request #695 from ennorehling/feature/refactor-rcspell 
refactor observers, lighthouses
 2017-05-28 12:50:05 +02:00
Enno Rehling 383866c44b Merge pull request #694 from ennorehling/feature/2326-undeadhero 
BUG 2326: counting undead heroes in battle summary
 2017-05-28 12:49:46 +02:00
Enno Rehling 797169c7bd Merge remote-tracking branch 'upstream/develop' into develop 2017-05-28 12:48:25 +02:00
Enno Rehling 025a04a5e9 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	scripts/tests/common.lua
 2017-05-28 12:47:54 +02:00
Enno Rehling b266509746 Einheitenlimit anheben (3000 und 500) 2017-05-27 20:07:36 +02:00
Enno Rehling 9e213d3bcd minor optimization and using fraction code 2017-05-26 19:05:46 +02:00
Enno Rehling a3ebddeae4 update cron to check environment for switches 
use server/bin instead of ~/bin
 2017-05-26 13:52:55 +02:00
Enno Rehling 4efe6f6a71 Merge pull request #696 from ennorehling/develop 
BUG 2328: absolutely final changes for 3.12
 2017-05-26 06:35:22 +02:00
Enno Rehling b0b9eec05d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-05-26 06:27:31 +02:00
Enno Rehling 8e15487a1e BUG 2328: wrong calendar seasons. 2017-05-26 06:27:25 +02:00
Enno Rehling 153039fdef fix gcc compilation, unused variable 2017-05-24 08:58:46 +02:00
Enno Rehling 18daa9db2f entirely remove RC_SPELL 2017-05-24 08:52:19 +02:00
Enno Rehling 30cfe2c0c0 convert RC_SPELL to at_observer during readgame. 2017-05-24 08:18:55 +02:00
Enno Rehling 86974df332 Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git 2017-05-22 22:08:22 +02:00
Enno Rehling 611d69908f remove unnecessary code. 2017-05-22 22:08:18 +02:00
Enno Rehling 95a9bb4ab9 register missing attribute. 2017-05-22 21:53:10 +02:00
Enno Rehling 94a4e52ac8 Merge branch 'develop' into feature/refactor-rcspell 2017-05-22 21:36:02 +02:00
Enno Rehling a3f655f322 fix bogus warnings 2017-05-22 21:35:25 +02:00
Enno Rehling 1bb022ef58 Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git 2017-05-22 21:16:34 +02:00
Enno Rehling 51f8f87072 eliminate the O(n) lighthouse/inside complexity from prepare_report 2017-05-22 21:15:42 +02:00
Enno Rehling 17ed46e6a8 fix test 2017-05-22 19:50:18 +02:00
Enno Rehling 0755830754 fix compilation, test still fails 2017-05-21 23:47:54 +02:00
Enno Rehling abb7c9fb17 Merge branch 'kill-rcspell' into feature/refactor-rcspell 
Conflicts:
	src/kernel/config.h
	src/main.c
	src/report.c
	src/reports.c
	src/reports.test.c
	src/spells.c
 2017-05-21 21:33:29 +02:00
Enno Rehling 37aded9b1d remove unused function 2017-05-21 16:12:13 +02:00
Enno Rehling 9525c8790c Merge branch 'stm2-bug2211_addendum' into develop 2017-05-21 14:53:14 +02:00