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

9949 Commits

Author SHA1 Message Date
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
Enno Rehling b5b39024f2 BUG 2506: starting regions have bad resource levels. 
add some one-off custom code to fix the resource levels of selected regions
 2018-10-30 21:01:16 +01:00
Enno Rehling a8ff6d2a99 gmtool can now select and highlight islands. 2018-10-30 20:11:35 +01:00
Enno Rehling 54307d3b50 can read and write struct allies. 2018-10-30 18:45:13 +01:00
Enno Rehling a26438c175 Merge branch 'develop' into allies 2018-10-30 18:40:15 +01:00
Enno Rehling bf9c50cfc5 gcc flag to prevent use of VLA 2018-10-30 06:31:30 +01:00
Enno Rehling 253849416a create referenced factions early instead of read_faction_reference. 2018-10-30 06:30:32 +01:00
Enno Rehling ed6a6b4cf2 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-10-30 06:28:09 +01:00
Enno Rehling 00718424cf missing limits include 2018-10-30 06:02:55 +01:00
Enno Rehling da9d3d3573 Merge branch 'master' into develop 2018-10-29 20:10:51 +01:00
Enno Rehling c54ab6a3df fix CID 189401 and 189402 2018-10-29 20:06:18 +01:00
Enno Rehling e8ca81bc1a BUG 2505: make build code more comlpicated, and fix multi-stage buildings. 2018-10-29 19:35:49 +01:00
Enno Rehling f8040e2d9f unit test to also prove bug 2505 2018-10-29 18:54:23 +01:00
Enno Rehling 89d752bc1f BUG 2508: wipe edges with 0 2018-10-29 16:19:29 +01:00
Enno Rehling eba89b3eda Merge branch 'master' of https://github.com/ennorehling/eressea 2018-10-28 21:56:36 +01:00
Enno Rehling e5207fd1c7 do not backup eressea.db right now 2018-10-28 21:55:34 +01:00
Enno Rehling 6326664b86 BUG 2505 proof by test. 2018-10-28 21:48:52 +01:00
Enno Rehling dce5f7857b unused variable 2018-10-28 21:31:58 +01:00
Enno Rehling be84c13a72 remove test_inject_messagetypes(), make that the default behavior in tests. 2018-10-28 21:28:05 +01:00
Enno Rehling 113a6e68c7 BUG 2507: LERNE AUTO with invalid skill. 2018-10-28 21:27:24 +01:00
Enno Rehling 558390a4a6 separate ally_ api from allies_ api, 
delete unallied factions,
start worrying about serialization.
 2018-10-28 13:45:36 +01:00
Enno Rehling 485dacc25a
Merge pull request #813 from ennorehling/develop 
Monster AI changes, HELFE Refacoring
 2018-10-27 21:56:25 +02:00