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

84 commits

Author SHA1 Message Date
Enno Rehling
e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. 2018-12-06 20:04:45 +01:00
Enno Rehling
ab710ea41d fix gmtool compilation 2018-11-04 09:14:36 +01:00
Enno Rehling
dac6ef660d Merge branch 'master' into develop 2018-11-04 09:10:54 +01:00
Enno Rehling
b5b39024f2 BUG 2506: starting regions have bad resource levels. 
add some one-off custom code to fix the resource levels of selected regions
 2018-10-30 21:01:16 +01:00
Enno Rehling
a8ff6d2a99 gmtool can now select and highlight islands. 2018-10-30 20:11:35 +01:00
Enno Rehling
35ed981cd5 help the VS heap profiler understand the code. 
reorder calloc arguments.
rename ursprung -> origin.
 2018-10-22 21:51:11 +02:00
Enno Rehling
a373807189 move attrib and event modules to kernel 2018-09-29 11:37:17 +02:00
Enno Rehling
90b69adb8a Merge branch 'bcrypt' into develop 2018-09-26 20:26:22 +02:00
Enno Rehling
f513c2c68a skip excessive password generation in tests. 2018-09-26 20:19:59 +02:00
Enno Rehling
ccc5556682 adding code to export faction information. 
sqlite3 implementation only, not tied to anything yet.
add faction.uid
remove faction.subscription
 2018-09-24 20:18:21 +02:00
Enno Rehling
dfa9c64465 clean includes for bindings 2018-09-23 19:44:05 +02:00
Enno Rehling
91a7b94cec run iwyu if we have it 2018-09-23 19:03:28 +02:00
Enno Rehling
a876a60b68 Stop using player email to set faction name. 2018-09-13 16:16:32 +02:00
Enno Rehling
d9ba7be884 Merge branch 'master' into develop 2018-07-31 10:42:53 +02:00
Enno Rehling
ced21cc336 BUG 2459 Regionen recycling macht ein Reset der Rohstoffe. 2018-07-13 23:37:45 +02:00
Enno Rehling
5018308170 remove at_chaoscount, update storage module. 2018-06-28 22:48:57 +02:00
Enno Rehling
ce37fd1bb7 remove libxml2 from dependencies 
remove the converter, that isn't a way we're going.
 2018-05-18 21:14:22 +02:00
Enno Rehling
432a8d432d messy merge of cppcheck fixes into develop 2018-02-25 20:41:53 +01:00
Enno Rehling
b7dcee7e08 fix goto-select-faction (itoa bug). 2018-02-25 19:36:28 +01:00
Enno Rehling
aacd0885df fix termination bug in itoa functions. 2018-02-25 19:17:20 +01:00
Enno Rehling
fc2506ee83 cppcheck: DMAXHASH was unused. 
cppcheck: remove warnings, reduce variable scopes.
 2018-02-25 17:58:45 +01:00
Enno Rehling
7b01581302 CATAPULT_STRUCTURAL_DAMAGE was broken. 
check for PDCURSES, not WIN32
 2018-02-25 14:29:25 +01:00
Enno Rehling
d15684a546 fix test_process_turn failure. 
move turn global to calendar.
promote calendar module to kernel.
 2018-02-14 20:01:36 +01:00
Enno Rehling
398a258658 cppcheck: variable scopes, etc. 2018-02-11 15:57:31 +01:00
Enno Rehling
6481acac76 move xmlreader.c up a directory. 2018-01-21 11:03:49 +01:00
Enno Rehling
50173d5be3 PATH_MAX and MAX_PATH are crazy. 2017-12-29 11:44:14 +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
c78fe1ac0a move "do not accidentally terrafomr" logic to gmtool. 2017-12-26 13:29:19 +01:00
Enno Rehling
9f391039b5 more bsdstring removal, str_replace, unit tests. 2017-12-11 18:20:21 +01:00
Enno Rehling
4e12ff536a The MUSEUM_MODULE define is unnecessary. 2017-12-09 21:06:44 +01:00
Enno Rehling
f8f8f8f43f Merge branch 'master' into develop 2017-11-21 08:47:49 +01:00
Enno Rehling
29a6c0ae86 gmtool, highlight and clear chaos 2017-11-21 08:47:35 +01:00
Steffen Mecke
2f35feee3e minor, obvious fixes 2017-11-14 12:51:04 +01:00
Enno Rehling
0cb085378d Merge branch 'master' into develop 
Conflicts:
	src/gmtool.c
 2017-08-07 19:01:07 +02:00
Enno Rehling
2aab736b59 try giving new factions a name 2017-08-07 18:58:39 +02:00
Enno Rehling
c387e985b8 gmtool can clear regions 2017-08-07 18:38:10 +02:00
Enno Rehling
847e6f3e43 limit island size from configuration, deal with existing units. 2017-07-27 16:36:45 +02:00
Enno Rehling
822292c99a do not seed factions when creating islands with 'B'. 2017-07-27 16:16:54 +02:00
Enno Rehling
475c9f8cd8 seed a single faction from newplayers file. 2017-07-23 15:18:16 +02:00
Enno Rehling
a5d350fe3a seed a single faction from newplayers file. 2017-07-23 09:15:23 +02:00
Enno Rehling
733c754e0f rename some configuration options. 
add them to the valid keys for eressea.ini, too.
 2017-03-25 14:15:01 +01:00
Enno Rehling
1a0992e37b remove remainders of the arena. 
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
 2017-02-27 18:21:41 +01:00
Enno Rehling
f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +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
05b6c1c418 Merge branch 'develop' into c99 2017-01-11 09:30:50 +01:00
Enno Rehling
8b7dae6977 kill autoconf.h, replace platform.h for C99 compatibility work 2017-01-10 16:31:05 +01:00
Enno Rehling
3fb12d8f1e replace snprintf and the like. 
you cannot trust _snprintf in MSVC (no zero-termination).
 2017-01-07 21:09:39 +01:00
Enno Rehling
ecd74c53f5 More PVS-Studio warnings eliminated. 2016-11-23 19:19:04 +01:00
Enno Rehling
03a94d1264 remove unused and broken backup functionality 2016-11-14 01:35:45 +01:00
Enno Rehling
693f1be6d1 fix endless loop in cp1252 search (wrong sort) 
fix indentation
additional testing
 2016-10-02 13:12:47 +02:00