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

7707 Commits

Author SHA1 Message Date
Enno Rehling 9ac74ceecc fix constant conversion error 2016-11-20 15:14:03 +01:00
Enno Rehling ae951ee780 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-20 14:50:49 +01:00
Enno Rehling 55a0388eb2 fix truncated names that split a utf8 sequence. 2016-11-20 14:50:38 +01:00
Enno Rehling 19a0c2ddb3 quelling some static analysis complaints. 2016-11-19 20:57:10 +01:00
Enno Rehling eabaf8bebb fix last commit. 2016-11-19 16:27:37 +01:00
Enno Rehling 3de1dec4a5 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-19 15:19:57 +01:00
Enno Rehling 531da88b2a squash some static analysis warnings. 2016-11-19 15:19:23 +01:00
Enno Rehling 77c0af3785 Merge pull request #607 from ennorehling/develop 
refactoring and cleanup
 2016-11-18 23:03:02 +01:00
Enno Rehling 14b4ae5859 set volcano acitvation chance to 0 during test. 
should fix issue #606 for good.
also: additional tests for renumbering ships, Xolgrim is wrong.
 2016-11-18 22:31:06 +01:00
Enno Rehling ecbd0ba83c github issue #606 
disable volcano terrain change for snowglobe test
 2016-11-18 13:30:30 +01:00
Enno Rehling 7d874f1606 fix clang builds 2016-11-18 13:24:50 +01:00
Enno Rehling 4fc747fd83 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-18 11:39:14 +01:00
Enno Rehling 4d5c00be90 git rm --cached tolua, to fix travis builds? 2016-11-18 11:38:50 +01:00
Enno Rehling 8b46e1323a declare struct before use 2016-11-18 11:11:21 +01:00
Enno Rehling a08563e846 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2016-11-17 22:10:53 +01:00
Enno Rehling dc2452e2c1 config.h globals cleanup. 2016-11-17 22:10:41 +01:00
Enno Rehling aef475f663 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-17 22:09:51 +01:00
Enno Rehling cb6be542b9 remove unused variables. 2016-11-17 21:32:24 +01:00
Enno Rehling 27605f18ba more boring macros removed. 2016-11-17 21:31:11 +01:00
Enno Rehling 303eb86399 factionid and curseid are also boring. 2016-11-17 21:29:15 +01:00
Enno Rehling 434cf8fce6 the unitid macro is boring. 2016-11-17 21:27:19 +01:00
Enno Rehling bc5e744347 i2b is a bullshit macro. 2016-11-17 21:23:49 +01:00
Enno Rehling 2f305f16d9 additional testing for renumber. 2016-11-17 21:08:35 +01:00
Enno Rehling 6c9e1fb345 more config.h removal. 
freset/fset/fval must die!
 2016-11-17 17:06:31 +01:00
Enno Rehling 476c655cd3 disable osx builds again 2016-11-17 12:43:37 +01:00
Enno Rehling 38f1d53828 temporarily enable osx builds 2016-11-17 11:39:36 +01:00
Enno Rehling d1d1bee8f6 missing struct declarations in curse.h 
remove config.h from spells and curses.
 2016-11-17 11:34:35 +01:00
Enno Rehling b24f8b2839 remove config.h from items/ 2016-11-17 11:25:02 +01:00
Enno Rehling e3b7e19750 sometims we only include config.h for fval. 
I hate fval.
 2016-11-17 10:57:20 +01:00
Enno Rehling d5218b99b8 do not include config.h from util (also, wasn't needed) 
also remove it from monsters.
 2016-11-17 10:55:23 +01:00
Enno Rehling a601a675f6 reduce config.h even more. 
let's get all those global variables out of there.
 2016-11-17 10:42:20 +01:00
Enno Rehling cbb18edb8f declutter config.h, use it sparingly. 2016-11-17 10:38:09 +01:00
Enno Rehling f371a0c5f3 eliminate unused callback module. 
what was I thinking when I wrote this?
 2016-11-17 10:32:20 +01:00
Enno Rehling 42eff95ec2 remove unused empty files 2016-11-17 10:26:30 +01:00
Enno Rehling 3a64a2f404 stop spamming the log when using a listbox. 2016-11-16 23:09:07 +01:00
Enno Rehling 6a75b20315 remove wdwpyramid 2016-11-16 22:57:17 +01:00
Enno Rehling a88bfa7a9a decluttering config.c (rules go into laws.c) 2016-11-16 22:46:01 +01:00
Enno Rehling 413f70d1a1 move market function out of config.c 2016-11-16 22:30:59 +01:00
Enno Rehling 4a66732637 renumber tests for building, ship 2016-11-16 20:41:48 +01:00
Enno Rehling 264fc0cb6f test renumbering units and factions. 2016-11-16 20:03:34 +01:00
Enno Rehling 251c7bb559 re-enable snowglobe assert. 2016-11-16 19:43:06 +01:00
Enno Rehling fbe846864d arguments for test_setup that help debugging tests. 2016-11-16 18:08:10 +01:00
Enno Rehling e50dfbf42b fix terrains.json, reduce config.h use 2016-11-15 23:56:39 +01:00
Enno Rehling 360776f8b9 eliminate data_version variables, issue #479 2016-11-15 23:45:14 +01:00
Enno Rehling 83ea1077a3 delete default terrain. 
github issue #538
 2016-11-15 23:37:30 +01:00
Enno Rehling 17365edff7 move renumber command to a separate module. 2016-11-15 23:34:20 +01:00
Enno Rehling 772bc427aa Merge branch 'develop' of github.com:ennorehling/eressea into develop 2016-11-15 20:44:02 +01:00
Enno Rehling c1f468ceb0 begin to declutter config.c 2016-11-15 20:43:36 +01:00
Enno Rehling 49e5b5b67e gcc missing include 2016-11-14 23:19:28 +01:00
Enno Rehling ce4a3c14b3 convert from atoi to atoip. 
most numbers in commands cannot be negative.
 2016-11-14 22:27:44 +01:00