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

3172 commits

Author SHA1 Message Date
Enno Rehling
98f8f1a1f8 gcc fixes 2009-05-18 22:14:16 +00:00
Enno Rehling
93dbfa0cec More horsing around with I_HORSE 2009-05-18 21:07:07 +00:00
Enno Rehling
637486d95e new file 2009-05-18 20:50:39 +00:00
Enno Rehling
120508716e - equipping newly recruited units 
- cavalry skill bonus
- chargers
- configurable hunger
 2009-05-18 20:50:19 +00:00
Enno Rehling
bb50d7a9ef - construction can have building-requirements 2009-05-18 14:52:35 +00:00
Enno Rehling
9a9ff08302 Configuration files for Eressea 1.1 2009-05-18 13:06:31 +00:00
Enno Rehling
cf5cad9b87 - largestbuilding() can take a filter 
- morale (light) implemented
- rider bonus on weapons is configurable by XML
- wooden guard house
- help status can be masked
- shipspeed configurable (per race or via skill-level)
- tax-creating buildings configurable by XML
- bugfix: castles have no protection
 2009-05-18 13:00:09 +00:00
Enno Rehling
418f611dcb available help statuses can be masked by XML settings 2009-05-16 13:43:42 +00:00
Enno Rehling
43bf73a01b - recruiting secondary races 
- some archetype changes
- new looting rules
 2009-05-14 20:19:13 +00:00
Enno Rehling
0181fa3c25 http://bugs.eressea.de/view.php?id=1503 
Dauer von Feuerwänden
- fixed expired firewalls
 2009-05-14 20:17:50 +00:00
Enno Rehling
73efa3b703 http://bugs.eressea.de/view.php?id=1512 
Fehlerhafte Zauber-Meldung Schattenmeisterbeschwörung
- show true amount
 2009-05-10 16:08:31 +00:00
Enno Rehling
1cf495b713 http://bugs.eressea.de/view.php?id=1497 
Bäume produzieren keine Samen
- changed parameters to work.
 2009-05-10 15:21:21 +00:00
Enno Rehling
68decb58b2 indentation only 2009-05-10 15:20:43 +00:00
Enno Rehling
290bac3082 typo 2009-05-10 08:21:38 +00:00
Enno Rehling
0907203821 - merge with revision 4032 of eressea-1.0 
- begin to implement morale
 2009-02-14 09:53:20 +00:00
Enno Rehling
ef883c23e0 Set populationdamage=0 
rename to rules.combat.populationdamage
 2009-02-08 18:54:36 +00:00
Enno Rehling
56e7060c2f abuse of sprintf 2009-02-08 18:09:28 +00:00
Enno Rehling
83d72028c2 - fixing spell syntax + parameters 
- adding components to spells.xml
- astralspace default=1
 2009-02-01 09:41:29 +00:00
Enno Rehling
090ee58090 2009-02-01 09:05:24 +00:00
Enno Rehling
57de6ab6e1 Even when not init_spell, we must still register. 
Fixing serious (and old) armor bug
 2009-01-31 14:08:23 +00:00
Enno Rehling
0d068f6aa6 missing file for jamfile build 2009-01-31 13:59:12 +00:00
Enno Rehling
3a3628d3a9 extremely old bug in encounters() 2009-01-31 10:50:35 +00:00
Enno Rehling
080a85021f Eressea 1.5 WIP 
- astral space is optional (modules.astralspace)
- spells can be disabled (spells.xml, init_spells)
- hitpoints/stamina configuration (rules.stamina)
- rules.combat_turns (default=5)
 2009-01-30 23:15:36 +00:00
Enno Rehling
00d399f03d add rules configuration for no GIVE to other factions. 
Eressea 1.5:
- skill limit 10
- disable stealth/espionage/perception
- less peasants per region
- disable STEALTH command
- reduce available races
- disable ENTERTAIN, WORK, TAX, TEACH, SELL
 2009-01-27 10:13:12 +00:00
