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

3697 Commits

Author SHA1 Message Date
Enno Rehling 8e0c560839 this compiles, but it's broken in a number of ways (spells) 2010-02-21 00:35:39 +00:00
Enno Rehling 7607f5e41d Merging madly with changes made only in the hg repository. DNC, WIP 2010-02-20 23:29:46 +00:00
Enno Rehling e168415452 first changes from hg_eressea transferred 2010-02-20 18:55:42 +00:00
Enno Rehling a7ad6adce1 fixed the unity build (somewhat) 
renamed config.h -> platform.h
forced to change a lot of includes
 2010-02-20 08:31:56 +00:00
Enno Rehling 773020e49a moving directories around for FOSS separation (WIP, DNC) 2010-02-20 05:46:41 +00:00
Enno Rehling b28f8ad007 upgrayyed sqlite to 3.6.22 2010-02-20 05:42:44 +00:00
Enno Rehling 7dfadfd887 eventbus WIP 2010-02-20 03:10:22 +00:00
Enno Rehling c8bc10dfe8 2010-02-19 23:54:42 +00:00
Enno Rehling 8c152a95ae creating a branch for open-source development 2010-02-19 23:53:36 +00:00
Enno Rehling efeeba13c2 we can now pass extra spell parameters to a lua spell. 2010-02-16 02:40:31 +00:00
Enno Rehling cf481970e8 test around the create_roi spell. 2010-02-15 06:18:11 +00:00
Enno Rehling 319bc940b0 gcc fixes 2010-02-15 04:03:24 +00:00
Enno Rehling 198bb82c52 lua_ext attribute with bson storage of lua objects. 2010-02-15 03:54:13 +00:00
Enno Rehling d811437804 modified for fewer MSVC warnings 2010-02-15 03:52:54 +00:00
Enno Rehling fdfc1a9e4f bson library 2010-02-15 03:52:26 +00:00
Enno Rehling 6d46593d6c typo 
Issue: 1711
 2010-02-12 06:29:32 +00:00
Enno Rehling 930f3b1b94 renamed UFL_ANON_FACTION 
fixed a bug where units could be anon in E3

Issue: 1717
 2010-02-12 06:08:32 +00:00
Enno Rehling b215265330 display of resources sometimes bugged. 
Issue: 1718
 2010-02-12 05:26:13 +00:00
Enno Rehling dbde06fb8f fix: taxation buildings only count if they are currently in use. 2010-02-12 05:06:26 +00:00
Enno Rehling d38a2d28d3 friendly transfer of owners fixed. 
Issue: 1704
 2010-02-12 04:39:28 +00:00
Enno Rehling 76a173628a towershield: iron -1 2010-02-11 05:33:02 +00:00
Enno Rehling 6def085715 fix hunger/fishing 2010-02-11 05:24:29 +00:00
Enno Rehling e443e26e18 bugfixes last commits 2010-02-11 05:17:06 +00:00
Enno Rehling e6fcd984bc fix crashes in potion-descriptions (E3) 2010-02-11 04:43:57 +00:00
Enno Rehling ef60ac9ece Miscellaneous fixes, all related to region_owners having leaked into E2. 
Issue: 1720
 2010-02-11 04:42:58 +00:00
Enno Rehling 61c1dac6ce Miscellaneous fixes, all related to region_owners having leaked into E2. Still doesn't run a full turn of E2. Needs tests. 
Issue: 1720
 2010-02-10 08:21:05 +00:00
Enno Rehling 5415d3bf20 bug in fishing-code 2010-02-10 06:30:47 +00:00
Enno Rehling 8553d0083b trade 2:1 except money 
dwarven/halfling armor
remove stone and metal bonus for dwarves
 2010-02-09 03:47:31 +00:00
Enno Rehling a90235aa3c korrektur.c[hc] are no longer in use. surprise! 2010-02-08 07:01:28 +00:00
Enno Rehling db7ad62677 removing init_spells, reducing spelldata, making code prettier (but not awesome yet). 2010-02-07 07:57:51 +00:00
Enno Rehling adf9f1e0ec combat spells need to be marked up when exported. 2010-02-07 07:22:11 +00:00
Enno Rehling e89752fc54 aura-regeneration reduced by popular vote 2010-02-06 19:07:26 +00:00
Enno Rehling 7c0cb78bbf fix crash when items disappear 2010-02-06 18:11:23 +00:00
Enno Rehling c481a5e80a operator precedence confusion 2010-02-06 06:27:31 +00:00
Enno Rehling 2cef07790c aura regeneration improved 2010-02-06 06:07:17 +00:00
Enno Rehling 0706fd4981 wrong variable name 2010-02-06 03:53:55 +00:00
Enno Rehling b9573968ed nmr-warning more precise. 2010-02-02 07:32:30 +00:00
Enno Rehling 6eb4ea796b QUIT-gifts and NMR-warnings depend on alliance, not HELP 2010-02-02 07:30:03 +00:00
Enno Rehling 98b529e106 test for oceanspells 
fixed intermittent morale-test
 2010-02-02 07:07:42 +00:00
Enno Rehling 29f65277d3 teach familiars magic 2010-01-29 03:29:18 +00:00
Enno Rehling 11f3b5d727 Schemen im CR 
Issue: 1697
 2010-01-27 04:43:28 +00:00
Enno Rehling 60d9e616a8 bugfix combat turn > 0 2010-01-24 20:31:53 +00:00
Enno Rehling 2426e5d7f5 http://bugs.eressea.de/view.php?id=1697 
http://bugs.eressea.de/view.php?id=1703
- coordinate transform repairs
 2010-01-24 19:56:45 +00:00
Enno Rehling b982a92d9e it is not necessary to store cabins, because they are fixed. 2010-01-24 01:34:34 +00:00
Enno Rehling f691224fd9 bug,, capacity <-> cargo mixed up 2010-01-24 01:31:05 +00:00
Enno Rehling f93c2f28ef ship capacities and CR 66 2010-01-24 01:01:27 +00:00
Enno Rehling 5fc0ed8631 - fixed blessedharvest tests 
- new ship capacity tests
 2010-01-24 01:00:52 +00:00
Enno Rehling e5cee39963 disabling the 1:1 GIVE changes until we have a final ruling. 2010-01-23 17:25:40 +00:00
Enno Rehling 618094dacc http://bugs.eressea.de/view.php?id=1697 
- fixed "Schemen"
 2010-01-20 08:26:04 +00:00
Enno Rehling 4babc4e4c9 http://bugs.eressea.de/view.php?id=1697 
- fixed bug that caused coordinates in planes to be adjusted in the wrong way.
 2010-01-20 08:05:55 +00:00