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

7472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
567083c9e8 fix bad translation key 2016-09-16 20:18:53 +02:00
Enno Rehling
9d60a0f967 missing forward struct declaration 2016-09-16 19:28:07 +02:00
Enno Rehling
783c042d50 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/reports.c
 2016-09-16 19:11:05 +02:00
Enno Rehling
2f9445a4a6 Merge pull request #571 from ennorehling/develop 
remove view functions for special planes (Regatta).
 2016-09-16 19:06:20 +02:00
Enno Rehling
acfa2cfbe5 remove view functions for special planes (Regatta). 2016-09-16 18:59:24 +02:00
Enno Rehling
d449ce4a8c re-enable report writing, fix report.c to work without seen_region 2016-09-16 18:03:28 +02:00
Enno Rehling
007f4d8b0d test that travelthru notifications will make it into the report. 2016-09-16 17:25:40 +02:00
Enno Rehling
6fed596c36 Merge branch 'develop' into kill-seen-region 2016-09-16 17:12:40 +02:00
Enno Rehling
1dac556d09 Fix MSVC compilation (always include platform-specific hacks). 2016-09-16 17:11:33 +02:00
Enno Rehling
ad4377c0e7 Merge branch 'develop' into kill-seen-region 
Conflicts:
	src/kernel/version.c
	src/kernel/version.h
 2016-09-16 17:08:03 +02:00
Enno Rehling
7e0abeb9fc Merge pull request #570 from ennorehling/develop 
improved versioning through version.c
 2016-09-16 17:05:51 +02:00
Enno Rehling
55df24ffb8 all code review nitpicks fixed. 2016-09-16 16:54:41 +02:00
Enno Rehling
b0799bd152 fix travis build by not depending on CMake 2.8.8 2016-09-16 16:30:56 +02:00
Enno Rehling
dc004b2d71 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 16:30:49 +02:00
Enno Rehling
47526dd36b smarter version.c build that avoids full rebuilds. 2016-09-16 16:30:43 +02:00
Enno Rehling
10916bb0a1 use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c 2016-09-16 16:30:30 +02:00
Enno Rehling
318cf68e1b move version string into a single object file 2016-09-16 16:30:17 +02:00
Enno Rehling
7cad8c3192 Merge remote-tracking branch 'upstream/develop' into develop 2016-09-16 16:29:48 +02:00
Enno Rehling
bf59b1adf9 fix travis build by not depending on CMake 2.8.8 2016-09-16 10:55:38 +02:00
Enno Rehling
00a3a934f5 require cmake version 2.8.8 (add_library <name> OBJECT ...) 2016-09-16 09:49:53 +02:00
Enno Rehling
dbde14fdff smarter version.c build that avoids full rebuilds. 2016-09-16 09:39:59 +02:00
Enno Rehling
3f86014e9d delete files created by report_summary 2016-09-15 21:16:45 +02:00
Enno Rehling
77e39fc64b use add_definitions instead of CMAKE_C_FLAGS, define ERESSEA_VERSION only on version.c 2016-09-15 20:14:17 +02:00
Enno Rehling
d8d3cd4cc4 move version string into a single object file 2016-09-15 20:11:38 +02:00
Enno Rehling
42bfc43e4f test lighthouse preparation 2016-09-15 13:01:08 +02:00
Enno Rehling
2b9e5ffff9 check seen_neighbour 2016-09-15 10:02:49 +02:00
Enno Rehling
dfbc520203 add a simple test for prepare_report. 
TODO: it is _too_ simple.
 2016-09-14 21:46:57 +02:00
Enno Rehling
929db73102 disable integration tests 
combine prepare_ functions
 2016-09-14 17:14:04 +02:00
Enno Rehling
576f183afb separate tests.report module (lua) 
disable all report testing for now
 2016-09-14 17:04:23 +02:00
Enno Rehling
8ec37783e2 fix nul-pointer access 2016-09-13 21:13:26 +02:00
Enno Rehling
cd71a21bf5 really disable reports 2016-09-13 21:09:05 +02:00
Enno Rehling
482e619969 disable reports entirely. 2016-09-13 20:17:59 +02:00
Enno Rehling
4e4b4e482e split off report.test from reports.test 
move some tests around
 2016-09-13 20:13:26 +02:00
Enno Rehling
428f640ba6 disable reports tests. have to sort them by report.test and reports.test first 2016-09-13 19:09:53 +02:00
Enno Rehling
648857f52c disable report.c temporarily 2016-09-13 18:52:35 +02:00
Enno Rehling
acfb06392a Everything except report.c compiles. 
Not that I'm not claiming that it works.
 2016-09-13 17:02:51 +02:00
Enno Rehling
20578da0e9 delete the old seen.* files 
remove includes for seen.h
remove unused functions
 2016-09-13 16:58:48 +02:00
Enno Rehling
f520d8396d make creport not use seen_region. 
remove jsreport from build
 2016-09-13 15:30:09 +02:00
Enno Rehling
71fa3600f7 recalculate [first,last) after lighthouses aand trvelthru 2016-09-13 09:09:35 +02:00
Enno Rehling
652ead4f60 prepare_seen has to check for ctx->f. we are no longer preparing everyone at once 2016-09-13 07:46:08 +02:00
Enno Rehling
a67950433d WIP: prepare_seen vs lastregion/firstregion. 
lighthouses and travelthru are handled by both, should only be in prepare_seen?
 2016-09-12 22:03:16 +02:00
Enno Rehling
84bc6c58a8 prepare_reports gone 
prepare_seen is something else now
unit tests are crashing
 2016-09-12 15:59:22 +02:00
Enno Rehling
a4498f8b43 require at least 2K peasants in starting regions 2016-09-11 21:31:52 +02:00
Enno Rehling
c3097d3785 Merge branch 'master' of github.com:ennorehling/eressea 2016-09-11 21:31:28 +02:00
Enno Rehling
452614307d require at least 2K peasants in starting regions 2016-09-11 21:27:46 +02:00
Enno Rehling
cb85eb4b9f delete more files created by test runs 2016-09-11 21:18:50 +02:00
Enno Rehling
4a1d29c92f Merge pull request #568 from ennorehling/develop 
change how dead units' factions are found
 2016-09-11 20:24:42 +02:00
Enno Rehling
2294de44c2 accidental duplicate close. 2016-09-11 20:14:19 +02:00
Enno Rehling
f926d89929 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-09-11 20:10:01 +02:00
Enno Rehling
f946d50001 alternative implementation for dfindhash that doesn't use as much memory. 
do not set u->faction = NULL for deleted units.
 2016-09-11 20:09:48 +02:00