Enno Rehling
3e2922666f faction.age and region.age 2009-01-21 09:48:12 +00:00
Enno Rehling
4e2abeb559 lua: resource-level, read_game w/ one parameter 2009-01-21 08:25:43 +00:00
Enno Rehling
93bb27fb07 - test case for production and renaming of items (old aliases) 
- splitting items over several files
 2009-01-15 22:03:13 +00:00
Enno Rehling
b122c96a68 added atoi36 to jamfile 2008-12-31 15:24:25 +00:00
Enno Rehling
24182c4d06 - new test case (recruiting) 
- logging and compilation fixes
 2008-12-31 11:30:44 +00:00
Enno Rehling
5ea74d8bd8 project files for vc++ 2008 2008-12-31 11:29:35 +00:00
Enno Rehling
591eb201b3 fixes 2008-12-21 10:52:42 +00:00
Enno Rehling
87c931ca18 using dlmalloc = good 2008-12-21 08:08:57 +00:00
Enno Rehling
e3b7068bc9 combined = default 
tolua = default
 2008-12-20 23:41:33 +00:00
Enno Rehling
ff8c715b4c offering two alternatives for bindings now 2008-12-20 23:11:09 +00:00
Enno Rehling
5904d0b3f1 let's not use tolua++ since there are even fewer packages for it. 2008-12-20 22:52:42 +00:00
Enno Rehling
22cfb0d5d1 - neues handling von verbosity fuer weniger spam 
- tests fuer event-handler (die jetzt auch klappen)
- mehr funktionen (und etwas TODO)

commit #4000 !
 2008-12-20 22:31:18 +00:00
Enno Rehling
71f5bc7b6f at_variable is as good as gone (just a stub for compat) 2008-12-20 20:58:35 +00:00
Enno Rehling
15d08ab901 making combined compiling work again 
fixing some warnings that happen in release mode only
 2008-12-20 20:11:38 +00:00
Enno Rehling
ba644a2e68 making tostring() work 2008-12-20 19:45:51 +00:00
Enno Rehling
a3ba0166cf crashfix 2008-12-20 19:41:02 +00:00
Enno Rehling
b981e0e26e more functions for bind_region 2008-12-20 19:18:45 +00:00
Enno Rehling
1cab3ce7f1 fixing the code to work on ubuntu 2008-12-20 18:54:55 +00:00
Enno Rehling
aa2d227f39 tst 2008-12-20 17:23:27 +00:00
Enno Rehling
e00286ee38 broken english messagetype 2008-12-20 17:14:26 +00:00
Enno Rehling
c23da92768 fixing luabind 2008-12-20 17:06:05 +00:00
Enno Rehling
e32eebfd15 familiar-fix 2008-12-20 15:28:50 +00:00
Enno Rehling
d91c3a792f - tolua bindings for the editor 
- more integration tests
- fixed equipment for familiars
 2008-12-20 15:06:15 +00:00
Enno Rehling
b01d9fc685 more tolua bindings 
started work on an alternate tolua code generator
 2008-12-19 16:30:31 +00:00
Enno Rehling
9dbee69544 alternative bindings for tolua 2008-12-16 09:17:59 +00:00
Enno Rehling
3fa54cbb47 crash 2008-11-30 15:19:31 +00:00
Enno Rehling
8a673d8481 disabling build of old projects 2008-11-12 22:12:26 +00:00
Enno Rehling
f18edc3651 combining files to improve compilation speed 2008-11-12 22:07:23 +00:00
Enno Rehling
d305e983b2 http://bugs.eressea.de/view.php?id=1499 
MACHEN Adamantium

- Adamantium and Laen require a mine (and this is now a xml-configuration)
- everything compiles with the latest luabind/boost/lua version
- fixed a broken assert
 2008-10-31 17:50:19 +00:00
Enno Rehling
12574ac5b5 some cleaning up with regard to luabind/boost 
solution files for vc 2008
 2008-10-28 10:51:36 +00:00
