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

8097 Commits

Author SHA1 Message Date
Enno Rehling bd59271b71 Samen-Definition normalisiert (mit XML/Lua). 
Tests repariert.
MACHE Samen gibt es in E3 nicht.
 2017-02-23 22:30:19 +01:00
Enno Rehling 6ce487e485 MACHE Samen geht in E3 nicht. limited ist unnoetig 2017-02-23 22:19:48 +01:00
Enno Rehling f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +01:00
Enno Rehling 5e2903258c kill old <guard/> element from XML 2017-02-23 14:45:19 +01:00
Enno Rehling 9cbd5b88e6 rm_tree is not actually a thing 2017-02-23 08:07:47 +01:00
Enno Rehling be42137833 fix rmt_find for trees 2017-02-23 08:02:24 +01:00
Enno Rehling f4dc88c3be strip rawmaterial_type to just the funpointers 2017-02-23 07:53:28 +01:00
Enno Rehling 1498f2e1d7 refactor rawmaterial_type. 
still have to decide if we need it at all.
 2017-02-22 21:10:22 +01:00
Enno Rehling ce2ea95880 begin refactoring limited resources. 2017-02-22 20:28:34 +01:00
Enno Rehling 67831ad708 we like test_setup. 2017-02-22 20:16:51 +01:00
Enno Rehling 82e4d75429 unused function 2017-02-22 19:43:17 +01:00
Enno Rehling 807fe607e7 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-22 19:38:56 +01:00
Enno Rehling 3274065004 reduce complexity of building_protection. 2017-02-22 19:38:46 +01:00
Enno Rehling deb39f6b8f test building_effsize does what it does 2017-02-22 14:27:13 +01:00
Enno Rehling a8506442e1 Merge pull request #662 from ennorehling/develop 
refactoring race XML
 2017-02-20 22:14:49 +01:00
Enno Rehling bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling 7e4b0ac717 fix XML file 2017-02-20 21:21:05 +01:00
Enno Rehling a1dc3dc8e4 remove race.age from XML data (set in rc_create) 2017-02-20 21:19:58 +01:00
Enno Rehling 44f6336e1f do not register unused functions. 2017-02-20 21:04:50 +01:00
Enno Rehling 4bd295e3b2 remove the nearly unused illusion race 2017-02-20 20:42:31 +01:00
Enno Rehling 5ba3d76efb remove race.init_familiar funpointer 2017-02-20 09:32:03 +01:00
Enno Rehling 04154628e6 remove funpointer for spoils 2017-02-20 09:18:04 +01:00
Enno Rehling 59f87edbb1 remove unused race.move_allowed method 2017-02-20 09:00:48 +01:00
Enno Rehling ba1fdcce59 remove race.describe funpointer 2017-02-20 07:47:36 +01:00
Enno Rehling be14394529 load locales and rules separately (xml prep work) 2017-02-19 16:33:24 +01:00
Enno Rehling a1fbfd5bb1 Merge remote-tracking branch 'upstream/master' 2017-02-18 22:08:28 +01:00
Enno Rehling 5490b45381 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-18 22:08:14 +01:00
Enno Rehling 27f9490ec1 Merge pull request #661 from ennorehling/develop 
pedantic gcc compilation
 2017-02-18 22:07:12 +01:00
Enno Rehling b8302b1f15 Merge branch 'develop' of github.com:eressea/server into develop 2017-02-18 22:03:34 +01:00
Enno Rehling b744b6d601 Merge branch 'master' into develop 2017-02-18 22:02:58 +01:00
Enno Rehling 5796f60f16 spells will always resist magic 2017-02-18 22:00:48 +01:00
Enno Rehling 9e14bf5cf9 clang complains about -ansi? 2017-02-18 21:26:38 +01:00
Enno Rehling 12b1dcaa38 remove platform-cruft 2017-02-18 21:23:24 +01:00
Enno Rehling 4e5f1d05ce Be very strict about C standards. 
Compile with -std=c89 in gcc.
remove all // comments (they are nice, but unnecessary).
variables only declared at start of block.
various pedantery.
backwards compatible va_copy for pre-C99 gcc.
 2017-02-18 21:15:14 +01:00
Enno Rehling 5b52451d9d remove unused ai.aggression atribute 2017-02-18 19:21:54 +01:00
Enno Rehling 8d963fefda Merge pull request #660 from ennorehling/develop 
remove shadowcall spell
 2017-02-18 18:38:36 +01:00
Enno Rehling a553b2258a remove code for shadowcall, too 2017-02-18 18:25:58 +01:00
Enno Rehling 7d5586635e remove shadowcall spell 2017-02-18 18:24:44 +01:00
Enno Rehling daa7554361 remove race.precombatspell 2017-02-18 18:14:18 +01:00
Enno Rehling a754975ef9 fix loading data where embassy uses floats. 2017-02-18 17:52:25 +01:00
Enno Rehling d5dcf14a56 Merge pull request #659 from ennorehling/develop 
gcd and rounding error
 2017-02-18 16:08:08 +01:00
Enno Rehling 9bc34a242f Merge branch '2279-fixes' into develop 2017-02-18 15:55:42 +01:00
Enno Rehling 9682d6b48c implement quick-and-dirty gcd 2017-02-18 15:45:57 +01:00
Enno Rehling aee68fbd0f github issue #658 
MACHE 1 EISEN use 1 iron even with savings.
 2017-02-18 11:19:42 +01:00
Enno Rehling d43ccd406a Merge pull request #657 from ennorehling/develop 
BUG 2279: store material savings as a fraction
 2017-02-17 22:16:24 +01:00
Enno Rehling 0a3e3de5a3 refactor fractions a little bit. 2017-02-17 22:01:51 +01:00
Enno Rehling 2328975dc2 do not use floats for material-save. 
abusing variants for storing short fractions.
remove unused RMF_SAVERESOURCE.
 2017-02-17 21:45:10 +01:00
Enno Rehling 01cdfcd2a6 Merge pull request #656 from ennorehling/develop 
BUG 2279: Zuviel Eisen aus der Region abgezogen
 2017-02-16 20:52:28 +01:00
Enno Rehling ed94ef6d48 Merge branch '2279-alloc-save' into develop 2017-02-16 20:36:30 +01:00
Enno Rehling a624915a06 error message if building is required. 
was broken in recent commit.
also fix reference counts.
 2017-02-16 20:26:34 +01:00