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

4565 Commits

Author SHA1 Message Date
Enno Rehling f51e5f91ff strip down the configure script to do only configuration, not builds. 
remove distcc support, because I do not have it set up anywhere I can
test it.
 2014-07-03 20:44:19 -07:00
Enno Rehling dd408da3f4 resolve naming conflict on windows. 2014-07-03 12:20:50 -07:00
TomBraun 918ab39bef BUG owner of a building can't enter ship 
If owner of a building want to enter a ship or other building,
he must first leave the bulding.
Commands are "leave" and "enter <ship/tower> <ID>".
For buildings was that OK but not for ships.
The building owner was inside the region after that commans
and not in the ship.
 2014-07-03 15:30:59 +02:00
Enno Rehling ccbcf14458 Merge branch 'master' of github.com:eressea/server 2014-07-03 05:15:47 -07:00
Enno Rehling f505ae8eb7 copy names of callbacks when registering them 2014-07-03 05:15:38 -07:00
Enno Rehling 162375842b introducing new callback system 2014-07-03 05:10:53 -07:00
Enno Rehling 90120ee5c3 stop side-effect of cd - at the end of these scripts 2014-07-02 21:35:16 -07:00
Enno Rehling 22c5b4d45c Merge branch 'master' of github.com:eressea/server 2014-07-02 21:27:53 -07:00
Enno Rehling 2aaabc0f12 let s/cmake-init take care of mkdir, not configure 2014-07-02 21:22:41 -07:00
Enno Rehling b5439a1279 fix line/column calculation for JSON Errors. 
+ start building a test for http://bugs.eressea.de/view.php?id=1692
 2014-07-02 21:17:31 -07:00
Enno Rehling 91a776c0ac begin configuring spells from JSON 2014-07-02 21:15:22 -07:00
TomBraun 6639fbbbbb Change test for bug 0001976 2014-07-02 15:17:09 +02:00
TomBraun 98354ef3a8 Merge remote-tracking branch 'eressea/server' 2014-07-02 15:01:42 +02:00
TomBraun b70fc76921 Fix BUG 0001976 
http://bugs.eressea.de/view.php?id=1976
Check that only buling owner set k_pay disable
If other unit inside the building set k_pay disable
it have now no effect, before only fraction was check
 2014-07-02 13:58:10 +02:00
Enno Rehling ee1d97df19 remov e the old recycling quota, it was always 0.5 everywhere, and a 
silly feature..
 2014-07-01 20:36:31 -07:00
TomBraun 6e825d5677 Merge remote-tracking branch 'eressea/server' 2014-07-01 07:52:22 +02:00
Enno Rehling 54a3c2e070 recycle quota is always 0.5 in every game, no reason to toch this. 2014-06-30 19:25:08 -07:00
Enno Rehling 927ada92b6 improve construction data in JSON. 
test castle naming function
 2014-06-30 19:21:42 -07:00
TomBraun 2bb41b169a Server can not configure 
mkdir -p $BIN_DIR is allready done in configure file
the effect is that file configure create the build directory
and in this directory file cmake-init create another, go inside
and don't find CMakeLists.txt
 2014-06-30 08:23:33 +02:00
Enno Rehling e39336e87a move declaration to top of block 2014-06-29 20:09:21 -07:00
Enno Rehling 5e356bc5fe Merge branch 'TomBraun-master' 2014-06-29 20:06:16 -07:00
Enno Rehling 7a6b237de0 Merge branch 'master' of github.com:TomBraun/server into TomBraun-master 
Conflicts:
	src/kernel/build.c
	src/kernel/item.c
 2014-06-29 20:05:44 -07:00
Enno Rehling 9dcf5bbf4c fix a crash for invalid race enums 2014-06-29 19:15:03 -07:00
Enno Rehling 12661fc373 new_itemtype has been replaced, delete it. 2014-06-29 19:09:37 -07:00
Enno Rehling 22f64abaf2 caching get_race() calls 2014-06-29 19:04:30 -07:00
Enno Rehling c3dfbdea18 eliminate new_race array in favor of a function (TODO: make it fast) 2014-06-29 18:10:02 -07:00
Enno Rehling 11a264742b appearance is something only items have, so move it to item_type 2014-06-29 17:35:37 -07:00
Enno Rehling 2a00301949 unused variable 2014-06-29 17:31:33 -07:00
Enno Rehling 062ba71bd7 fix reading items in xmlreader (still has no tests) 2014-06-29 17:29:41 -07:00
Enno Rehling 5d32896407 rt_register is no longer required, new_resourcetype replaced by rt_get_or_create. 2014-06-29 17:02:45 -07:00
Enno Rehling 95929a99b5 we are about to remove rt_register, but not quite yet. 2014-06-29 16:46:42 -07:00
Enno Rehling 773f3767d3 eliminate cb_items 2014-06-29 16:41:03 -07:00
Enno Rehling 7ee6f0444d reduce use of cb_items, because we want to remove it. 2014-06-29 16:39:53 -07:00
Enno Rehling 7249630e3c Eliminate some Visual Studio warnings, rename itemnames->resourcenames. 2014-06-29 15:41:04 -07:00
Enno Rehling 16be68ada3 Merge branch 'master' of github.com:eressea/server 2014-06-29 13:29:23 -07:00
Enno Rehling 28d2984bc8 disable castle tests, they aren't good yet 2014-06-29 13:29:12 -07:00
Enno Rehling 2e4adddb8f Merge branch 'master' of github.com:eressea/server 2014-06-29 21:51:41 +02:00
Enno Rehling 2af434cfef installing build 676 in production 2014-06-29 21:51:28 +02:00
Enno Rehling 1000c1f911 random encounters in land regions only (nobody will ever enter a firewall, and astral plane shouldn't have it either) 2014-06-29 12:47:11 -07:00
Enno Rehling 6bd2b3be26 add a test for stone golems building castles. 
fix a bug when stone golems use themselves up.
 2014-06-28 23:58:00 -07:00
Enno Rehling 0187567010 disable castle tests 2014-06-28 16:58:56 -07:00
Enno Rehling a48cca5db8 building naming function configured from JSON (this needs work). 
started writing tests for castles.
 2014-06-28 16:55:28 -07:00
Enno Rehling ba53c90b9c Release/Debug builds support 2014-06-28 16:54:10 -07:00
Enno Rehling 612dfea36f Merge branch 'master' of github.com:eressea/server 2014-06-28 16:39:54 -07:00
Enno Rehling 89e7a7826f added some tests for building buildings. 2014-06-28 16:19:46 -07:00
TomBraun c31c436cc7 change u->number >> 0 to u->number>0 2014-06-28 20:45:17 +02:00
Enno Rehling 34ce9a0573 JSON configuration can read strings, with test. 2014-06-28 10:37:40 -07:00
Enno Rehling 9cf03d081e missing compilation unit 2014-06-27 07:57:48 -07:00
Enno Rehling 9e21f1d05e Merge branch 'master' of github.com:eressea/server 2014-06-27 07:50:08 -07:00
Enno Rehling 9b01b71a19 config returns a value, so we can assert corrrect JSON syntax 2014-06-27 07:36:18 -07:00