Enno Rehling
3ea0d50caf http://bugs.eressea.de/view.php?id=1488 
"Verhalten fliehender Einheiten auf Ozean"
disable flight from ships on ocean
 2008-09-08 19:03:26 +00:00
Enno Rehling
b212f0b666 http://bugs.eressea.de/view.php?id=1485 
"Fehlermeldung enthält aus heiterem Himmel die Angabe "1 Adamantium""
fixed string termination (slight off-by-one error)
Issue: 1485
 2008-09-06 15:46:28 +00:00
Enno Rehling
90b7bbdfbe compile fix 
spelling fix
 2008-09-01 16:01:40 +00:00
Enno Rehling
500d0a212c http://bugs.eressea.de/view.php?id=1460 
"Mahlstrom (grösstenteils) harmlos"
reduced the effect of sailing skill a little bit
Issue: 1460
 2008-09-01 16:01:01 +00:00
Enno Rehling
e4720c53e8 http://bugs.eressea.de/view.php?id=1477 
"Fehler bei Todeswolke"
FFL_SELECT was not initialized prior to using it
 2008-09-01 15:21:02 +00:00
Enno Rehling
a8ff535f0c http://bugs.eressea.de/view.php?id=1464 
"falsche Fehlermeldung bei zu geringem Handelstalent"
wrote a clearer message
 2008-08-29 06:40:40 +00:00
Enno Rehling
eeac273e97 %s for %u 2008-08-28 21:33:43 +00:00
Enno Rehling
18c1971e2e http://bugs.eressea.de/view.php?id=1466 
"Vertrauter wurde zu Magier, kann jetzt nicht mehr zaubern"
necessary fixes for familiars.
 2008-08-28 21:29:05 +00:00
Enno Rehling
17bcb2d7a7 http://bugs.eressea.de/view.php?id=1481 
"Merkwürdiges Supermegamonster frisst Region leer"
fixed error in mistletoe-zombie creation
 2008-08-28 19:01:36 +00:00
Enno Rehling
3c0d17e568 calling remove_unit() instead of set_number() in tidal waves. 2008-08-28 18:03:33 +00:00
Enno Rehling
7114b4f467 http://bugs.eressea.de/view.php?id=1471 
"Vertrauter verschwindet spurlos"
telling players some more about tidal waves
Issue: 1471
 2008-08-28 17:58:54 +00:00
Enno Rehling
802b9332c7 http://bugs.eressea.de/view.php?id=1461 
"Tragekapazität von Monstern zu hoch"
throwing away carts because monsters don't know what to do with them.
 2008-08-28 15:16:13 +00:00
Enno Rehling
38ff80892f locale change 2008-08-28 13:25:33 +00:00
Enno Rehling
79d0f255e2 improve some output, remove some error messages. 2008-08-28 13:23:24 +00:00
Enno Rehling
854135b934 - K_GM can be disabled 
http://bugs.eressea.de/view.php?id=1470
"mit Katapulten kann man nicht bewachen"
fixed siege_weapons parameter
Issue: 1470
 2008-08-28 11:45:49 +00:00
Enno Rehling
bd322436ab check that umlauts are properly recognized (locale supports UTF-8 properly) 2008-08-19 19:53:05 +00:00
Enno Rehling
9a037e2433 less of the "static buffer" warnings in travelthrough-reports 2008-08-18 16:47:05 +00:00
Enno Rehling
1ebe955bbe fix: do not call regionname() twice. 2008-08-18 16:39:08 +00:00
Enno Rehling
9e529a50ae new mail addresses 
gcc-4.2: MAX() and MIN()
 2008-08-18 10:11:51 +00:00
Enno Rehling
8a2fe52291 http://bugs.eressea.de/view.php?id=1465 
"Fliehende Meermenschenkapitäne ertrinken"
 2008-07-24 16:51:11 +00:00
