Menu
▾
▴
fortress-commit — Subversion commit log
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(23) |
Jul
(31) |
Aug
(13) |
Sep
|
Oct
(9) |
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cl...@us...> - 2007-07-16 00:30:17
|
Revision: 55
http://fortress.svn.sourceforge.net/fortress/?rev=55&view=rev
Author: clrg
Date: 2007-07-15 17:30:20 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
Remove highlight when dragging
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/isogrid.t
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-13 20:16:45
|
Revision: 54
http://fortress.svn.sourceforge.net/fortress/?rev=54&view=rev
Author: clrg
Date: 2007-07-13 13:16:47 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Better minimap dragging implementation + clean up dizzutch's first commit =P
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/game.t
trunk/client/src/net/sourceforge/fortress/isogrid.t
trunk/client/src/net/sourceforge/fortress/minimap.t
Modified: trunk/client/src/net/sourceforge/fortress/game.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 18:25:39 UTC (rev 53)
+++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 20:16:47 UTC (rev 54)
@@ -21,7 +21,7 @@
<shadowtext text="Toggle Grid" />
</widget:check>
<ui:box height="10" />
- <widget:check id="invmouse" cursor="hand" focusable="false" selected="false">
+ <widget:check id="invert" cursor="hand" focusable="false" selected="false">
<shadowtext text="Invert Mouse" />
</widget:check>
</ui:box>
@@ -39,7 +39,7 @@
//// Map / Sidebar Interaction ////////////////////////////////
$gridon.selected ++= function(v) { cascade = v; $map.gridon = v; }
- $invmouse.selected ++= function(v) { cascade = v; $map.invmouse = v; }
+ $invert.selected ++= function(v) { cascade = v; $map.invert = v; }
//// Panel Layout /////////////////////////////////////////////
@@ -54,14 +54,14 @@
{
cascade = v;
$bottom.bgy = -((v + $top.height)%256);
- surface.setMapBox(vexi.math.floor($map.width / 48), vexi.math.floor(v / 24));
+ surface.setMapView(vexi.math.floor($map.width / 48), vexi.math.floor(v / 24));
}
$map.width ++= function(v)
{
cascade = v;
$right.bgx = -((v + $left.width)%256);
- surface.setMapBox(vexi.math.floor(v / 48), vexi.math.floor($map.height / 24));
+ surface.setMapView(vexi.math.floor(v / 48), vexi.math.floor($map.height / 24));
}
</ui:box>
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/minimap.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 18:25:39 UTC (rev 53)
+++ trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 20:16:47 UTC (rev 54)
@@ -17,32 +17,46 @@
</ui:box>
</ui:box>
- var mw = 1;
- var mh = 1;
- var mx = 1;
- var my = 1;
- var vw = 1;
- var vh = 1;
+ var map_w = 1;
+ var map_h = 1;
+ var map_x = 1;
+ var map_y = 1;
+ var view_w = 1;
+ var view_h = 1;
+ /** synchronizes the viewbox with the map */
var syncView = function()
{
- $viewbox.width = $minimap.width * (vw / mw) + 1;
- $viewbox.height = $minimap.height * (vh / mh) + 1;
- $viewbox.x = $minimap.width * (-mx / mw);
- $viewbox.y = $minimap.height * (-my / mh);
+ $viewbox.width = $minimap.width * (view_w / map_w) + 1;
+ $viewbox.height = $minimap.height * (view_h / map_h) + 1;
+ $viewbox.x = $minimap.width * (-map_x / map_w);
+ $viewbox.y = $minimap.height * (-map_y / map_h);
}
+ var mx, my;
+ var ox, oy;
+
+ var moveMap = function()
+ {
+ // assumes minimap tiles are 1px by 1px
+ var m = surface.mouse;
+ var nx = ox + m.x - mx;
+ var ny = oy + m.y - my;
+ nx = 0 > nx ? 0 : (nx > $minimap.width-1 ? $minimap.width-1 : nx);
+ ny = 0 > ny ? 0 : (ny > $minimap.height-1 ? $minimap.height-1 : ny);
+ surface.moveMapTo(nx, ny);
+ }
+
var moveMapFunc = function(v)
{
- // assumes minimap tiles are 1px by 1px
- surface.moveMapTo(mouse.x, mouse.y);
cascade = v;
+ moveMap();
}
var releaseFunc = function(v)
{
cascade = v;
- Move --= moveMapFunc;
+ surface.delMoveTrap(moveMapFunc);
surface.Focused --= releaseFunc;
surface._Release1 --= releaseFunc;
}
@@ -50,9 +64,15 @@
var pressFunc = function(v)
{
cascade = v;
- Move ++= moveMapFunc;
+ var m = surface.mouse;
+ mx = m.x;
+ my = m.y;
+ ox = mouse.x;
+ oy = mouse.y;
+ surface.addMoveTrap(moveMapFunc);
surface.Focused ++= releaseFunc;
surface._Release1 ++= releaseFunc;
+ moveMap();
}
thisbox.Press1 ++= pressFunc;
@@ -61,28 +81,28 @@
{
cascade = v;
- surface.setMapBox = function(_vw, _vh)
+ surface.setMapView = function(vw, vh)
{
- vw = _vw;
- vh = _vh;
+ view_w = vw;
+ view_h = vh;
syncView();
}
- surface.setMapDim = function(_mw, _mh)
+ surface.setMapDim = function(mw, mh)
{
- mw = _mw;
- mh = _mh;
+ map_w = mw;
+ map_h = mh;
syncView();
}
- surface.setMapPos = function(_mx, _my)
+ surface.setMapPos = function(mx, my)
{
- mx = _mx;
- my = _my;
+ map_x = mx;
+ map_y = my;
syncView();
}
- surface.setMapContents = function(map)
+ surface.setMap = function(map)
{
var ni = map.numchildren;
var nj = map[0].numchildren;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <diz...@us...> - 2007-07-13 18:25:36
|
Revision: 53
http://fortress.svn.sourceforge.net/fortress/?rev=53&view=rev
Author: dizzutch
Date: 2007-07-13 11:25:39 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Added "Invert Mouse" checkbox
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/game.t
trunk/client/src/net/sourceforge/fortress/isogrid.t
Modified: trunk/client/src/net/sourceforge/fortress/game.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 17:48:21 UTC (rev 52)
+++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 18:25:39 UTC (rev 53)
@@ -20,6 +20,10 @@
<widget:check id="gridon" cursor="hand" focusable="false" selected="true">
<shadowtext text="Toggle Grid" />
</widget:check>
+ <ui:box height="10" />
+ <widget:check id="invmouse" cursor="hand" focusable="false" selected="false">
+ <shadowtext text="Invert Mouse" />
+ </widget:check>
</ui:box>
<ui:box />
</panel>
@@ -35,6 +39,7 @@
//// Map / Sidebar Interaction ////////////////////////////////
$gridon.selected ++= function(v) { cascade = v; $map.gridon = v; }
+ $invmouse.selected ++= function(v) { cascade = v; $map.invmouse = v; }
//// Panel Layout /////////////////////////////////////////////
@@ -60,4 +65,4 @@
}
</ui:box>
-</vexi>
\ No newline at end of file
+</vexi>
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-13 17:48:20
|
Revision: 52
http://fortress.svn.sourceforge.net/fortress/?rev=52&view=rev
Author: clrg
Date: 2007-07-13 10:48:21 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Add placeholder tower images
Added Paths:
-----------
trunk/client/src/net/sourceforge/fortress/image/iso96/towerbase.png
trunk/client/src/net/sourceforge/fortress/image/iso96/towerstem.png
trunk/client/src/net/sourceforge/fortress/image/iso96/towertop.png
Property Changed:
----------------
trunk/client/src/net/sourceforge/fortress/image/iso96/
Property changes on: trunk/client/src/net/sourceforge/fortress/image/iso96
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Added: trunk/client/src/net/sourceforge/fortress/image/iso96/towerbase.png
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/image/iso96/towerbase.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/client/src/net/sourceforge/fortress/image/iso96/towerstem.png
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/image/iso96/towerstem.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/client/src/net/sourceforge/fortress/image/iso96/towertop.png
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/image/iso96/towertop.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-13 14:09:59
|
Revision: 51
http://fortress.svn.sourceforge.net/fortress/?rev=51&view=rev
Author: clrg
Date: 2007-07-13 07:07:44 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Properly restore minimap
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/game.t
trunk/client/src/net/sourceforge/fortress/isogrid.t
trunk/client/src/net/sourceforge/fortress/minimap.t
trunk/client/src/net/sourceforge/fortress/minimaptile.t
trunk/client/src/net/sourceforge/fortress/panel.t
Modified: trunk/client/src/net/sourceforge/fortress/game.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 12:53:45 UTC (rev 50)
+++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 14:07:44 UTC (rev 51)
@@ -11,14 +11,17 @@
<shadowtext text="Map Size 100 x 100" shrink="true" />
</panel>
<ui:box>
- <panel id="left" hshrink="true">
- <ui:box width="10" />
+ <panel id="left" hshrink="true" orient="vertical" padding="0 10">
+ <layout:border border="#ffcc00" depth="1" shrink="true">
+ <minimap id="minimap" />
+ </layout:border>
<ui:box orient="vertical" vshrink="true">
- <layout:border border="#ffcc00" depth="1" shrink="true">
- <minimap id="minimap" />
- </layout:border>
+ <ui:box height="10" />
+ <widget:check id="gridon" cursor="hand" focusable="false" selected="true">
+ <shadowtext text="Toggle Grid" />
+ </widget:check>
</ui:box>
- <ui:box width="10" />
+ <ui:box />
</panel>
<layout:border border="#ffcc00" depth="1">
<isogrid id="map" />
@@ -29,6 +32,12 @@
vexi.ui.frame = thisbox;
+ //// Map / Sidebar Interaction ////////////////////////////////
+
+ $gridon.selected ++= function(v) { cascade = v; $map.gridon = v; }
+
+ //// Panel Layout /////////////////////////////////////////////
+
$top.height ++= function(v)
{
cascade = v;
@@ -40,12 +49,14 @@
{
cascade = v;
$bottom.bgy = -((v + $top.height)%256);
+ surface.setMapBox(vexi.math.floor($map.width / 48), vexi.math.floor(v / 24));
}
$map.width ++= function(v)
{
cascade = v;
$right.bgx = -((v + $left.width)%256);
+ surface.setMapBox(vexi.math.floor(v / 48), vexi.math.floor($map.height / 24));
}
</ui:box>
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/minimap.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 12:53:45 UTC (rev 50)
+++ trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 14:07:44 UTC (rev 51)
@@ -6,7 +6,7 @@
$minimap.width ++= function(v) { cascade = v; width = v; }
$minimap.height ++= function(v) { cascade = v; height = v; }
<ui:box id="minimap" shrink="true" />
- <ui:box id="viewbox" display="false" orient="vertical" align="topleft">
+ <ui:box id="viewbox" orient="vertical">
<ui:box fill="white" height="1" vshrink="true" />
<ui:box>
<ui:box fill="white" width="1" hshrink="true" />
@@ -34,7 +34,6 @@
var moveMapFunc = function(v)
{
- vexi.log.info(v);
// assumes minimap tiles are 1px by 1px
surface.moveMapTo(mouse.x, mouse.y);
cascade = v;
@@ -42,6 +41,7 @@
var releaseFunc = function(v)
{
+ cascade = v;
Move --= moveMapFunc;
surface.Focused --= releaseFunc;
surface._Release1 --= releaseFunc;
@@ -49,6 +49,7 @@
var pressFunc = function(v)
{
+ cascade = v;
Move ++= moveMapFunc;
surface.Focused ++= releaseFunc;
surface._Release1 ++= releaseFunc;
Modified: trunk/client/src/net/sourceforge/fortress/minimaptile.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/minimaptile.t 2007-07-13 12:53:45 UTC (rev 50)
+++ trunk/client/src/net/sourceforge/fortress/minimaptile.t 2007-07-13 14:07:44 UTC (rev 51)
@@ -7,16 +7,16 @@
{
switch (s)
{
- case 0: return "70";
- case 1: return "78";
- case 2: return "80";
- case 3: return "88";
- case 4: return "90";
- case 5: return "98";
- case 6: return "A0";
- case 7: return "A8";
- case 8: return "B0";
- case 9: return "B8";
+ case 0: return "50";
+ case 1: return "58";
+ case 2: return "60";
+ case 3: return "68";
+ case 4: return "70";
+ case 5: return "78";
+ case 6: return "80";
+ case 7: return "88";
+ case 8: return "90";
+ case 9: return "98";
}
return "FF";
}
Modified: trunk/client/src/net/sourceforge/fortress/panel.t
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-13 12:54:07
|
Revision: 50
http://fortress.svn.sourceforge.net/fortress/?rev=50&view=rev
Author: clrg
Date: 2007-07-13 05:53:45 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Fix incorrect operators and add copyright/license/author notice
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/panel.t
Modified: trunk/client/src/net/sourceforge/fortress/panel.t
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-13 12:06:40
|
Revision: 49
http://fortress.svn.sourceforge.net/fortress/?rev=49&view=rev
Author: clrg
Date: 2007-07-13 05:06:35 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Optmize grid display
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/isogrid.t
trunk/client/src/net/sourceforge/fortress/twoquarter.t
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/twoquarter.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-13 11:52:53 UTC (rev 48)
+++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-13 12:06:35 UTC (rev 49)
@@ -52,6 +52,8 @@
b.y = top ? 0 : -24;
b.z = z;
thisbox[i] = b;
+ // in case we have special meaning attached to the piece
+ return b;
}
thisbox.delPiece = function(type, top, left)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-13 11:52:53
|
Revision: 48
http://fortress.svn.sourceforge.net/fortress/?rev=48&view=rev
Author: clrg
Date: 2007-07-13 04:52:53 -0700 (Fri, 13 Jul 2007)
Log Message:
-----------
Start building up the UI a bit
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/game.t
trunk/client/src/net/sourceforge/fortress/image/grass/grass0.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass1.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass2.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass3.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass4.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass5.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass6.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass7.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass8.png
trunk/client/src/net/sourceforge/fortress/image/grass/grass9.png
trunk/client/src/net/sourceforge/fortress/isogrid.t
trunk/client/src/net/sourceforge/fortress/minimap.t
trunk/client/src/net/sourceforge/fortress/preloadimages.t
trunk/client/src/net/sourceforge/fortress/twoquarter.t
Added Paths:
-----------
trunk/client/src/net/sourceforge/fortress/image/stonebg.png
trunk/client/src/net/sourceforge/fortress/panel.t
trunk/client/src/net/sourceforge/fortress/shadowtext.t
Modified: trunk/client/src/net/sourceforge/fortress/game.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-11 01:11:14 UTC (rev 47)
+++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-13 11:52:53 UTC (rev 48)
@@ -1,12 +1,52 @@
<!-- Copyright 2007 licensed under GPL v3 -->
-<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:widget="vexi.widget">
+<vexi xmlns:ui="vexi://ui" xmlns:layout="vexi.layout" xmlns:widget="vexi.widget"
+ xmlns="net.sourceforge.fortress">
<widget:surface />
<preloadimages />
- <ui:box titlebar="Fortress Prototype">
- <isogrid id="map" />
+ <ui:box orient="vertical" titlebar="Fortress Prototype">
+ <panel id="top" padding="10" vshrink="true">
+ <shadowtext text="Fortress Prototype v2" />
+ <ui:box />
+ <shadowtext text="Map Size 100 x 100" shrink="true" />
+ </panel>
+ <ui:box>
+ <panel id="left" hshrink="true">
+ <ui:box width="10" />
+ <ui:box orient="vertical" vshrink="true">
+ <layout:border border="#ffcc00" depth="1" shrink="true">
+ <minimap id="minimap" />
+ </layout:border>
+ </ui:box>
+ <ui:box width="10" />
+ </panel>
+ <layout:border border="#ffcc00" depth="1">
+ <isogrid id="map" />
+ </layout:border>
+ <panel id="right" hshrink="true" padding="5" />
+ </ui:box>
+ <panel id="bottom" vshrink="true" padding="5" />
vexi.ui.frame = thisbox;
+ $top.height ++= function(v)
+ {
+ cascade = v;
+ $left.bgy = -v;
+ $right.bgy = -v;
+ }
+
+ $map.height ++= function(v)
+ {
+ cascade = v;
+ $bottom.bgy = -((v + $top.height)%256);
+ }
+
+ $map.width ++= function(v)
+ {
+ cascade = v;
+ $right.bgx = -((v + $left.width)%256);
+ }
+
</ui:box>
</vexi>
\ No newline at end of file
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass0.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass1.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass2.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass3.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass4.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass5.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass6.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass7.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass8.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/image/grass/grass9.png
===================================================================
(Binary files differ)
Added: trunk/client/src/net/sourceforge/fortress/image/stonebg.png
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/image/stonebg.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/minimap.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-11 01:11:14 UTC (rev 47)
+++ trunk/client/src/net/sourceforge/fortress/minimap.t 2007-07-13 11:52:53 UTC (rev 48)
@@ -6,7 +6,7 @@
$minimap.width ++= function(v) { cascade = v; width = v; }
$minimap.height ++= function(v) { cascade = v; height = v; }
<ui:box id="minimap" shrink="true" />
- <ui:box id="viewbox" orient="vertical" align="topleft">
+ <ui:box id="viewbox" display="false" orient="vertical" align="topleft">
<ui:box fill="white" height="1" vshrink="true" />
<ui:box>
<ui:box fill="white" width="1" hshrink="true" />
Added: trunk/client/src/net/sourceforge/fortress/panel.t
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/panel.t
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/client/src/net/sourceforge/fortress/preloadimages.t
===================================================================
(Binary files differ)
Added: trunk/client/src/net/sourceforge/fortress/shadowtext.t
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/shadowtext.t
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/client/src/net/sourceforge/fortress/twoquarter.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-11 01:11:14 UTC (rev 47)
+++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-13 11:52:53 UTC (rev 48)
@@ -21,7 +21,12 @@
thisbox.forward;
// used to give the graphics a non-repeating feel
thisbox.seed = vexi.math.floor(vexi.math.random()*10);
+ // used to set the base fill of the tile
+ thisbox.type = "grass";
+ var sync = function() { fill = .image[type][type+seed]; }
+ sync();
+
thisbox.addPiece = function(type, top, left)
{
var z = static.zindex[type];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-11 01:11:12
|
Revision: 47
http://fortress.svn.sourceforge.net/fortress/?rev=47&view=rev
Author: clrg
Date: 2007-07-10 18:11:14 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Implemented highlighting - looks rather nifty :-)
Modified Paths:
--------------
trunk/client/src/net/sourceforge/fortress/image/iso96/highlight.png
trunk/client/src/net/sourceforge/fortress/isogrid.t
trunk/client/src/net/sourceforge/fortress/twoquarter.t
Modified: trunk/client/src/net/sourceforge/fortress/image/iso96/highlight.png
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
Modified: trunk/client/src/net/sourceforge/fortress/twoquarter.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-11 00:06:28 UTC (rev 46)
+++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-11 01:11:14 UTC (rev 47)
@@ -9,49 +9,53 @@
the map (hence the name). The two quarters are either side
of a diagonal axis of the template box.
- There are two types of tile - top and bottom. This means
- whether the tile to the right is a top piece or on the
- bottom of an isometric tile.
+ There are two types of tile - the diagonal starts either
+ topleft or bottomleft - we use the back/forward slash
+ analogy as representation.
</usage>
</meta:doc>
<ui:box layout="absolute" shrink="true" width="48" height="24">
// top-left vs bottom-left
- thisbox.top = true;
+ thisbox.forward;
// used to give the graphics a non-repeating feel
thisbox.seed = vexi.math.floor(vexi.math.random()*10);
- thisbox.addPiece = function(type, left)
+ thisbox.addPiece = function(type, top, left)
{
var z = static.zindex[type];
if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy;
var i = 0;
+ var p;
while (numchildren > i)
{
- if (thisbox[i].type == type and thisbox[i].left == left)
+ p = thisbox[i];
+ if (p.type == type and p.left == left and p.top == top)
throw "tried to add a duplicate tile piece of type '"+type+"' from "+posx+", "+posy;
- if (thisbox[i].z > z) break;
+ if (p.z > z) break;
i++;
}
var b = vexi.box;
b.fill = .image[static.tileset][type];
b.left = left;
+ b.top = top;
b.shrink = true;
b.type = type;
b.x = left ? 0 : -48;
b.y = top ? 0 : -24;
- //vexi.log.info(posx+", "+posy+" -- "+top+", "+left);
b.z = z;
thisbox[i] = b;
}
- thisbox.delPiece = function(type, left)
+ thisbox.delPiece = function(type, top, left)
{
+ var p;
for (var i=0; numchildren>i; i++)
{
- if (thisbox[i].type == type and thisbox[i].left == left)
+ p = thisbox[i];
+ if (p.type == type and p.left == left and p.top == top)
{
thisbox[i] = null;
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-11 00:06:26
|
Revision: 46
http://fortress.svn.sourceforge.net/fortress/?rev=46&view=rev
Author: clrg
Date: 2007-07-10 17:06:28 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Rewrite the prototype to use isometric layout instead of a regular grid
Modified Paths:
--------------
trunk/client/src/main.t
trunk/client/src/net/sourceforge/fortress/preloadimages.t
Added Paths:
-----------
trunk/client/src/net/sourceforge/fortress/game.t
trunk/client/src/net/sourceforge/fortress/image/iso96/
trunk/client/src/net/sourceforge/fortress/image/iso96/grid.png
trunk/client/src/net/sourceforge/fortress/image/iso96/highlight.png
trunk/client/src/net/sourceforge/fortress/isogrid.t
trunk/client/src/net/sourceforge/fortress/twoquarter.t
Removed Paths:
-------------
trunk/client/src/net/sourceforge/fortress/app.t
trunk/client/src/net/sourceforge/fortress/image/mud/
trunk/client/src/net/sourceforge/fortress/map.t
trunk/client/src/net/sourceforge/fortress/maptile.t
Modified: trunk/client/src/main.t
===================================================================
--- trunk/client/src/main.t 2007-07-10 22:37:09 UTC (rev 45)
+++ trunk/client/src/main.t 2007-07-11 00:06:28 UTC (rev 46)
@@ -1,5 +1,5 @@
<!-- Copyright 2007 licensed under GPL v3 -->
<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress">
- <app />
+ <game />
</vexi>
Deleted: trunk/client/src/net/sourceforge/fortress/app.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/app.t 2007-07-10 22:37:09 UTC (rev 45)
+++ trunk/client/src/net/sourceforge/fortress/app.t 2007-07-11 00:06:28 UTC (rev 46)
@@ -1,28 +0,0 @@
-<!-- Copyright 2007 licensed under GPL v3 -->
-
-<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:widget="vexi.widget">
- <widget:surface />
- <preloadimages />
- <ui:box titlebar="Fortress Prototype">
- <ui:box orient="vertical" shrink="true">
- <minimap />
- <ui:box fill="#888888" height="1" />
- <ui:box height="5" />
- <ui:box id="tiletype" align="center" textcolor="white" />
- <ui:box height="5" />
- <ui:box id="position" align="center" textcolor="white" />
- </ui:box>
- <ui:box fill="#888888" width="1" hshrink="true" />
- <map id="map" />
-
- vexi.ui.frame = thisbox;
-
- $map.active ++= function(v)
- {
- $position.text = "( "+$map.activeTile.posx+", "+$map.activeTile.posy+" )";
- $tiletype.text = $map.activeTile.type;
- cascade = v;
- }
-
- </ui:box>
-</vexi>
\ No newline at end of file
Copied: trunk/client/src/net/sourceforge/fortress/game.t (from rev 42, trunk/client/src/net/sourceforge/fortress/app.t)
===================================================================
--- trunk/client/src/net/sourceforge/fortress/game.t (rev 0)
+++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-11 00:06:28 UTC (rev 46)
@@ -0,0 +1,12 @@
+<!-- Copyright 2007 licensed under GPL v3 -->
+
+<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:widget="vexi.widget">
+ <widget:surface />
+ <preloadimages />
+ <ui:box titlebar="Fortress Prototype">
+ <isogrid id="map" />
+
+ vexi.ui.frame = thisbox;
+
+ </ui:box>
+</vexi>
\ No newline at end of file
Added: trunk/client/src/net/sourceforge/fortress/image/iso96/grid.png
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/image/iso96/grid.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/client/src/net/sourceforge/fortress/image/iso96/highlight.png
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/image/iso96/highlight.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/client/src/net/sourceforge/fortress/isogrid.t
===================================================================
(Binary files differ)
Property changes on: trunk/client/src/net/sourceforge/fortress/isogrid.t
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/client/src/net/sourceforge/fortress/map.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/map.t 2007-07-10 22:37:09 UTC (rev 45)
+++ trunk/client/src/net/sourceforge/fortress/map.t 2007-07-11 00:06:28 UTC (rev 46)
@@ -1,199 +0,0 @@
-<!-- Copyright 2007 licensed under GPL v3 -->
-
-<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress">
- <ui:box layout="absolute">
- <ui:box id="map" shrink="true" />
- <ui:box id="cur" fill="#88ffffff" display="false" />
-
- var drag1 = false;
- var drag2 = false;
-
- //////// sample road creation /////////////////////////////////
-
- var createMudTile = function(tile)
- {
- if (tile.type == "mud") return;
- var posx = tile.posx;
- var posy = tile.posy;
- var comp = "";
- if (posy > 0 and $map[posx][posy-1].type == "mud")
- {
- var nt = $map[posx][posy-1];
- nt.comp = nt.comp.substring(0, 2) + "m" + nt.comp.substring(3);
- nt.sync();
- comp = comp + "m";
- }
- else comp = comp + "_";
- if ($map.numchildren > posx+1 and $map[posx+1][posy].type == "mud")
- {
- var nt = $map[posx+1][posy];
- nt.comp = nt.comp.substring(0, 3) + "m";
- nt.sync();
- comp = comp + "m";
- }
- else comp = comp + "_";
- if ($map[posx].numchildren > posy+1 and $map[posx][posy+1].type != "grass")
- {
- var nt = $map[posx][posy+1];
- nt.comp = "m" + nt.comp.substring(1);
- nt.sync();
- comp = comp + "m";
- }
- else comp = comp + "_";
- if (posx > 0 and $map[posx-1][posy].type != "grass")
- {
- var nt = $map[posx-1][posy];
- nt.comp = nt.comp.substring(0, 1) + "m" + nt.comp.substring(2);
- nt.sync();
- comp = comp + "m";
- }
- else comp = comp + "_";
- tile.seed = "";
- tile.type = "mud";
- tile.comp = comp;
- tile.sync();
- surface.setMapTile(tile);
- }
-
- var sr1Func = function(v)
- {
- drag1 = false;
- surface.Focused --= sr1Func;
- surface._Release1 --= sr1Func;
- }
-
- thisbox.Press1 ++= function(v)
- {
- if (!activeTile or drag2) return;
- createMudTile(activeTile);
- drag1 = true;
- surface.Focused ++= sr1Func;
- surface._Release1 ++= sr1Func;
- }
-
- //////// minimap interaction //////////////////////////////////
-
- var mapDim = function(v)
- {
- cascade = v;
- surface.setMapDim($map.width, $map.height);
- }
-
- $map.width ++= mapDim;
- $map.height ++= mapDim;
-
- var mapBox = function(v)
- {
- cascade = v;
- surface.setMapBox(width, height);
- }
-
- thisbox.width ++= mapBox;
- thisbox.height ++= mapBox;
-
- //////// map movement /////////////////////////////////////////
-
- var mx;
- var my;
- var ox;
- var oy;
- var vx;
- var vy;
-
- var dragMove = function(v)
- {
- var m = thisbox.mouse;
- var nx = ox + m.x - mx;
- var ny = oy + m.y - my;
- nx = 0 > nx ? (nx > vx ? nx : vx) : 0;
- ny = 0 > ny ? (ny > vy ? ny : vy) : 0;
- $map.x = nx;
- $map.y = ny;
- surface.setMapPos(nx, ny);
- cascade = v;
- }
-
- var dragStop = function(v)
- {
- surface.delMoveTrap(dragMove);
- surface._Release2 --= dragStop;
- drag2 = false;
- cascade = v;
- active = true;
- }
-
- var dragStart = function(v)
- {
- if (drag1) return;
- drag2 = true;
- $cur.display = false;
- var m = thisbox.mouse;
- mx = m.x;
- my = m.y;
- ox = $map.x;
- oy = $map.y;
- vx = width - $map.width;
- vy = height - $map.height;
- surface.addMoveTrap(dragMove);
- surface._Release2 ++= dragStop;
- cascade = v;
- }
-
- thisbox.Press2 ++= dragStart;
-
- //////// tile tracking ////////////////////////////////////////
-
- thisbox.activeTile = null;
-
- thisbox.active ++= function(v)
- {
- var d = thisbox.distanceto(activeTile);
- $cur.display = true;
- $cur.width = activeTile.width;
- $cur.height = activeTile.height;
- $cur.x = d.x;
- $cur.y = d.y;
- }
-
- var enterFunc = function(v)
- {
- cascade = v;
- activeTile = trapee;
- if (drag1) createMudTile(trapee);
- if (!drag2) active = true;
- }
-
- thisbox.Leave ++= function(v) { $cur.display = false; }
-
- for (var i=0; 100>i; i++)
- {
- $map[i] = vexi.box;
- $map[i].orient = "vertical";
- for (var j=0; 100>j; j++)
- {
- var t = .maptile(vexi.box);
- t.Enter ++= enterFunc;
- t.posx = i;
- t.posy = j;
- $map[i][j] = t;
- }
- }
-
- surface ++= function(v)
- {
- cascade = v;
- surface.setMapContents($map);
-
- surface.moveMapTo = function(x, y)
- {
- var d = $map.distanceto($map[x][y]);
- var dx = width/2 - d.x;
- var dy = height/2 - d.y;
- $map.x = 0 > dx ? (dx > width - $map.width ? dx : width - $map.width) : 0;
- $map.y = 0 > dy ? (dy > height - $map.height ? dy : height - $map.height) : 0;
- surface.setMapPos($map.x, $map.y);
- }
- }
-
- </ui:box>
-</vexi>
\ No newline at end of file
Deleted: trunk/client/src/net/sourceforge/fortress/maptile.t
===================================================================
--- trunk/client/src/net/sourceforge/fortress/maptile.t 2007-07-10 22:37:09 UTC (rev 45)
+++ trunk/client/src/net/sourceforge/fortress/maptile.t 2007-07-11 00:06:28 UTC (rev 46)
@@ -1,14 +0,0 @@
-<!-- Copyright 2007 licensed under GPL v3 -->
-
-<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress">
- <ui:box shrink="true" width="20" height="20">
-
- thisbox.sync = function() { fill = .image[type][type+comp+seed]; }
- thisbox.type = "grass";
- thisbox.comp = "";
- thisbox.seed = vexi.math.floor(vexi.math.random()*10);
-
- sync();
-
- </ui:box>
-</vexi>
\ No newline at end of file
Modified: trunk/client/src/net/sourceforge/fortress/preloadimages.t
===================================================================
(Binary files differ)
Copied: trunk/client/src/net/sourceforge/fortress/twoquarter.t (from rev 42, trunk/client/src/net/sourceforge/fortress/maptile.t)
===================================================================
--- trunk/client/src/net/sourceforge/fortress/twoquarter.t (rev 0)
+++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-07-11 00:06:28 UTC (rev 46)
@@ -0,0 +1,99 @@
+<!-- Copyright 2007 licensed under GPL v3 -->
+
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="net.sourceforge.fortress">
+ <meta:doc>
+ <author>Charles Goodwin</author>
+ <about>An portion of an isometric tile on the map</about>
+ <usage>
+ A tile representing two quarters of an isometric tile on
+ the map (hence the name). The two quarters are either side
+ of a diagonal axis of the template box.
+
+ There are two types of tile - top and bottom. This means
+ whether the tile to the right is a top piece or on the
+ bottom of an isometric tile.
+ </usage>
+ </meta:doc>
+
+ <ui:box layout="absolute" shrink="true" width="48" height="24">
+
+ // top-left vs bottom-left
+ thisbox.top = true;
+ // used to give the graphics a non-repeating feel
+ thisbox.seed = vexi.math.floor(vexi.math.random()*10);
+
+ thisbox.addPiece = function(type, left)
+ {
+ var z = static.zindex[type];
+ if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy;
+ var i = 0;
+ while (numchildren > i)
+ {
+ if (thisbox[i].type == type and thisbox[i].left == left)
+ throw "tried to add a duplicate tile piece of type '"+type+"' from "+posx+", "+posy;
+ if (thisbox[i].z > z) break;
+ i++;
+ }
+
+ var b = vexi.box;
+ b.fill = .image[static.tileset][type];
+ b.left = left;
+ b.shrink = true;
+ b.type = type;
+ b.x = left ? 0 : -48;
+ b.y = top ? 0 : -24;
+ //vexi.log.info(posx+", "+posy+" -- "+top+", "+left);
+ b.z = z;
+ thisbox[i] = b;
+ }
+
+ thisbox.delPiece = function(type, left)
+ {
+ for (var i=0; numchildren>i; i++)
+ {
+ if (thisbox[i].type == type and thisbox[i].left == left)
+ {
+ thisbox[i] = null;
+ return;
+ }
+ }
+ throw "tried to clear a non-existent piece of type '"+type+"' from "+posx+", "+posy;
+ }
+
+ thisbox.posx ++= static.posFunc;
+ thisbox.posy ++= static.posFunc;
+
+ </ui:box>
+
+ static.posFunc = function(v)
+ {
+ cascade = v;
+ trapee.top = 0 == (trapee.posx + trapee.posy) % 2;
+ }
+
+ static.tileset = "iso96";
+
+ static.varies = { };
+ static.zindex = { };
+ static.ztiles = [ ];
+ static.z = 0;
+
+ static.register = function(name, v)
+ {
+ if (zindex[name]) throw "duplicate entrie in zindex table";
+ if (!v) v = 1;
+ varies[name] = v;
+ zindex[name] = static.z;
+ ztiles[static.z] = name;
+ static.z++;
+ }
+
+ static.init = function()
+ {
+ register("highlight");
+ register("grid");
+ }
+
+ { init(); }
+
+</vexi>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 22:37:07
|
Revision: 45
http://fortress.svn.sourceforge.net/fortress/?rev=45&view=rev
Author: clrg
Date: 2007-07-10 15:37:09 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
basic iso96 xcf (tile + highlight)
Added Paths:
-----------
trunk/media/xcf/iso96/
trunk/media/xcf/iso96/grid.xcf
Added: trunk/media/xcf/iso96/grid.xcf
===================================================================
(Binary files differ)
Property changes on: trunk/media/xcf/iso96/grid.xcf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 20:05:28
|
Revision: 44
http://fortress.svn.sourceforge.net/fortress/?rev=44&view=rev
Author: clrg
Date: 2007-07-10 13:05:27 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Ignore annoying Windows artifact Thumbs.db
Removed Paths:
-------------
trunk/client/src/net/sourceforge/fortress/image/mud/Thumbs.db
Property Changed:
----------------
trunk/client/
trunk/client/doc/
trunk/client/src/
trunk/client/src/net/
trunk/client/src/net/sourceforge/
trunk/client/src/net/sourceforge/fortress/
trunk/client/src/net/sourceforge/fortress/image/
trunk/client/src/net/sourceforge/fortress/image/grass/
trunk/client/src/net/sourceforge/fortress/image/mud/
Property changes on: trunk/client
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/doc
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/src
___________________________________________________________________
Name: svn:ignore
- *.vexi
+ Thumbs.db
Property changes on: trunk/client/src/net
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/src/net/sourceforge
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/src/net/sourceforge/fortress
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/src/net/sourceforge/fortress/image
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/src/net/sourceforge/fortress/image/grass
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Property changes on: trunk/client/src/net/sourceforge/fortress/image/mud
___________________________________________________________________
Name: svn:ignore
+ Thumbs.db
Deleted: trunk/client/src/net/sourceforge/fortress/image/mud/Thumbs.db
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 19:41:04
|
Revision: 43
http://fortress.svn.sourceforge.net/fortress/?rev=43&view=rev
Author: clrg
Date: 2007-07-10 12:41:03 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Added Paths:
-----------
branches/prototype1/
Copied: branches/prototype1 (from rev 42, trunk/client)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 19:34:32
|
Revision: 42
http://fortress.svn.sourceforge.net/fortress/?rev=42&view=rev
Author: clrg
Date: 2007-07-10 12:34:33 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Renamed remotely
Added Paths:
-----------
trunk/media/
Removed Paths:
-------------
trunk/Media/
Copied: trunk/media (from rev 41, trunk/Media)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 19:34:10
|
Revision: 41
http://fortress.svn.sourceforge.net/fortress/?rev=41&view=rev
Author: clrg
Date: 2007-07-10 12:34:11 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Renamed remotely
Added Paths:
-----------
trunk/client/
Removed Paths:
-------------
trunk/VexiClient/
Copied: trunk/client (from rev 40, trunk/VexiClient)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 19:33:46
|
Revision: 40
http://fortress.svn.sourceforge.net/fortress/?rev=40&view=rev
Author: clrg
Date: 2007-07-10 12:33:47 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Removed file/folder
Removed Paths:
-------------
trunk/Fortress/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 19:09:41
|
Revision: 39
http://fortress.svn.sourceforge.net/fortress/?rev=39&view=rev
Author: clrg
Date: 2007-07-10 12:09:43 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Created folder remotely
Added Paths:
-----------
tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-07-10 19:09:25
|
Revision: 38
http://fortress.svn.sourceforge.net/fortress/?rev=38&view=rev
Author: clrg
Date: 2007-07-10 12:09:28 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Created folder remotely
Added Paths:
-----------
branches/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-28 13:30:27
|
Revision: 23
http://fortress.svn.sourceforge.net/fortress/?rev=23&view=rev
Author: clrg
Date: 2007-06-28 06:30:27 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Renamed remotely
Added Paths:
-----------
trunk/VexiClient/
Removed Paths:
-------------
trunk/Prototype/
Copied: trunk/VexiClient (from rev 22, trunk/Prototype)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-28 13:26:53
|
Revision: 22
http://fortress.svn.sourceforge.net/fortress/?rev=22&view=rev
Author: clrg
Date: 2007-06-28 06:26:54 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Removed file/folder
Removed Paths:
-------------
trunk/Prototype/xcf/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-28 13:26:24
|
Revision: 21
http://fortress.svn.sourceforge.net/fortress/?rev=21&view=rev
Author: clrg
Date: 2007-06-28 06:26:27 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Copied remotely
Added Paths:
-----------
trunk/Media/xcf/
Copied: trunk/Media/xcf (from rev 20, trunk/Prototype/xcf)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-28 13:25:45
|
Revision: 20
http://fortress.svn.sourceforge.net/fortress/?rev=20&view=rev
Author: clrg
Date: 2007-06-28 06:25:47 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Created folder remotely
Added Paths:
-----------
trunk/Media/blend/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-28 13:25:14
|
Revision: 19
http://fortress.svn.sourceforge.net/fortress/?rev=19&view=rev
Author: clrg
Date: 2007-06-28 06:25:12 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
Created folder remotely
Added Paths:
-----------
trunk/Media/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-27 14:54:16
|
Revision: 18
http://fortress.svn.sourceforge.net/fortress/?rev=18&view=rev
Author: clrg
Date: 2007-06-27 07:54:13 -0700 (Wed, 27 Jun 2007)
Log Message:
-----------
Event handling fixes
- stop dragging if mouse button is released outside of frame (map)
- stop dragging if frame loses focus (minimap)
Modified Paths:
--------------
trunk/Prototype/src/net/sourceforge/fortress/map.t
trunk/Prototype/src/net/sourceforge/fortress/minimap.t
Modified: trunk/Prototype/src/net/sourceforge/fortress/map.t
===================================================================
--- trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 02:14:57 UTC (rev 17)
+++ trunk/Prototype/src/net/sourceforge/fortress/map.t 2007-06-27 14:54:13 UTC (rev 18)
@@ -59,7 +59,7 @@
{
drag1 = false;
surface.Focused --= sr1Func;
- surface.Release1 --= sr1Func;
+ surface._Release1 --= sr1Func;
}
thisbox.Press1 ++= function(v)
@@ -68,7 +68,7 @@
createMudTile(activeTile);
drag1 = true;
surface.Focused ++= sr1Func;
- surface.Release1 ++= sr1Func;
+ surface._Release1 ++= sr1Func;
}
//////// minimap interaction //////////////////////////////////
Modified: trunk/Prototype/src/net/sourceforge/fortress/minimap.t
===================================================================
--- trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-27 02:14:57 UTC (rev 17)
+++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-27 14:54:13 UTC (rev 18)
@@ -43,12 +43,14 @@
var releaseFunc = function(v)
{
Move --= moveMapFunc;
+ surface.Focused --= releaseFunc;
surface._Release1 --= releaseFunc;
}
var pressFunc = function(v)
{
Move ++= moveMapFunc;
+ surface.Focused ++= releaseFunc;
surface._Release1 ++= releaseFunc;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cl...@us...> - 2007-06-27 02:14:55
|
Revision: 17
http://fortress.svn.sourceforge.net/fortress/?rev=17&view=rev
Author: clrg
Date: 2007-06-26 19:14:57 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
Implement minimap dragging (left mouse button)
- remove surface.t (was daft idea to import it)
- ignore .vexi files in src/ directory
Modified Paths:
--------------
trunk/Prototype/src/net/sourceforge/fortress/app.t
trunk/Prototype/src/net/sourceforge/fortress/minimap.t
Removed Paths:
-------------
trunk/Prototype/src/net/sourceforge/fortress/surface.t
Property Changed:
----------------
trunk/Prototype/src/
Property changes on: trunk/Prototype/src
___________________________________________________________________
Name: svn:ignore
+ *.vexi
Modified: trunk/Prototype/src/net/sourceforge/fortress/app.t
===================================================================
--- trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 00:36:30 UTC (rev 16)
+++ trunk/Prototype/src/net/sourceforge/fortress/app.t 2007-06-27 02:14:57 UTC (rev 17)
@@ -1,7 +1,7 @@
<!-- Copyright 2007 licensed under GPL v3 -->
-<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress">
- <surface />
+<vexi xmlns:ui="vexi://ui" xmlns="net.sourceforge.fortress" xmlns:widget="vexi.widget">
+ <widget:surface />
<preloadimages />
<ui:box titlebar="Fortress Prototype">
<ui:box orient="vertical" shrink="true">
Modified: trunk/Prototype/src/net/sourceforge/fortress/minimap.t
===================================================================
--- trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-27 00:36:30 UTC (rev 16)
+++ trunk/Prototype/src/net/sourceforge/fortress/minimap.t 2007-06-27 02:14:57 UTC (rev 17)
@@ -34,11 +34,26 @@
var moveMapFunc = function(v)
{
+ vexi.log.info(v);
// assumes minimap tiles are 1px by 1px
- var d = $minimap.distanceto(trapee);
- surface.moveMapTo(d.x, d.y);
+ surface.moveMapTo(mouse.x, mouse.y);
+ cascade = v;
}
+ var releaseFunc = function(v)
+ {
+ Move --= moveMapFunc;
+ surface._Release1 --= releaseFunc;
+ }
+
+ var pressFunc = function(v)
+ {
+ Move ++= moveMapFunc;
+ surface._Release1 ++= releaseFunc;
+ }
+
+ thisbox.Press1 ++= pressFunc;
+
surface ++= function(v)
{
cascade = v;
Deleted: trunk/Prototype/src/net/sourceforge/fortress/surface.t
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
