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

33 Commits

Author SHA1 Message Date
Steffen Mecke 2cc8c1f871 trying to solve spy message bug #1604 
Conflicts:
	src/kernel/CMakeLists.txt
 2015-05-04 14:30:59 +02:00
Steffen Mecke 81e96c121a typo 2015-04-27 15:14:42 +02:00
Enno Rehling b7de307385 Merge branch 'message_fix' of https://github.com/stm2/server into stm2-message_fix 2015-02-20 20:05:44 +01:00
Steffen Mecke b5f8be8a95 fix heroes must not recruit 2015-02-10 18:17:58 +01:00
Steffen Mecke 7fd32e425a fix spy and volcano messages 2015-02-09 09:15:43 +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 5c975655b1 remove french messages that are not french 2015-02-02 21:45:47 +01:00
Steffen Mecke d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling ba26897872 Merge branch 'master' of github.com:eressea/server 2015-02-01 12:25:35 +01:00
Enno Rehling 9a395127ac Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix 
Conflicts:
	src/report.c
 2015-02-01 12:24:19 +01:00
Enno Rehling c75012b61d Merge pull request #119 from stm2/giant_message_typo_fix 
translated English messages and fixed a ton of typos
 2015-02-01 11:44:18 +01:00
Enno Rehling 03cddee6b7 Small plural/singular fix in German message. 2015-02-01 10:39:36 +01:00
Enno Rehling df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Steffen Mecke 4c391ae6f6 implemented Enno's suggestions for peasant growth 2015-01-29 23:55:02 +01:00
Steffen Mecke ec6560a281 adding a nice region message 2015-01-15 03:48:19 +01:00
Steffen Mecke 039ee159cb a bunch of messages in the NR where not localized 2015-01-14 16:17:21 +01:00
Steffen Mecke e727f9e9d4 translated English messages and fixed a ton of typos 2015-01-14 01:59:10 +01:00
Steffen Mecke 9142b79614 fixed message (bug #1506) 2015-01-14 01:58:26 +01:00
Enno Rehling 4f2d9260d1 add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
Enno Rehling b3bec13051 report the unit limit in NR and CR. 
this implements https://bugs.eressea.de/view.php?id=2055
 2014-12-19 19:57:24 +01:00
Enno Rehling 27b1d55350 enhancement: buildings without an owner report their lack of upkeep to the entire region. 
https://bugs.eressea.de/view.php?id=1713
 2014-12-14 11:48:15 +01:00
Enno Rehling ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling ecc3b1b441 Dragons re using the new LOOT command. 
Fixing the income message (missing ")").
 2014-11-02 11:10:26 +01:00
Enno Rehling bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 2014-11-02 10:02:30 +01:00
CTD 1c7075573b Plündern 
Neues Kommando Plündern für die Monster (kann über XML-Option auch für
Spieler freigeschaltet werden)
 2014-10-16 14:45:21 +02:00
Enno Rehling baffbbf154 Merge branch 'master' of github.com:eressea/server 2014-09-04 21:20:15 +02:00
Enno Rehling 2211111b29 Remove a German-only piece of text, to reduce the footprint of fleets in the report a little. 
Fix English score message in NR.
Small fixes to meet Visual Studio warning level 4.
 2014-08-25 00:45:32 +02:00
Enno Rehling e87b1cf372 an experiment to have deterministic sort order for known factions in the report. 2014-08-25 00:06:33 +02:00
Enno Rehling 41e8c13a0c I do not like contractions. 2014-08-17 18:20:04 +02:00
Enno Rehling a289eee06f Merge branch 'master' of github.com:eressea/server 2014-08-17 12:15:26 +02:00
Enno Rehling f8ad9e92e7 Fix some English message translations. 
clean up and improve some scripts, too.
 2014-08-17 11:19:04 +02:00
Enno Rehling 8f09ab73d9 fix display of alliance status, some English translation hiccups. 2014-08-17 00:14:50 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts). 
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
 2014-07-28 14:27:30 +02:00
Renamed from core/res/messages.xml (Browse further)