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

5794 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
06d5175030 add travis build script to branch 2014-12-08 20:03:04 +01:00
Enno Rehling
c0460197b1 add travis configuration to branch 2014-12-08 19:37:02 +01:00
Enno Rehling
7d5280196a prevent an error when empty units get zombified to protect magic item loss 2014-12-07 11:14:41 +01:00
Enno Rehling
3dd3761acd prevent an invalid assert when undead heroes are magical 2014-12-07 11:14:14 +01:00
Enno Rehling
66f733e105 Merge pull request #58 from badgerman/master 
Accepting Don's changes to the setup script, adding tests.
 2014-11-26 18:38:03 +01:00
Enno Rehling
6438d6807e accepting Don's changes to the setup script. 
back-filling test for faction.get and get_faction.
 2014-11-26 18:37:07 +01:00
Enno Rehling
8553d9e610 Merge pull request #57 from badgerman/master 
fix missing get_faction binding, add faction.get()
 2014-11-26 17:48:46 +01:00
Enno Rehling
4d329b8bf8 fix missing get_faction binding, add faction.get() 2014-11-26 17:44:02 +01:00
Enno Rehling
f7a2cf2015 Merge pull request #54 from badgerman/master 
monster refactoring
 2014-11-24 14:12:58 +01:00
Enno Rehling
7b2d1991d8 add missing file, fix factions that lack a locale. 2014-11-23 21:15:09 +01:00
Enno Rehling
f92df416ff monsters need a default locale, or their report will crash (thanks, Don!) 
- empty factions have not seen any region, prevent the code from crashing in that case.
- must load the rules even when only writing the reports (taxation affects guards?)
 2014-11-23 15:50:22 +01:00
Enno Rehling
7d5109329f tests for entering ships (but not yet full coverage) 2014-11-21 17:13:45 +01:00
Enno Rehling
64a2073033 tests for entering buildings. 2014-11-21 16:39:49 +01:00
Enno Rehling
0ab15a7791 Merge pull request #55 from TomBraun/patch-1 
Update README.md
 2014-11-17 13:26:26 +01:00
Enno Rehling
2fe40f00f5 Merge branch 'master' of github.com:eressea/server 2014-11-16 13:08:17 +01:00
Enno Rehling
a5f14e7f02 Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-11-16 12:55:58 +01:00
Enno Rehling
13b443ebb3 fix crash (null pointer in make_cmd) 2014-11-16 12:49:39 +01:00
Enno Rehling
c20fb13532 buildno.h name change 2014-11-16 12:40:08 +01:00
TomBraun
1daccfc309 Update README.md 2014-11-13 14:47:03 +01:00
Enno Rehling
efe23698bc Merge pull request #53 from CTD1/Guard_and_Flying 
Flieger und Bewache
 2014-11-11 17:38:58 +01:00
Enno Rehling
691b81e086 Merge branch 'master' of github.com:badgerman/eressea 2014-11-11 17:22:44 +01:00
Enno Rehling
5b9eb9080f refactoring: move all monster-related code into monster.c 
make some features depend on being NPCs, not monster faction.
 2014-11-11 16:53:56 +01:00
Enno Rehling
b8306d42f5 remove unarmed damage bonus rule 2014-11-11 12:13:44 +01:00
CTD
f3cce58be5 smal fixes for Linux 2014-11-11 10:53:29 +01:00
CTD
9d3b2f3da9 Flieger und Bewache 
Flieger können nur noch durch andere Flieger aufgehalten werden.
Damit können Drachen auch in Bewachten Regionen plündern.
 2014-11-11 10:17:55 +01:00
Enno Rehling
ebd115b04a refactor of rc_specialdamage, and move it into battle, nothing else uses it. 2014-11-09 22:31:41 +01:00
Enno Rehling
a28cbc647a loot refactoring and a small armor/shield fix. 2014-11-09 14:39:48 +01:00
Enno Rehling
f55ab5f752 the build number is in a new file. 2014-11-09 12:20:16 +01:00
Enno Rehling
7bebea4f67 Merge branch 'master' of github.com:eressea/server 2014-11-09 00:25:06 +01:00
Enno Rehling
9c0a7c0e2e Merge branch 'version-3-3' 
Conflicts:
	src/build.h
 2014-11-08 22:56:53 +01:00
Enno Rehling
1556c07787 fix a crash when missing a token 2014-11-08 22:55:07 +01:00
Enno Rehling
09be8414c6 Merge pull request #52 from badgerman/master 
better separation between monsters and NPCs
 2014-11-07 23:32:57 +01:00
Enno Rehling
85a5a433bb writing reports should not depend on the monster faction, this is silly. 2014-11-07 23:16:00 +01:00
Enno Rehling
e9084d9678 when free_gamedata, also unhash all factions. speed up is_monsters(). 2014-11-07 22:58:29 +01:00
Enno Rehling
d1f7fb571c fix test for get_monsters(), nobody needs the function to ever return NULL. 2014-11-07 21:28:58 +01:00
Enno Rehling
c8f2f33eab clean up some dealings with monsters and NPCs 2014-11-07 21:15:46 +01:00
Enno Rehling
49493fa630 fix typo in last commit. 
package is a standard lua module, not a good variable name.
log name of script.
 2014-11-06 07:53:15 +01:00
Enno Rehling
143fab9653 Some changes after talking to Don. 
moved locale change into its own module.
made monsters get a report by default.
reoved old creation.c code, it was dead.
 2014-11-06 07:15:53 +01:00
Enno Rehling
61f675fad8 critbit submodule update 2014-11-04 08:14:53 +01:00
Enno Rehling
93e20ac7a9 clean up data files after tests are finished. 2014-11-04 08:06:46 +01:00
Enno Rehling
6f0773a15f Merge pull request #51 from badgerman/master 
fix json test (null-terminate read)
 2014-11-04 08:02:17 +01:00
Enno Rehling
93cdec9ddc fix json test (null-terminate read) 2014-11-04 07:57:29 +01:00
Enno Rehling
8912a59ac4 fix json test. our fault, not the fault of storage 2014-11-04 07:50:33 +01:00
Enno Rehling
4081480e4a upgrade to latest stoarge library with bugfixes 2014-11-04 07:43:19 +01:00
Enno Rehling
7b47f5fa78 Merge pull request #50 from badgerman/master 
Bugfixes pre-release turn 901, new storage library.
 2014-11-03 22:37:14 +01:00
Enno Rehling
dbf60a7ce5 update to latest version of storage library. 2014-11-03 22:29:04 +01:00
Enno Rehling
f623133344 storage takes ownership of the FILE* (really need to change this API). 2014-11-03 19:03:44 +01:00
Enno Rehling
16c03a8e0e typo broke gcc build. 2014-11-03 18:44:49 +01:00
Enno Rehling
fecf3b04f8 bug 2041: group alliances are lost. 
added test coverage, too.
 2014-11-03 18:10:05 +01:00
Enno Rehling
d14a40b7e7 fix struct declarations. 2014-11-03 17:32:55 +01:00