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

4623 commits

Author SHA1 Message Date
Enno Rehling
ce5ac00b80 remove rowcache optimization, it had hardly any effect. 2021-03-25 19:21:58 +01:00
Enno Rehling
53d4010958 code style: use quotes on local includes 2021-03-24 21:41:20 +01:00
Enno Rehling
3cf58f74af
Merge pull request #936 from stm2/dreams_and_allies 
FFL_DEFENDER is deprecated and interfers with dreams
 2021-03-24 21:24:27 +01:00
Enno Rehling
081965f0bc remove BATTLE_FAST code 
it didn't actually make battles fast.
 2021-03-24 21:13:59 +01:00
Enno Rehling
44765edede Merge branch 'develop' into stm2-confusion_and_panic 2021-03-24 21:07:16 +01:00
Enno Rehling
35f562a53f fix damage calculation, again 
scale_number was messing with the hp
 2021-03-24 21:04:50 +01:00
Enno Rehling
195e49e7f0 disable the battle.fast cache 
it doesn't look very good, anyhow
let's see how much that actually costs
 2021-03-24 20:58:33 +01:00
Enno Rehling
b5cc4e6fac flee_spell did not need an extra argument 
checking for precombat spells is easy and safe!
 2021-03-24 20:58:32 +01:00
Enno Rehling
a2d4345f49 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
fc438fe0a7 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Enno Rehling
8ed2738bc0 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
0928fe0d02 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Enno Rehling
52ba83addd fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
d85ac9b2f9 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Steffen Mecke
fae0c2608c fix for flee spell 2021-03-24 20:58:32 +01:00
Enno Rehling
8b2857f582 fix recent change for terraforming herbs 2021-03-24 20:58:32 +01:00
Enno Rehling
6feb616c2d terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:32 +01:00
Enno Rehling
235075b54e fix recent change for terraforming herbs 2021-03-24 20:58:31 +01:00
Enno Rehling
d3b8c7a2d2 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:31 +01:00
Enno Rehling
48b0e41c86 fix recent change for terraforming herbs 2021-03-24 20:58:31 +01:00
Enno Rehling
970e3c5432 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-24 20:58:31 +01:00
Steffen Mecke
807177cc68 reverting "fix" 2021-03-24 20:57:46 +01:00
Steffen Mecke
a713779f34 Gesang der Verwirrung bringt Buchhaltung durcheinander 2021-03-24 20:57:46 +01:00
Enno Rehling
19db01af67 new volcano damage calculation was broken. 2021-03-24 20:56:30 +01:00
Steffen Mecke
598b566ab8 FFL_DEFENDER is deprecated and interfers with dreams 2021-03-24 11:29:19 +01:00
Enno Rehling
335740d12b undo curse_active change 
curses should survive the death of a magician.
good dreams needs a magician to decide allegiance.
 2021-03-23 21:03:12 +01:00
Enno Rehling
13f9006148 add a test for gooddreams skill modifier. 2021-03-23 20:01:42 +01:00
Enno Rehling
a9a7609a9a make curse_active check for a magician. 
fix tests that were using curses without a creator.
 2021-03-23 19:27:11 +01:00
Enno Rehling
5e7fba50d6 Dämonen können magisch reanimiert werden. 2021-03-23 18:53:11 +01:00
Enno Rehling
5452987cb7 flee_spell did not need an extra argument 
checking for precombat spells is easy and safe!
 2021-03-23 18:53:11 +01:00
Enno Rehling
b6e084c758 fix recent change for terraforming herbs 2021-03-23 18:52:42 +01:00
Enno Rehling
bb82df04c4 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:52:42 +01:00
Enno Rehling
de9918f018 fix recent change for terraforming herbs 2021-03-23 18:52:06 +01:00
Enno Rehling
3ef6559c5f terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:52:06 +01:00
Enno Rehling
181d82819a fix unsigned mismatch 2021-03-23 18:51:38 +01:00
Enno Rehling
9c9be163d8 fix review comments, 
extract meffect_protection and add a test.
 2021-03-23 18:51:38 +01:00
