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

6756 Commits

Author SHA1 Message Date
Enno Rehling 410fab2d84 Merge remote-tracking branch 'upstream/develop' into develop 2015-11-23 18:33:33 +01:00
Enno Rehling 5b9333f6d9 Merge branch 'release-3.7' into develop 
Conflicts:
	src/buildno.h
	src/monsters.c
 2015-11-23 17:12:48 +01:00
Enno Rehling 1ed0eaf473 release version 3.7.3 2015-11-23 17:10:49 +01:00
Enno Rehling 0e5fcbbc7c Merge pull request #407 from ennorehling/release-3.7 
bugfixes 2163, 2164 and 2165
 2015-11-23 17:07:11 +01:00
Enno Rehling 4b7b32cbb5 use monster_attack, not explicit create_order, because we need to check buildings, etc. 2015-11-23 17:00:07 +01:00
Enno Rehling defd870cd1 https://bugs.eressea.de/view.php?id=2163 
Fix order of Arguments when checking for defensive building.
Solthar reminds us that good variable names are good.
 2015-11-23 16:48:05 +01:00
Enno Rehling b6a947ca0c https://bugs.eressea.de/view.php?id=2165 
Monster bewachten nicht, wenn sie nicht ausreichend bewaffnet waren, weil der nötige Check nicht in can_start_guarding gemacht wurde, sondern in guard_on_cmd.
 2015-11-23 15:35:26 +01:00
Enno Rehling c7ab0e8f59 fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift). 
simplify attack_chance configuration, set it only once.
this way, I can more easily fudge it to 1.0 in the debugger.
 2015-11-23 12:37:42 +01:00
Enno Rehling dcfc1d1f15 Merge pull request #406 from ennorehling/critbit-params 
config_get/config_set refactoring, kill cache logic
 2015-11-23 12:25:16 +01:00
Enno Rehling 48c75466b6 kill static caches for floating-point variables 2015-11-22 17:32:35 +01:00
Enno Rehling 2e392b4d7c eliminate even more static variable caches 2015-11-22 16:14:27 +01:00
Enno Rehling f7698d92a9 change how migrant quota is configured for a race, eliminate the related rule caching 2015-11-22 15:53:50 +01:00
Enno Rehling 5f457f77b4 refactoring: move those count_* functions out of config.c 2015-11-22 15:46:14 +01:00
Enno Rehling 3bd458b5e8 optimization: read configuration once before all battles, not before or during each individual one. 2015-11-22 15:29:43 +01:00
Enno Rehling 7bbf11c6b6 eliminate more static cached configuration values 2015-11-22 15:14:50 +01:00
Enno Rehling 17068af332 unusual potion delay attribute can use a potion in another region? unclear what this code does, but fixing my bad assumption. 2015-11-22 14:36:05 +01:00
Enno Rehling c6bac1e49e refactoring: sprout methods for all special-action potions 
remove static caches for WOL configuration
 2015-11-22 14:28:15 +01:00
Enno Rehling 35e7a0bc79 eliminate global.cookie and the cache-invalidation which it enabled 2015-11-22 12:50:10 +01:00
Enno Rehling 73fc5a51b3 remove more junk defines from config.h, move them closer to where they belong 2015-11-22 12:47:57 +01:00
Enno Rehling bf74eb1446 cleanup: remove movement constatns from config.h 2015-11-22 12:41:22 +01:00
Enno Rehling fa2b5f3aff merge 2015-11-22 12:39:05 +01:00
Enno Rehling cf6084a5ca refactoring: move game configuration defines out of config.h 
temporarily pushing them into settings.h where others already are, though they should be in their own modules or in config files.
 2015-11-22 12:37:25 +01:00
Enno Rehling 0e6d122b92 fix compile 2015-11-22 12:30:34 +01:00
Enno Rehling 74b1f9872e change visibility of configuration data structures, local to config.c only 2015-11-22 12:27:08 +01:00
Enno Rehling fe173e9551 refactor: make sure global.paramteres is used only inside config.c 2015-11-22 12:24:27 +01:00
Enno Rehling edcd79d044 add a config_token function to look for a token inside a list 2015-11-22 12:20:33 +01:00
Enno Rehling a4cb5e2906 replace all get_param_* for global.parameters with config_get_* 2015-11-22 10:44:46 +01:00
Enno Rehling b05fe9316a introducing config_set and config_get so we don't have to refer to globals.parameters everywhere 2015-11-22 10:33:31 +01:00
Enno Rehling 66dd1b8172 remove produce_exp caching in static variables (more slowdown) 2015-11-22 10:21:37 +01:00
Enno Rehling f0a47321d6 reduce log spam 2015-11-21 21:49:33 +01:00
Enno Rehling 6b83120c7a remove caching from is_guarded, which should slow it down significantly :-( 2015-11-21 21:33:17 +01:00
Enno Rehling 7dae5aa035 eliminate silly caching logic from natural armor calculation 2015-11-21 19:02:14 +01:00
Enno Rehling 990fda6234 clean up config.c, remove static configuration caching 2015-11-21 18:13:16 +01:00
Enno Rehling bc936bf019 eliminate more static variable configuration caching 2015-11-21 13:52:47 +01:00
Enno Rehling 7e27928d17 eliminate static variables and cache logic from more modules 2015-11-21 12:28:20 +01:00
Enno Rehling 86faae6eea eliminate static variables and cache logic from upkeep 2015-11-21 12:21:07 +01:00
Enno Rehling 0d91a7dfde eliminate static variables and cache logic 2015-11-21 12:18:38 +01:00
Enno Rehling 6a66d8e4eb Merge remote-tracking branch 'upstream/develop' into develop 2015-11-20 16:02:09 +01:00
Enno Rehling 06f8ba9ee4 faster lookup for get_param with tries 
eliminate unnecessary constatn from rand.c
 2015-11-20 15:48:17 +01:00
Steffen Mecke ae870ff53e fix division by zero 2015-11-19 16:46:46 +01:00
Steffen Mecke afd44fc50a fix test interdependence; set silver weight to 1 2015-11-19 15:29:04 +01:00
Steffen Mecke a6757ecf9d Merge branch 'develop' into massive_overload 
Conflicts:
	src/move.test.c
 2015-11-19 14:54:14 +01:00
Steffen Mecke 92ee0f24a4 tweaked parameters for massive overload 
so ... many ... configuration parameters
scrubbed lua test
 2015-11-19 12:36:15 +01:00
Enno Rehling 0363938db0 Merge pull request #402 from stm2/follow_message 
error msg for movement should contain FOLLOW SHIP order
 2015-11-17 17:42:45 +01:00
Steffen Mecke acb45e079d test commit for travis 2015-11-17 17:34:03 +01:00
Steffen Mecke 8a063c3567 fix bug in dragon_affinity 2015-11-17 17:19:06 +01:00
Steffen Mecke a7a82662b7 reduce maximum overload damage to 38% 2015-11-17 15:47:43 +01:00
Steffen Mecke 742a30cc39 fix seaserpents 
seaserpents could not do piracy
seaserpents should be able to attack after move
 2015-11-17 12:17:28 +01:00
Steffen Mecke 2a569635df seaserpent test 2015-11-17 12:13:23 +01:00
Steffen Mecke a144686e66 monsters may attack on ocean 2015-11-17 12:13:23 +01:00