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

9870 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
8e9f8be007 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-11-21 14:26:08 +01:00
Enno Rehling
3638219e13 fix magic tests that created gray mages. 
also fix mage_change_spellpoints.
 2018-11-18 21:53:45 +01:00
Enno Rehling
4a66b558c5 WIP: refactor struct sc_mage (make it private). 
tests are failing and/or slow.
 2018-11-18 21:47:14 +01:00
Enno Rehling
6f26898822 fix accidental redefinition 2018-11-18 11:32:59 +01:00
Enno Rehling
e1ebf15d31 coverity thinks I need to check for NULL 2018-11-18 11:16:20 +01:00
Enno Rehling
2ab6ef1828
Merge pull request #819 from ennorehling/develop 
Vertraute ohne eigene Magie.
 2018-11-17 22:40:42 +01:00
Enno Rehling
b6110c5b22 some caster/mage changes issues (transfer aura is hard). 2018-11-17 22:28:55 +01:00
Enno Rehling
270646d9c3 iwyu 2018-11-17 22:16:27 +01:00
Enno Rehling
4403552b61 F*ck this MSVC message: 
warning C6001: Using uninitialized memory
It is confused, and I screwed up trying to work around it.
 2018-11-17 22:12:34 +01:00
Enno Rehling
aa466f3cc8 avoid code analysis warnings 2018-11-17 22:01:23 +01:00
Enno Rehling
d2389fa87b Bug 2517: Vertraute ohne eigene Zauber reparieren 
Trennung von caster und mage in spells.c
 2018-11-17 21:31:05 +01:00
Enno Rehling
b181618b53 BUG 1877: change non-spell familiars. 
1. mages can have actions when familiars cast spells.
2. familiar spells do not increase magician's costs.
3. improve separation of caster and mage.
 2018-11-15 20:51:42 +01:00
Enno Rehling
83b6db41fe remove legacy msg_level struct (unused). 2018-11-13 17:24:22 +01:00
Enno Rehling
5a7e8cbd9a
Merge pull request #818 from ennorehling/master 
Bugfix für 3.17.8
 2018-11-07 08:37:21 +01:00
Enno Rehling
4da6512f88 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-11-07 08:36:47 +01:00
Enno Rehling
e570300dbe Merge branch 'master' into develop 2018-11-06 19:33:46 +01:00
Enno Rehling
ed17b10287 Bug 2514: units giving LERNE AUTO with certain incomplete teacher/student matchups did not study anything. 2018-11-06 19:28:14 +01:00
Enno Rehling
2f9325073b test for cart building 2018-11-05 20:30:33 +01:00
Enno Rehling
c48371387c New Syntax: CONTACT [UNIT|FACTION] ... 
Move everything to contact module, add tests.
 2018-11-04 18:07:42 +01:00
Enno Rehling
0fd7906d41 extract contact logic to a module 
add missing tests for contact to units.
add an attribute for contacting a faction.
 2018-11-04 15:53:27 +01:00
Enno Rehling
bf04d95651 fix iwyu warnings. 2018-11-04 12:16:02 +01:00
Enno Rehling
9a309e1e30 Merge remote-tracking branch 'upstream/develop' into develop 2018-11-04 12:12:52 +01:00
Enno Rehling
74fe5a8779 Merge remote-tracking branch 'upstream/master' 2018-11-04 12:12:34 +01:00
Enno Rehling
a859687f7c
Merge pull request #817 from ennorehling/develop 
include fixes from 3.17
 2018-11-04 09:45:36 +01:00
Enno Rehling
7a42f6926a
Merge pull request #816 from ennorehling/master 
Bug 2511: LERNE AUTO fixed, student limit increased
 2018-11-04 09:15:08 +01:00
Enno Rehling
ab710ea41d fix gmtool compilation 2018-11-04 09:14:36 +01:00
Enno Rehling
dac6ef660d Merge branch 'master' into develop 2018-11-04 09:10:54 +01:00
Enno Rehling
1a10c0271d Bug 2511: LERNE AUTO fixed, student limit increased 2018-11-04 09:08:50 +01:00
Enno Rehling
936a2daa28
Merge pull request #815 from ennorehling/develop 
Another week of bugfixes and improvements
 2018-11-03 21:04:49 +01:00
Enno Rehling
89b10ee63d bug 2463 fix xmastrees, fix get_key/set_key 2018-11-03 20:30:57 +01:00
Enno Rehling
d9f800f444 Bug 2482: Untote können ihre eigenen Gegenstände reservieren. 2018-11-03 18:25:22 +01:00
Enno Rehling
2b478731c3 merge conflicts resolved 2018-11-03 15:49:52 +01:00
Enno Rehling
8bcdb5c381 Bug 2509 contd: new_region still creating duplicates 2018-11-03 15:48:35 +01:00
Enno Rehling
6c11e740ff bug 2510 duplicate region after datafile read 2018-11-03 14:28:32 +01:00
Enno Rehling
dc08ba5e98 bug 2510 duplicate region after datafile read 2018-11-03 13:51:10 +01:00
Enno Rehling
c981bfb766 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-11-02 22:31:48 +01:00
Enno Rehling
272588cb0f BUG 2509: fix travelthru faction reporting 2018-11-02 22:31:20 +01:00
Enno Rehling
a2fe396b68 do not delayed-resolve regions 2018-11-01 21:20:11 +01:00
Enno Rehling
25b5f797e9 add building_create, too 2018-11-01 21:18:24 +01:00
Enno Rehling
fc4f32f8e0 read_building_reference does not need a callback 2018-11-01 21:13:05 +01:00
Enno Rehling
ba9af6d765 1. region_create(uid) 
2. read_region_reference never gets a callback, so save it.
 2018-11-01 21:08:59 +01:00
Enno Rehling
85fe80d858 unit_create function instead of wild calloc calls. 2018-11-01 10:16:49 +01:00
Enno Rehling
d9167b8a59 do not use late resolution for factions, ever 2018-11-01 09:53:23 +01:00
Enno Rehling
da3b21d59b Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-11-01 09:40:04 +01:00
Enno Rehling
923c895382 Merge branch 'allies' into develop 2018-10-31 19:10:51 +01:00
Enno Rehling
b0485ec57f eliminate struct ally, use struct allies 2018-10-31 17:54:40 +01:00
Enno Rehling
d315d73fa8
Merge pull request #814 from ennorehling/master 
Version 3.17.6
 2018-10-31 15:31:22 +01:00
Enno Rehling
713b18f8b9 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-10-31 07:00:28 +01:00
Enno Rehling
1eceef540a Merge branch 'master' of github.com:ennorehling/eressea 2018-10-31 07:00:13 +01:00
Enno Rehling
0ca2523ea7 Merge branch 'allies' of github.com:ennorehling/eressea into allies 2018-10-31 06:59:48 +01:00