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

5370 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
835b0964ef fix gcc 2014-11-03 09:55:29 +01:00
Enno Rehling
b2140f54fd refactor, move give_cmd into give.c 2014-11-03 08:44:26 +01:00
Enno Rehling
38a0a02565 refactor tests for giving, add test for GIVE HERBS. 2014-11-03 08:33:07 +01:00
Enno Rehling
9a0268ac96 bug 2042, pools not working. 2014-11-03 07:52:00 +01:00
Enno Rehling
8c591a41bb Merge pull request #49 from badgerman/master 
Dragons are looting, not taxing.
 2014-11-02 12:57:59 +01:00
Enno Rehling
0b96cc7d13 fix previous commit 2014-11-02 12:54:49 +01:00
Enno Rehling
59075b7194 fixing the gcc build (switch warning) 2014-11-02 12:45:20 +01:00
Enno Rehling
ecc3b1b441 Dragons re using the new LOOT command. 
Fixing the income message (missing ")").
 2014-11-02 11:10:26 +01:00
Enno Rehling
5dc9362d71 Merge branch 'master' of github.com:eressea/server 2014-11-02 10:42:23 +01:00
Enno Rehling
2b596b40f6 Merge branch 'master' of github.com:eressea/server 2014-11-02 10:40:49 +01:00
Enno Rehling
00ba5538f5 Merge pull request #48 from badgerman/master 
more refactoring, no new features.
 2014-11-02 10:34:37 +01:00
Enno Rehling
eba75c52f3 Merge branch 'CTD1-loot' 2014-11-02 10:07:48 +01:00
Enno Rehling
bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 2014-11-02 10:02:30 +01:00
Enno Rehling
367307575c Merge branch 'master' of github.com:eressea/server 2014-11-01 22:12:11 +01:00
Enno Rehling
14bcaf7d71 Merge branch 'version-3-3' 
Update build number
 2014-11-01 21:58:33 +01:00
Enno Rehling
dc7cbd886c fix the quit command, asserting the wrong keyword (probably copypasta). 2014-11-01 21:57:06 +01:00
Enno Rehling
59c1c23324 refactor config.c, move the find* functions into the modules they belong to. 2014-11-01 18:34:53 +01:00
Enno Rehling
27f94783bc fix gcc build, forward-declare structs in the header. 
MSVC allows structs to be declared in a function signature, gcc wants
to know about them earlier.
 2014-11-01 13:10:22 +01:00
Enno Rehling
1af315ebf2 move magic out of kernel, into src. 
clean up/remove a ton of includes, especially of types.h (include in header if you need it, not in every .c file).
 2014-11-01 12:57:01 +01:00
Enno Rehling
81bfb598d0 refactoring modules, cleaning out the config.c kitchen sink. 
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
 2014-11-01 12:09:56 +01:00
Enno Rehling
a29e6a7f40 fix segmentation fault in new assert (units without a faction) 2014-10-31 22:20:07 +01:00
Enno Rehling
17e86ab6cd Merge branch 'master' of github.com:badgerman/eressea 2014-10-31 22:11:09 +01:00
Enno Rehling
af616b5b09 fix segmentation fault in test. 2014-10-31 22:10:52 +01:00
Enno Rehling
5b6663cad7 Assert that magicians are single-person units in a few places. 
Bug 2028 claims that this is not always the case, though I cannot prove it.
 2014-10-31 22:03:00 +01:00