Directory maps/branches/lalo-pupland/navar_city/misc/

Lines of Code

Developers

Most Recent Commits

rjtanner 2014-02-19 21:03 Rev.: 19243

Merge from trunk various map changes.

14 lines of code changed in 1 file:

• maps/branches/lalo-pupland/navar_city/misc: highcourt (+14 -14)

rjtanner 2013-11-05 19:11 Rev.: 19096

Merge from Trunk changes to navar_city/ with the exception of the guild maps.

37650 lines of code changed in 34 files:

• maps/branches/lalo-pupland/navar_city/misc: IPO_navar (+808 -303), aliscave (+2017 -2028), aliswell (+293 -340), bowyer (+14 -9), buildshop (del), city1armour (del), city1bank (+1283 -658), city1gen (del), city1magic (del), city1mermaid (+1435 -618), city1smith (+1709 -415), city1weapon (del), dragon_guild (+1245 -557), draughts (new 5286), emporiumofpower (new 8508), highcourt (new 2426), jeweler (+595 -227), kitchen (+879 -312), library (+30 -44), market2 (+21 -21), midane (+8 -13), navarwiz (+23 -516), tannery (+756 -403), templeofhealing (new 6408), thamshop (+821 -307), theater (+53 -173), theater2 (+326 -627), theater3 (+604 -1379), theater4 (+928 -1935), theaterb1 (+14 -13), theaterb2 (+24 -63), theaterb3 (+1081 -4653), theaterb4 (+9 -4), wizard.msg (new 46)

rjtanner 2008-03-15 00:55 Rev.: 8513

Synchronize Navar map changes between trunk, branches/1.x and branches/lalo-pupland

1883 lines of code changed in 29 files:

• maps/branches/lalo-pupland/navar_city/misc: IPO_navar (+1 -3), aliscave (+1 -3), aliswell (+1 -3), bowyer (+48 -50), buildshop (+1 -2), city1armour (+10 -6), city1gen (+1 -3), city1magic (+2 -8), city1mermaid (+2 -5), city1smith (+1 -3), city1weapon (+2 -3), dragon_guild (+2 -2), jeweler (+1 -3), kitchen (+1 -3), library (+16 -18), market1 (+1 -3), market2 (+1 -3), midane (new 1775), navarwiz (+1 -2), tannery (+1 -2), thamshop (+2 -5), theater (+1 -3), theater2 (+1 -3), theater3 (+1 -3), theater4 (+1 -3), theaterb1 (+1 -3), theaterb2 (+1 -3), theaterb3 (+5 -4), theaterb4 (+1 -3)

rjtanner 2007-11-18 19:59 Rev.: 7540

Synchronize with branch/1.x; Updated the Navar bank to include a gold -> silver conversion table

102 lines of code changed in 1 file:

• maps/branches/lalo-pupland/navar_city/misc: city1bank (+102 -86)

rjtanner 2007-11-01 22:36 Rev.: 7442

Normalize map files; no functional changes.

6 lines of code changed in 3 files:

• maps/branches/lalo-pupland/navar_city/misc: city1armour (+2 -2), city1magic (+2 -2), city1weapon (+2 -2)

rjtanner 2007-09-27 13:24 Rev.: 7270

Required updates for the potion of invulnerability to potion of shielding name change

1 lines of code changed in 2 files:

• maps/branches/lalo-pupland/navar_city/misc: navarwiz (new)

rjtanner 2007-09-17 00:18 Rev.: 7168

Changes due to map editor reformatting. Hopefully this will make future merging easier.

927 lines of code changed in 5 files:

• maps/branches/lalo-pupland/navar_city/misc: aliscave (+241 -241), city1armour (+1 -1), theaterb1 (+139 -139), theaterb2 (+172 -172), theaterb3 (+374 -374)

lalo 2007-03-10 15:22 Rev.: 5732

re-creating my branch

154367 lines of code changed in 28 files:

• maps/branches/lalo-pupland/navar_city/misc: IPO_navar (new 769), aliscave (new 37909), aliswell (new 8951), bowyer (new 1245), buildshop (new 1821), city1armour (new 1544), city1bank (new 2309), city1gen (new 1490), city1magic (new 1769), city1mermaid (new 1962), city1smith (new 1197), city1weapon (new 1224), dragon_guild (new 1686), jeweler (new 1159), kitchen (new 1017), library (new 2964), market1 (new 3800), market2 (new 4472), tannery (new 1059), thamshop (new 852), theater (new 9350), theater2 (new 9044), theater3 (new 9313), theater4 (new 8982), theaterb1 (new 5930), theaterb2 (new 6478), theaterb3 (new 23955), theaterb4 (new 2116)

lalo 2007-03-10 14:35 Rev.: 5731

killing my branch

0 lines of code changed in 28 files:

• maps/branches/lalo-pupland/navar_city/misc: IPO_navar (del), aliscave (del), aliswell (del), bowyer (del), buildshop (del), city1armour (del), city1bank (del), city1gen (del), city1magic (del), city1mermaid (del), city1smith (del), city1weapon (del), dragon_guild (del), jeweler (del), kitchen (del), library (del), market1 (del), market2 (del), tannery (del), thamshop (del), theater (del), theater2 (del), theater3 (del), theater4 (del), theaterb1 (del), theaterb2 (del), theaterb3 (del), theaterb4 (del)

qal21 2006-12-17 01:23 Rev.: 5181

Set svn:eol-style to LF for all map files in branches.

28 lines of code changed in 28 files:

• maps/branches/lalo-pupland/navar_city/misc: IPO_navar (+1), aliscave (+1), aliswell (+1), bowyer (+1), buildshop (+1), city1armour (+1), city1bank (+1), city1gen (+1), city1magic (+1), city1mermaid (+1), city1smith (+1), city1weapon (+1), dragon_guild (+1), jeweler (+1), kitchen (+1), library (+1), market1 (+1), market2 (+1), tannery (+1), thamshop (+1), theater (+1), theater2 (+1), theater3 (+1), theater4 (+1), theaterb1 (+1), theaterb2 (+1), theaterb3 (+1), theaterb4 (+1)

qal21 2006-12-12 23:08 Rev.: 5174

propdel svn:eol-style on all map tree files except actual text. Fixes broken win32 checkouts of maps. Now for branches.

0 lines of code changed in 56 files:

• maps/branches/lalo-pupland/navar_city/misc: IPO_navar (new), aliscave (new), aliswell (-1), bowyer (-1), buildshop (-1), city1armour (new), city1bank (new), city1gen (-1), city1magic (new), city1mermaid (-1), city1smith (-1), city1weapon (new), dragon_guild (new), jeweler (new), kitchen (new), library (new), market1 (-1), market2 (-1), tannery (new), thamshop (-1), theater (new), theater2 (-1), theater3 (-1), theater4 (-1), theaterb1 (new), theaterb2 (new), theaterb3 (-1), theaterb4 (-1)