Enno Rehling
f11802d817 eliminate some type conversion warnings (MSVC) 2021-03-23 18:51:38 +01:00
Enno Rehling
521ae1f769 fix recent change for terraforming herbs 2021-03-23 18:51:38 +01:00
Enno Rehling
eb1785568d terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:51:37 +01:00
Steffen Mecke
5a595bd315 fix for flee spell 2021-03-23 18:50:49 +01:00
Steffen Mecke
4ee01be75f fix für Schild des Fisches 2021-03-23 18:50:49 +01:00
Enno Rehling
3548722a58 clarification: at_dict is deprecated but has a conversion. 2021-03-23 18:50:48 +01:00
Enno Rehling
0573ddfbab https://bugs.eressea.de/view.php?id=2732 
fix permanent smurfs
 2021-03-23 18:50:48 +01:00
Enno Rehling
5fef373181 fix recent change for terraforming herbs 2021-03-23 18:50:48 +01:00
Enno Rehling
316188531e terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-23 18:50:48 +01:00
Enno Rehling
e19bd8bd08 fix unsigned mismatch 2021-03-21 18:55:31 +01:00
Enno Rehling
dea6149902 fix review comments, 
extract meffect_protection and add a test.
 2021-03-21 18:35:08 +01:00
Enno Rehling
76e99c6957 eliminate some type conversion warnings (MSVC) 2021-03-21 18:09:21 +01:00
Enno Rehling
fb52bc8846 clarification: at_dict is deprecated but has a conversion. 2021-03-21 18:02:04 +01:00
Enno Rehling
7fcecc9468 https://bugs.eressea.de/view.php?id=2732 
fix permanent smurfs
 2021-03-21 18:02:04 +01:00
Enno Rehling
d7b0da327b fix recent change for terraforming herbs 2021-03-21 18:02:04 +01:00
Enno Rehling
9a1765d917 terraforming changes herbs 
https://bugs.eressea.de/view.php?id=2730
 2021-03-21 18:02:04 +01:00
Steffen Mecke
109b5d78a7 good dreams end when magician is dead 2021-03-21 14:14:01 +01:00
Steffen Mecke
5f7860b6e6 fix für Schild des Fisches 2021-03-21 12:47:51 +01:00
Enno Rehling
36653ec65b fix highly theoretical source of crash. 
bind_eressea now checks if bindings were called without filename
 2021-03-15 20:00:58 +01:00
Enno Rehling
56141ee7a1 include what you use 2021-03-14 17:42:18 +01:00
Enno Rehling
d1aff44d7b Happy Pi day! 
Let's use M_PI, it's available in all known math.h implementations.
 2021-03-14 17:39:53 +01:00
Enno Rehling
07c1dee907 materials array is terminated with number == 0 
we say nothing about rtype.
 2021-03-14 16:35:55 +01:00
Enno Rehling
5b7a3cba32 buildings offer protection from volcano damage 2021-03-13 21:19:40 +01:00
Enno Rehling
5876c1a011 https://bugs.eressea.de/view.php?id=2729 
castles were giving too much protection.
 2021-03-13 21:18:47 +01:00
Enno Rehling
812907ffb5 Add_compile_options(/FC) fixes error messages. 
The build output window was showing the wrong filename. See:
https://developercommunity.visualstudio.com/t/cmake-project-cant-click-on-error/729350
https://gitlab.kitware.com/cmake/cmake/-/issues/18261
 2021-03-13 17:08:15 +01:00
Enno Rehling
14e95c9675 refactoring building_stage.construction 
every building_stage has a construction.
no need to malloc it separately.
optimize some more allocations.
replace some memset and calloc calls.
 2021-03-13 15:38:16 +01:00
