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

9894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
04b8068979 rename password functions to match PHP. 2018-09-26 21:07:39 +02:00
Enno Rehling
e462529596 fix merge conflict 
choose sqlite as default database
 2018-09-26 20:36:27 +02:00
Enno Rehling
90b69adb8a Merge branch 'bcrypt' into develop 2018-09-26 20:26:22 +02:00
Enno Rehling
e234a0db6f write the htpasswd file, again 2018-09-26 20:21:56 +02:00
Enno Rehling
f513c2c68a skip excessive password generation in tests. 2018-09-26 20:19:59 +02:00
Enno Rehling
ae05d6d9e9 work factor 12 is incredibly slow, don't use it in tests. 2018-09-26 20:08:38 +02:00
Enno Rehling
2e9bde0261 More WIN32 adaptations, configurable work factor. 2018-09-26 19:05:49 +02:00
Enno Rehling
3c50a4260b add some WIN32 workarounds, tests 2018-09-26 18:43:30 +02:00
Enno Rehling
21e54e0933 move crypto implementations to util/crypto for easier inclusion 2018-09-26 18:33:38 +02:00
Enno Rehling
53afc86e00 fix bcrypt library, add to password.c (works on mac) 2018-09-26 17:09:29 +02:00
Enno Rehling
bbbed80790 add openwall bcrypt sources 2018-09-26 15:37:38 +02:00
Enno Rehling
919f870e22 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-09-25 20:49:50 +02:00
Enno Rehling
74aa4bdaf3 bindings for gamedb_update, run after turn. 2018-09-25 20:39:43 +02:00
Enno Rehling
4e5240628e Extract gamedb open/close to separate functions. 2018-09-25 18:52:29 +02:00
Enno Rehling
274d44ee18 Move the gamedb to a separate file. 2018-09-25 18:07:02 +02:00
Enno Rehling
8cccef41ad sort cmakelists filenames 2018-09-25 18:02:00 +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
409a3da7cf more iwyu warnings 2018-09-24 12:02:01 +02:00
Enno Rehling
d70f05f8db BUG 2478: Fleeing units cannot move. 2018-09-23 20:01:12 +02:00
Enno Rehling
0759482934 clean includes for bindings and main 2018-09-23 19:53:01 +02:00
Enno Rehling
dfa9c64465 clean includes for bindings 2018-09-23 19:44:05 +02:00
Enno Rehling
0ee2faf3f0 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-09-23 19:06:32 +02:00
Enno Rehling
91a7b94cec run iwyu if we have it 2018-09-23 19:03:28 +02:00
Enno Rehling
f609bb01f2 unused variable is never read. 2018-09-23 14:01:47 +02:00
Enno Rehling
174a91968b make herb growth code a little more readable. 2018-09-22 08:54:17 +02:00
Enno Rehling
e169e20cc3 Merge remote-tracking branch 'upstream/master' 2018-09-16 11:30:33 +02:00
Enno Rehling
7dabf554bd Merge remote-tracking branch 'upstream/master' 2018-09-16 11:29:40 +02:00
Enno Rehling
e46826a89c Merge remote-tracking branch 'upstream/develop' into develop 2018-09-16 11:29:29 +02:00
Enno Rehling
cc034861c2 Merge branch 'master' into develop 2018-09-16 11:28:35 +02:00
Enno Rehling
0c3126eb70 fix non-drifting ships crash 2018-09-16 11:25:34 +02:00
Enno Rehling
d777afd794
Merge pull request #807 from ennorehling/develop 
running updates for development branch
 2018-09-16 10:19:49 +02:00
Enno Rehling
c5dd7d69df
Merge pull request #806 from ennorehling/master 
Bugfix: Rosthauch, Abtreiben
 2018-09-16 10:15:05 +02:00
Enno Rehling
868499d941 Merge branch 'master' into develop 2018-09-16 10:12:57 +02:00
Enno Rehling
552dbe5e72 In Rosthauch min und max verwechselt. 2018-09-16 10:10:17 +02:00
Enno Rehling
65675d1947 Fix crash when removing drifted ships. 2018-09-16 10:02:09 +02:00
Enno Rehling
658b47aeb4 remove seaserpent test that is not a test. 2018-09-15 19:12:32 +02:00
Enno Rehling
681cf32e1f remove besiege from keywords[] array 
fix broken at_keys attributes
remove unused global.attribs
 2018-09-15 18:35:27 +02:00
Enno Rehling
a876a60b68 Stop using player email to set faction name. 2018-09-13 16:16:32 +02:00
Steffen Mecke
a90ae46d52 assert assumption on armor 2018-09-13 10:59:15 +02:00
Enno Rehling
d6e8b38724 FOLGE SCHIFF reparieren (hat UFL_LONGORDER getestet). 2018-09-12 20:35:27 +02:00
Steffen Mecke
69702df203 refactor terminate finished 2018-09-12 15:11:39 +02:00
Steffen Mecke
d981044953 refactor calculate_armor 2018-09-12 15:11:39 +02:00
Steffen Mecke
c15b4c8fbf refactor terminate (calculate_armor/resistance) 2018-09-12 15:11:34 +02:00
Enno Rehling
ecaf72324c Bug 2481: FOLGE wurde durch ZAUBERE verhindert. 2018-09-10 19:50:22 +02:00
Enno Rehling
12fd6435c5 eliminate apparently dead code, and coverity warning. 2018-09-10 18:17:34 +02:00
Enno Rehling
419ff9b514 Merge remote-tracking branch 'upstream/master' 2018-09-10 18:00:27 +02:00
Enno Rehling
b2c2942c60 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-10 17:58:22 +02:00
Enno Rehling
d32689bac8 experiments with clang-tidy 2018-09-10 17:58:14 +02:00
Enno Rehling
bca987ee64 force tag update after release 2018-09-10 17:54:39 +02:00
Enno Rehling
418d6b1f6c Bug 2486: spawn_chance für Drachen und Seeschlangen war zu hoch. 2018-09-10 17:52:23 +02:00