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

10468 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
d5104fa55a Bug 2609 VERGESSE Magie 2019-09-18 20:55:44 +02:00
Enno Rehling
ea9e31d1b2 tests for trolls riding on carts. 2019-09-15 20:32:07 +02:00
Enno Rehling
44d0a0acec Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-15 17:49:02 +02:00
Enno Rehling
93e82fc6ae concat in Lua is not PHP 2019-09-15 14:33:48 +02:00
Enno Rehling
65689df308 quit faction is still disabled 2019-09-15 14:33:48 +02:00
Enno Rehling
52f08917d5 getn is deprecated 2019-09-15 14:33:48 +02:00
Enno Rehling
fa3abe8c32 new bindings for allies. 
script to fix damage from bug 2608.
 2019-09-15 14:33:48 +02:00
Enno Rehling
fef57d3fcf factions that idle out gift their stuff to friends 2019-09-15 14:32:48 +02:00
Enno Rehling
6fe3566317 Merge remote-tracking branch 'upstream/master' 2019-09-15 14:31:17 +02:00
Enno Rehling
21534ca872 concat in Lua is not PHP 2019-09-15 14:30:50 +02:00
Enno Rehling
8a8dd08b19
Merge pull request #876 from ennorehling/master 
Bug 2608 repair
 2019-09-15 14:24:14 +02:00
Enno Rehling
e90b7acd4c Merge remote-tracking branch 'upstream/master' 2019-09-15 14:17:37 +02:00
Enno Rehling
294e88196c quit faction is still disabled 2019-09-15 14:12:18 +02:00
Enno Rehling
f06fd8945c getn is deprecated 2019-09-15 14:02:53 +02:00
Enno Rehling
e58f51e536 new bindings for allies. 
script to fix damage from bug 2608.
 2019-09-15 14:02:32 +02:00
Enno Rehling
bd25c0bf6e helfe-status nach lua exponieren. 2019-09-15 14:01:33 +02:00
Enno Rehling
aecd79dab1 factions that idle out gift their stuff to friends 2019-09-15 13:59:42 +02:00
Enno Rehling
3c5105df7c clibs update 2019-09-15 13:59:28 +02:00
Enno Rehling
f1132ca9f4
Merge pull request #875 from ennorehling/2608-nmrdeath 
Bug 2608: nmr death, gift items
 2019-09-14 21:52:10 +02:00
Enno Rehling
434aa15b9a factions that idle out gift their stuff to friends 2019-09-14 21:51:13 +02:00
Enno Rehling
bfd29a4d17 clibs update 2019-09-13 22:03:40 +02:00
Enno Rehling
42da29668d Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-13 22:01:15 +02:00
Enno Rehling
f30a7848a5 rule_give is crufty, do not involve it in destroyfaction 2019-09-13 22:00:47 +02:00
Enno Rehling
48297838c7
Merge pull request #874 from ennorehling/2605-carts 
Lizenzwechsel und Wagen/Pferde
 2019-09-13 21:59:41 +02:00
Enno Rehling
58910a992a Merge branch '2605-carts' into develop 2019-09-13 21:48:36 +02:00
Enno Rehling
8fc0aaf98d Add license to readme 2019-09-13 21:45:23 +02:00
Enno Rehling
0a1fc3c530 New license is CC BY-NC-SA 2019-09-13 21:42:46 +02:00
Enno Rehling
b9ae927aa3 remove copyright notices. 2019-09-13 21:35:44 +02:00
Enno Rehling
ddc8c27489 Bug 2605: testing horses and carts 
fixing indentation in battle.c
 2019-09-12 22:23:50 +02:00
Enno Rehling
d9febc30d8 rostregen bugfix commit ruined indentation 2019-09-12 08:40:27 +02:00
Enno Rehling
cc77ce6f20 Tests für Einheiten mit Pferden. 2019-09-10 06:40:42 +02:00
Enno Rehling
007721991d Bug 2606: DRY, share code between buy and sell. 2019-09-08 13:29:10 +02:00
Enno Rehling
d2d782c761 Bug 2606: KAUFE braucht eine Burg. 2019-09-08 13:06:24 +02:00
Enno Rehling
99f7ddd1c0
Merge pull request #873 from ennorehling/develop 
mapper enhancement
 2019-09-02 20:59:41 +02:00
Enno Rehling
40a484774e gmtool: reset an entire world's age to zero. 2019-09-02 20:42:23 +02:00
Enno Rehling
a3299ed926 Verifikation dass Erbschaft wie gewollt verteilt wird. 2019-09-01 19:42:12 +02:00
Enno Rehling
7e4d7bf286
Merge pull request #872 from ennorehling/develop 
bug 2603: when familiars cast spells, use their name in messages.
 2019-09-01 04:10:08 +02:00
Enno Rehling
02f6f2f014 bug 2603: when familiars cast spells, use their name in messages. 2019-08-31 12:19:25 +02:00
Enno Rehling
7eb1e59d5d
Merge pull request #871 from ennorehling/develop 
BENENNE FREMDE und pathfinding
 2019-08-27 22:25:47 +02:00
Enno Rehling
aef98424ea fix pathfinding 
fix BENENNE FREMDE BURG
 2019-08-27 22:17:28 +02:00
Enno Rehling
c87944afad actually, rconnect is better, since we don't always need the entire scan. 2019-08-26 22:49:32 +02:00
Enno Rehling
b81fe4e244 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-26 22:47:11 +02:00
Enno Rehling
a5e59a6464 we prefer get_neighbours over rconnect 2019-08-26 22:46:59 +02:00
Enno Rehling
d639c2418c delete unused function 2019-08-26 20:47:02 +02:00
Enno Rehling
331546eec4 at_npcfaction is deprecated stuff. 2019-08-26 19:09:40 +02:00
Enno Rehling
ef92734483
Merge pull request #870 from ennorehling/develop 
refactoring, to go into 3.21
 2019-08-25 19:40:09 +02:00
Enno Rehling
fc29b492a2 last gcc thing, I hope. 2019-08-25 19:34:04 +02:00
Enno Rehling
eb95613996 fix gcc issues with new season_t type. 2019-08-25 18:14:03 +02:00
Enno Rehling
8bed3f3329 fix give_unit test for E3 
extract read_factions from read_game, now small and nice.
 2019-08-25 18:11:14 +02:00
Enno Rehling
827532dd49 extract read_regions from read_game. 2019-08-25 17:55:04 +02:00