Enno Rehling
a215f35f9f http://bugs.eressea.de/view.php?id=1458 
"Neu entstandene Untote werden nur im CR angezeigt"
- reordering units before writing reports, not earlier
 2008-07-13 09:52:18 +00:00
Enno Rehling
d2c88d6660 http://bugs.eressea.de/view.php?id=1456 
- illusionary buildings not showing up right
Issue: 1456
 2008-07-12 09:45:10 +00:00
Enno Rehling
67c4b861f1 http://bugs.eressea.de/view.php?id=1457 
"ID zu groß"
- fixed parameters for some lua functions (pointers/objects)
Issue: 1457
 2008-07-08 22:28:22 +00:00
Enno Rehling
cf789999cf http://bugs.eressea.de/view.php?id=1457 
"ID zu groß"
- fixed parameters for some lua functions (pointers/objects)
 2008-07-08 21:54:50 +00:00
Enno Rehling
7c65bfc5f7 assertions 2008-07-08 21:45:13 +00:00
Enno Rehling
62f496a4b5 dead units with horses in astral space crash the server 2008-07-06 08:07:22 +00:00
Enno Rehling
9a75def788 http://bugs.eressea.de/view.php?id=1454 
"Kapitan verlässt nach Kampf sein Schiff"
- added a comment for clarity

Issue: 1454
 2008-07-05 14:57:36 +00:00
Enno Rehling
fb8ec1a69f http://bugs.eressea.de/view.php?id=1453 
"Mit Katapulten kann man Steuern eintreiben"
- added a parameter that checks for siege-weapons.
Issue: 1453
 2008-07-04 09:19:12 +00:00
Enno Rehling
f1227d9957 http://bugs.eressea.de/view.php?id=1450 
"Pferde im Nebel"
- reverted removal of ASTRAL_ITEM_RESTRICTIONS
 2008-07-01 20:22:26 +00:00
Enno Rehling
ec5923adc3 http://bugs.eressea.de/view.php?id=1448 
You can teach non-allied units 
- not giving feedback when student does not grant teacher a HELP GUARD
Issue: 1448
 2008-06-21 22:35:39 +00:00
Enno Rehling
bfd52e1b11 fix number of arguments (gcc, we like you) 2008-06-18 09:00:33 +00:00
Enno Rehling
af5477286b fixed an error reading old datafiles (vortex not read properly) 2008-06-18 08:24:11 +00:00
Enno Rehling
d418aca832 http://bugs.eressea.de/view.php?id=1443 
- fixed trails for drifitng ships with no units.
- cleared up some TODOs
Issue: 1443
 2008-06-17 22:35:18 +00:00
Enno Rehling
3b32b490d7 safety net 2008-06-17 08:52:56 +00:00
Enno Rehling
ce6fbde53e http://bugs.eressea.de/view.php?id=1442 
"Unbenannter Effekt (Mahlstrom?)"
- made the quotes around messages in XML optional by parsing as string if there is no leading quote.
 2008-06-17 08:41:17 +00:00
Enno Rehling
13e7e640fb Fixing the tunnels: some target regions were chaotic 2008-06-16 17:44:20 +00:00
Enno Rehling
328bf5a623 Fixing the tunnels and cleaning up a bit. 2008-06-16 17:29:53 +00:00
Enno Rehling
615d948021 - removing unused DELAYED_OFFENSE define 
- fixed duplicate units in CR
- fixed ship/building/unit display in neighbor-regions
 2008-06-16 08:58:56 +00:00
Enno Rehling
e72748a61f http://bugs.eressea.de/view.php?id=1447 
"Im Kampf geflohene Einheit bewacht"

Issue: 1447
 2008-06-15 19:48:21 +00:00
Enno Rehling
c857d632f3 http://bugs.eressea.de/view.php?id=1445 
"Fehler bei Bewegung"
- fixed travel-message using one region less than required.
Issue: 1445
 2008-06-15 19:30:02 +00:00
