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

74 Commits

Author SHA1 Message Date
Enno Rehling 178f7c2e19 add number of ships for convoys. 
check required crew skills.
require number of captains >= ship.number.
 2019-10-06 18:11:10 +02:00
Enno Rehling 8433052c64 CID 204092: Memory - illegal accesses (NEGATIVE_RETURNS) 2019-09-19 05:05:13 +02:00
Enno Rehling 96facd21d9 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-19 05:03:55 +02:00
Enno Rehling 17ba4e7746 allow clearing attributes from lua 2019-09-19 05:03:01 +02:00
Enno Rehling ea9e31d1b2 tests for trolls riding on carts. 2019-09-15 20:32:07 +02:00
Enno Rehling 968f67a567 delete intermittent test: ents have no special guarding powers. 2019-04-27 18:30:30 +02:00
Enno Rehling 0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling af91459fb1 add some variety to familiar selection. 
effskill: use NULL, not 0 for pointer arguments.
 2019-02-02 20:38:02 +01:00
Enno Rehling 15a6d9217b cppcheck style 2018-12-02 11:13:58 +01:00
Enno Rehling dd7b0e4db3 re-enable disabled test. 2018-12-02 05:10:39 +01:00
Enno Rehling 01b7538ffd remove jsreport. 
fix some cppcheck warnings.
 2018-12-02 05:04:58 +01:00
Enno Rehling 3e54d307df replace bsdstring in bufunit 2018-11-24 12:26:52 +01:00
Enno Rehling 4a66b558c5 WIP: refactor struct sc_mage (make it private). 
tests are failing and/or slow.
 2018-11-18 21:47:14 +01:00
Enno Rehling a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling dfa9c64465 clean includes for bindings 2018-09-23 19:44:05 +02:00
Enno Rehling 4978e95b9a delete leftover npc callbacks. 2018-08-03 06:52:37 +02:00
Enno Rehling fc0616ed1e kill lua triggers for npc logic, never used. 2018-08-03 06:47:29 +02:00
Enno Rehling ad0464ab50 BUG 2168: call sink_ship for ships that take too much damage. 2018-08-01 10:04:12 +02:00
Enno Rehling 271352d0ba create a lua module that can handle simple euipments. 
lua test for equip_unit, with callbacks.
 2018-05-12 19:10:40 +02:00
Enno Rehling cf46acdc6a bufunit does not write an indent, doe not need the parameter. 2018-02-24 19:46:34 +01:00
Enno Rehling 4247ef96b1 why are we using the short type? 2018-01-21 11:14:55 +01:00
Enno Rehling 0b20c379b6 enhance foolpotion test. 2018-01-21 11:03:49 +01:00
Enno Rehling 3d69f4e372 start removing dependencies on potion_type. 
use item_type where we can. does not compile, is WIP.
 2018-01-14 17:40:48 +01:00
Enno Rehling d2cbed3042 BUG 2408: acceptance test for TARNE PARTEI 2018-01-10 18:38:38 +01:00
Enno Rehling f98eab56c4 platform.h is only for WIN32 now. 
replace MIN and MAX macros, they are BAD.
 2017-12-29 06:13:28 +01:00
Enno Rehling f82fe6e963 more frequent use util/macros.h instead of platform.h 2017-12-28 18:55:45 +01:00
Enno Rehling 2ca236e68c Add lua tests for ROUTE. 2017-12-10 20:54:02 +01:00
Enno Rehling 866abcc92c remove obsolete defines. 2017-12-09 16:53:36 +01:00
Enno Rehling 6c18604bce Failing acceptance test for bug 2391. 2017-12-09 10:24:31 +01:00
Enno Rehling 34cd692c2d remove the locale from orders. 2017-10-13 19:33:28 +02:00
Enno Rehling f594a908df deprecate old get_mage implementation. 
fix test_familiar_equip with new get_mage.
 2017-10-06 21:53:07 +02:00
Enno Rehling 2ce94f2d47 BUG 2367: refactor create_newfamiliar. 
add first failing test for bug report.
 2017-10-06 21:23:58 +02:00
Enno Rehling 8e9866f0ce additional tests for spells. 
also some support functionality for lua tests.
 2017-05-01 19:09:00 +02:00
Enno Rehling 294b7bf01e route all casting through a single cast_spell function. 2017-04-30 10:00:29 +02:00
Enno Rehling 75049d3bbc unit.has_attrib should not require the attribute to be registered. 2017-03-27 22:07:18 +02:00
Enno Rehling f2bb51b3ab Merge branch 'master' into develop 
Conflicts:
	res/adamantium.xml
	res/core/resources/laen.xml
	scripts/tests/common.lua
	scripts/tests/e2/adamantium.lua
	scripts/tests/e2/e2features.lua
	scripts/tests/e2/items.lua
	scripts/tests/items.lua
	src/bind_unit.c
	src/economy.test.c
	src/kernel/resources.c
	src/util/attrib.c
 2017-03-26 21:01:21 +02:00
Enno Rehling 10edb1d3e9 enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-03-26 13:10:23 +02:00
Enno Rehling 462d0118e3 better testing for some items. 2017-02-27 20:16:50 +01:00
Enno Rehling 9d09574d5e enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-02-27 19:35:14 +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 3ea12be564 BENUTZE Muschel repariert. 
at_keys hat jetzt auch zu jedem key ein value, und Funktionen zum Update altee Daten.
 2017-02-13 18:48:38 +01:00
Enno Rehling 10e78b1455 remove code for dict and lua .objects properties. 
rewrite muschelplateau code to use keys.
 2017-02-11 22:15:21 +01:00
Enno Rehling a4badc0a75 remove quicklist shim, use selist everywhere 2017-01-26 17:41:21 +01:00
Enno Rehling ecd74c53f5 More PVS-Studio warnings eliminated. 2016-11-23 19:19:04 +01:00
Enno Rehling 754ad78db7 WIP: remove GUARD_* flags. 
TODO: does not compile
TODO: write new guard.test.c tests
 2016-10-31 07:45:06 +01: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 0124bafdc4 delete dead code 2016-09-11 16:44:35 +02:00
Enno Rehling f2c02232cd http://bugs.eressea.de/view.php?id=2207 
check that there are any regions that we can seed new factions into
don't run into endless loop
 2016-07-30 22:01:10 +02:00
Enno Rehling e6f3dc8b85 Merge branch 'master' into develop 
Conflicts:
	scripts/run-turn.lua
	src/buildno.h
	src/kernel/group.c
	src/kernel/save.c
	src/kernel/save.test.c
	src/kernel/version.h
	src/util/password.c
	src/util/password.test.c
	tests/run-turn.sh
 2016-02-23 10:47:33 +01:00