Enno Rehling
e6e5e75c4c let's try something: exparse handlers should not allocate 2021-03-13 14:39:20 +01:00
Enno Rehling
c5b8839634 introduce new building_protection as a shortcut. 2021-03-13 14:25:30 +01:00
Enno Rehling
376b1106a6 rename to bt_protection 2021-03-13 14:20:37 +01:00
Enno Rehling
c8d8eb85d3 code style: do not cast the result of malloc 2021-03-13 14:17:07 +01:00
Enno Rehling
b9a20bb378 C90 has no inline keyword 2021-03-13 09:01:40 +01:00
Enno Rehling
a9ca16e767 Testing for C90 compatibility 2021-03-13 08:55:45 +01:00
Enno Rehling
38fd655af9 remove the weird rounding macro from peasant growth 2021-03-13 08:14:01 +01:00
Enno Rehling
9c8df88525 reset rng injection before runnign test. 2021-03-12 20:43:43 +01:00
Enno Rehling
dd23307e8e unused variable 2021-03-12 20:23:00 +01:00
Enno Rehling
f9346f4332 lucky cats can survive a volcano 2021-03-12 20:11:45 +01:00
Enno Rehling
154e610423 unused variable 2021-03-12 19:57:27 +01:00
Enno Rehling
8dbe1b6bd3 bring back healing potion effects 2021-03-12 19:38:18 +01:00
Enno Rehling
b288a62542 simplify random injection, extend it to integer constants 2021-03-12 19:24:44 +01:00
Enno Rehling
cd8cd3c45d replace damage_unit with somethign that doesn't malloc 2021-03-11 20:15:25 +01:00
Enno Rehling
e2a567e9c9 add tests for dice_rand term evaluation 2021-03-11 19:53:44 +01:00
Enno Rehling
c0304ff572 error message whenever we recruit less than ordered. 2021-03-11 19:26:50 +01:00
Enno Rehling
010dde1cb8 fix bug in last change, could not give items to peasants. 2021-03-04 15:49:12 +01:00
Enno Rehling
5df3c3dc4b fix a crash in give_cmd. 
do give_unit last, because it kills the actively iterated list.
 2021-03-03 20:10:51 +01:00
Enno Rehling
7d434323a7 make use of build no. 2021-02-28 17:11:31 +01:00
Enno Rehling
3df552676c begin work on version 3.28 2021-02-24 19:46:55 +01:00
Enno Rehling
ccba09390b compile with ERESSEA_VERSION 2021-02-24 19:45:45 +01:00
Enno Rehling
f48551ebcb remove unicode from autoseed (races are always english tokens) 2021-02-24 18:48:12 +01:00
Enno Rehling
355b9ff7fc remove lunit from repository (use luarocks) 
make info panel bigger, do not cut off names.
 2021-02-22 19:51:46 +01:00
Enno Rehling
6176e5e754 gmtool no longer needs unicode.h 2021-02-21 22:58:17 +01:00
Enno Rehling
df4317f9f1 remove non-utf8 hacks from mapper. 
correclty refresh map window after listboxes close.
 2021-02-21 22:32:40 +01:00
Enno Rehling
979f2f7b6e build with ncursesw 
Now we can display special characters and proper boxes
 2021-02-21 22:05:43 +01:00
Enno Rehling
a3499dd895 fix new bug in ascii converter. 2021-02-21 21:01:52 +01:00
Enno Rehling
abf548cecd overdue unicode cleanup. 
our new pdcurses can do utf8 output, let's use it.
convert output on a windows tty to codepage 1252.
 2021-02-21 20:49:03 +01:00
Enno Rehling
b9eea2c8a2 forgot to increase verison number for 3.27 2021-02-21 13:41:36 +01:00
Enno Rehling
d8c0b57864 we don't need to track age statistics for any but the new factions. rename global age to newbies. 2021-02-21 00:54:33 +01:00
Enno Rehling
e1d117754a fix new callback signature for jsonconf 2021-02-21 00:37:31 +01:00
Enno Rehling
d4f09fbf74 fix tests that expected the old storage library behavior 2021-02-21 00:21:19 +01:00
Enno Rehling
3db561ec3a require cmake 3.13, not more 2021-02-20 23:24:50 +01:00
Enno Rehling
e0e82c5fa5 fix MSVC warning levels, move _CRT_SECURE_NO_WARNINGS define to sources 2021-02-20 23:22:10 +01:00
Enno Rehling
4dfa1035b6 fix libbsd and string function detection 2021-02-18 22:26:41 +01:00
Enno Rehling
b63d5e31ac tolua update again 2021-02-16 10:12:05 +01:00
Enno Rehling
c8d03c9ea3 fix inifile and tolua builds 
remove our custom assert header
 2021-02-16 10:12:05 +01:00
Enno Rehling
e156a65779 fix the inifile cli editor 2021-02-16 10:12:05 +01:00