Enno Rehling
f64271cb9d Fixes based on feedback from darcduck 2008-06-10 20:12:24 +00:00
Enno Rehling
d5ce48bf7f fixes for the prevF speedup 2008-06-09 23:39:15 +00:00
Enno Rehling
b3d22eae63 speeding up u_setfaction 2008-06-09 21:09:18 +00:00
Enno Rehling
22d63cc8cf fixing adamant seeding 2008-06-08 22:13:10 +00:00
Enno Rehling
784a489830 changing region resources 2008-06-08 21:40:12 +00:00
Enno Rehling
cc4d2a1026 compiles with gcc 2008-06-08 20:50:05 +00:00
Enno Rehling
a3b795b2cf seeding adamantium 2008-06-08 20:43:01 +00:00
Enno Rehling
2c41457fd8 BEANSPRUCHE zu RESERVIERE 2008-06-08 10:21:42 +00:00
Enno Rehling
7b71c8f116 pretty name 2008-06-08 10:18:27 +00:00
Enno Rehling
1c139de354 - code to seed adamantium 
- cleaner definition of raw materials
 2008-06-08 10:17:29 +00:00
Enno Rehling
ac595313cf fixes re-run 574 2008-06-08 09:00:35 +00:00
Enno Rehling
04029eef36 compile fixes 2008-06-08 00:10:09 +00:00
Enno Rehling
2e09d16588 more xmlreport features 2008-06-08 00:02:24 +00:00
Enno Rehling
9ffcff7e2a PFL_NOCOORDS is really not needed anywhere. At least I sincerely hope not. 2008-06-07 20:04:45 +00:00
Enno Rehling
c9a2bb4f24 xmlreport (WIP): 
- spells and skills
 2008-06-07 13:17:34 +00:00
Enno Rehling
32aa6a46ce xmlreport: 
- ships are done
- units are getting close
 2008-06-07 12:22:01 +00:00
Enno Rehling
8b242c0b33 xmlreport (WIP): 
- buildings are done
- unit.faction.rel
 2008-06-07 09:55:57 +00:00
Enno Rehling
6e5d930778 xmlreport: 
- coordinates
- terrain names
 2008-06-06 23:35:37 +00:00
Enno Rehling
b5bffaf75e - reorganizing units for faster report-generation 
- more xml functionality
 2008-06-06 21:54:19 +00:00
Enno Rehling
277141c45d 2008-06-06 21:49:29 +00:00
Enno Rehling
3c170be6b5 xmllint 2008-06-04 23:14:54 +00:00
Enno Rehling
3b9d951556 asgard rules: 
- creating xml definitions
- creating separate lua files
- added option to make work automatic
 2008-06-04 23:12:05 +00:00
Enno Rehling
a5d17f6c24 http://bugs.eressea.de/view.php?id=1438 
"FOLGEnde Einheiten reiten, können aber nicht folgen"
- fixed a bug in reporting travelthru that was caused by that fix
Issue: 1438
 2008-06-04 16:18:53 +00:00
Enno Rehling
310fa1e3f2 http://bugs.eressea.de/view.php?id=1438 
"FOLGEnde Einheiten reiten, können aber nicht folgen"
when a unit couldn't keep up, all furhter followers would not travel the entire route. more const ftw
Issue: 1438
 2008-06-04 14:40:20 +00:00
Enno Rehling
a63cd86e44 ium 2008-06-03 11:21:39 +00:00
Enno Rehling
d75ae59e96 internal rename diamond->adamantium before it's too late. 2008-06-03 10:58:06 +00:00
Enno Rehling
15971fdb98 fixing find_key. ouch! 2008-06-03 10:16:55 +00:00
Enno Rehling
09478956c8 http://eressea.upb.de/mantis/view.php?id=1437 
"Zeilenumbruch im Einheitennamen"
- apply fixes to existing data.
 2008-06-03 07:42:06 +00:00
Enno Rehling
e26700c8b1 http://eressea.upb.de/mantis/view.php?id=1437 
"Zeilenumbruch im Einheitennamen"
- prevented line breaks in unit names

http://eressea.upb.de/mantis/view.php?id=1436
"lc_age throws an exception"
- fixed adding tostring() in script.
- not calling std::terminate

also:
- added AT_AGE_* macros to be returned from attrib-age functions
 2008-06-03 07:28:32 +00:00
Enno Rehling
b973330061 show region id in mapper 2008-06-02 11:12:22 +00:00
Enno Rehling
0326ffe7fe - fixed not putting regions next to firewall 2008-06-02 10:34:58 +00:00
Enno Rehling
5f3bfa3a2c autoseed should not find old islands that are de-populated. 2008-06-02 10:06:25 +00:00
Enno Rehling
689dedae6d - equipment for new factions defined in xml, not lua. 
- added possibility to give equipment to factions, not only the first unit
- 4 adamantine for new factions
- removed obsolete SHORTPWDS define
 2008-06-02 09:16:58 +00:00
Enno Rehling
4035d153e7 http://eressea.upb.de/mantis/view.php?id=1434 
"Teilweise fehlende RESOURCE-Blöcke"
- fixed. was not writing the buffer it was going to. added comments.
 2008-06-01 18:58:51 +00:00
Enno Rehling
fc770832d4 disabling building-aging for the moment 2008-05-30 21:56:12 +00:00
Enno Rehling
3a1550c3f6 must return a value 2008-05-30 21:33:19 +00:00
Enno Rehling
055c9f4bb9 missing translation 2008-05-30 21:29:31 +00:00
Enno Rehling
153766ab70 some debug output while this is new 2008-05-30 21:09:19 +00:00
Enno Rehling
8656b2323b implementation of adamant and tunnels 2008-05-30 21:01:25 +00:00
Enno Rehling
a473991f67 another crash 2008-05-30 16:21:21 +00:00
Enno Rehling
f8a21ec386 fix include 2008-05-30 16:09:10 +00:00
Enno Rehling
47989da257 crashfix mapper 
Lua: get_region_by_id
 2008-05-30 16:08:35 +00:00
Enno Rehling
ae68d8fd79 Adamant + Rüstung 2008-05-30 15:28:20 +00:00
Enno Rehling
ecc147425b some cleanup in the creport 2008-05-28 08:42:45 +00:00
Enno Rehling
a761c686cd - Fixed assigning r->uid to regions that haven't got one 
- restarted implementation of xml report
 2008-05-28 00:23:46 +00:00
Enno Rehling
7cb18e90ea http://eressea.upb.de/mantis/view.php?id=1408 
"Zauberpatzer - Effektmeldung"
- fixed positive message should be negative
- fixed ct_find
- fixed a few places not checking u->number or u->region
- speeding up pool when units have no items.
 2008-05-27 22:03:57 +00:00
Enno Rehling
f54037295a compat fixes for old datafiles (turn 287) 2008-05-27 09:21:56 +00:00
Enno Rehling
363c2e0d5b support for old item 2008-05-27 07:59:23 +00:00
Enno Rehling
577601f912 support code for reading data files with old curses 2008-05-27 07:58:04 +00:00
Enno Rehling
43b0ff2ce3 removing code for old versions that we no longer have datafiles for (pre-287) 2008-05-27 07:30:04 +00:00
Enno Rehling
ad240fecc0 floating point rules to ensure same output with release and debug 2008-05-25 23:17:39 +00:00
Enno Rehling
3e9c0c894a rng-fix. is this it? cannot be. 2008-05-25 19:29:46 +00:00
Enno Rehling
77d72ba482 search for the heisenbug 2008-05-25 10:37:19 +00:00
Enno Rehling
18485ee6f1 not writing aliases for monsters should make things go faster 2008-05-25 09:34:57 +00:00
Enno Rehling
57623bb2a7 missing ifdef 2008-05-25 09:33:27 +00:00
Enno Rehling
ae7eefa47c some cleaning 2008-05-25 09:29:06 +00:00