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-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-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 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: <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 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: <cl...@us...> - 2007-07-17 10:52:18
|
Revision: 57 http://fortress.svn.sourceforge.net/fortress/?rev=57&view=rev Author: clrg Date: 2007-07-17 03:52:21 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Replace black busy animation with white one Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/app.t trunk/client/src/net/sourceforge/fortress/image/process.png Modified: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/image/process.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <diz...@us...> - 2007-07-17 13:48:18
|
Revision: 58 http://fortress.svn.sourceforge.net/fortress/?rev=58&view=rev Author: dizzutch Date: 2007-07-17 06:48:19 -0700 (Tue, 17 Jul 2007) Log Message: ----------- - Added Logo to Main Menu (to be changed in near future, but placeholder is there) - Made the cursor disable on disabled menu items Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/app.t trunk/client/src/net/sourceforge/fortress/appitem.t Added Paths: ----------- trunk/client/src/net/sourceforge/fortress/image/logo.png Modified: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/appitem.t =================================================================== (Binary files differ) Added: trunk/client/src/net/sourceforge/fortress/image/logo.png =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/image/logo.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: <diz...@us...> - 2007-07-17 16:00:07
|
Revision: 59 http://fortress.svn.sourceforge.net/fortress/?rev=59&view=rev Author: dizzutch Date: 2007-07-17 08:59:59 -0700 (Tue, 17 Jul 2007) Log Message: ----------- -Added logo to preloadimages -Starting implementing options menu Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/app.t trunk/client/src/net/sourceforge/fortress/game.t trunk/client/src/net/sourceforge/fortress/preloadimages.t Modified: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/game.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-17 13:48:19 UTC (rev 58) +++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-17 15:59:59 UTC (rev 59) @@ -3,6 +3,8 @@ <vexi xmlns:ui="vexi://ui" xmlns:layout="vexi.layout" xmlns:widget="vexi.widget" xmlns="net.sourceforge.fortress"> <preloadimages /> + static.invertmouse = false; + static.showgrid = true; <ui:box orient="vertical"> <panel id="top" padding="10" vshrink="true"> <shadowtext text="Fortress Prototype v2" /> @@ -21,14 +23,16 @@ <minimap id="minimap" /> </layout:border> <ui:box orient="vertical" vshrink="true"> - <ui:box height="10" /> + <!-- + <ui:box height="10" /> <widget:check id="gridon" cursor="hand" focusable="false" selected="true"> <shadowtext text="Toggle Grid" /> </widget:check> <ui:box height="10" /> <widget:check id="invert" cursor="hand" focusable="false" selected="false"> <shadowtext text="Invert Mouse" /> - </widget:check> + </widget:check> + --> </ui:box> <layout:border border="#ffcc00" depth="1" shrink="true"> <ui:box width="100" height="100" /> @@ -39,9 +43,9 @@ //// Map / Sidebar Interaction //////////////////////////////// - $gridon.selected ++= function(v) { cascade = v; $map.gridon = v; } - $invert.selected ++= function(v) { cascade = v; $map.invert = v; } - + static.showgrid ++= function(v) { cascade = v; $map.gridon = v; } + static.invertmouse ++= function(v) { cascade = v; $map.invert = v; } + //// Panel Layout ///////////////////////////////////////////// $top.height ++= function(v) Modified: trunk/client/src/net/sourceforge/fortress/preloadimages.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-17 19:03:32
|
Revision: 61 http://fortress.svn.sourceforge.net/fortress/?rev=61&view=rev Author: clrg Date: 2007-07-17 12:03:34 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Remove tabs and make options representative (they were inverse) Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/app.t trunk/client/src/net/sourceforge/fortress/appitem.t trunk/client/src/net/sourceforge/fortress/game.t Modified: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/appitem.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/game.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/game.t 2007-07-17 17:24:15 UTC (rev 60) +++ trunk/client/src/net/sourceforge/fortress/game.t 2007-07-17 19:03:34 UTC (rev 61) @@ -2,9 +2,11 @@ <vexi xmlns:ui="vexi://ui" xmlns:layout="vexi.layout" xmlns:widget="vexi.widget" xmlns="net.sourceforge.fortress"> - <preloadimages /> + static.invertmouse = false; static.showgrid = true; + + <preloadimages /> <ui:box orient="vertical"> <panel id="top" padding="10" vshrink="true"> <shadowtext text="Fortress Prototype v2" /> @@ -31,8 +33,8 @@ <ui:box height="10" /> <widget:check id="invert" cursor="hand" focusable="false" selected="false"> <shadowtext text="Invert Mouse" /> - </widget:check> - --> + </widget:check> + --> </ui:box> <layout:border border="#ffcc00" depth="1" shrink="true"> <ui:box width="100" height="100" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-07-17 19:08:18
|
Revision: 62 http://fortress.svn.sourceforge.net/fortress/?rev=62&view=rev Author: clrg Date: 2007-07-17 12:08:20 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Nicer menu - white logo - logo on the left - grid option is 'show grid' by default Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/app.t Added Paths: ----------- trunk/client/src/net/sourceforge/fortress/image/logo_white.png Modified: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Added: trunk/client/src/net/sourceforge/fortress/image/logo_white.png =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/image/logo_white.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-17 20:39:57
|
Revision: 63 http://fortress.svn.sourceforge.net/fortress/?rev=63&view=rev Author: clrg Date: 2007-07-17 13:39:16 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Now if we change menu options elsewhere the menu is still current Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/app.t trunk/client/src/net/sourceforge/fortress/appitem.t Modified: trunk/client/src/net/sourceforge/fortress/app.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/appitem.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-08-15 23:13:18
|
Revision: 76 http://fortress.svn.sourceforge.net/fortress/?rev=76&view=rev Author: clrg Date: 2007-08-15 16:13:20 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Move remotely Added Paths: ----------- trunk/client/src/net/sourceforge/fortress/iso96/ Removed Paths: ------------- trunk/client/src/net/sourceforge/fortress/image/iso96/ Copied: trunk/client/src/net/sourceforge/fortress/iso96 (from rev 75, trunk/client/src/net/sourceforge/fortress/image/iso96) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-08-15 23:14:56
|
Revision: 77 http://fortress.svn.sourceforge.net/fortress/?rev=77&view=rev Author: clrg Date: 2007-08-15 16:14:59 -0700 (Wed, 15 Aug 2007) Log Message: ----------- Move remotely Added Paths: ----------- trunk/client/src/net/sourceforge/fortress/iso96/grass/ Removed Paths: ------------- trunk/client/src/net/sourceforge/fortress/image/grass/ Copied: trunk/client/src/net/sourceforge/fortress/iso96/grass (from rev 76, trunk/client/src/net/sourceforge/fortress/image/grass) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-08-17 03:25:59
|
Revision: 82 http://fortress.svn.sourceforge.net/fortress/?rev=82&view=rev Author: clrg Date: 2007-08-16 20:25:55 -0700 (Thu, 16 Aug 2007) Log Message: ----------- Some refactoring Modified Paths: -------------- trunk/client/src/net/sourceforge/fortress/isogrid.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/iso96/squaretower/top1.png trunk/client/src/net/sourceforge/fortress/iso96/squaretower/top2.png Added: trunk/client/src/net/sourceforge/fortress/iso96/squaretower/top1.png =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/iso96/squaretower/top1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/client/src/net/sourceforge/fortress/iso96/squaretower/top2.png =================================================================== (Binary files differ) Property changes on: trunk/client/src/net/sourceforge/fortress/iso96/squaretower/top2.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/preloadimages.t =================================================================== (Binary files differ) Modified: trunk/client/src/net/sourceforge/fortress/twoquarter.t =================================================================== --- trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-08-16 15:55:48 UTC (rev 81) +++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-08-17 03:25:55 UTC (rev 82) @@ -22,28 +22,34 @@ // 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"; + thisbox.tile = "grass"; - var sync = function() { fill = .image[type][type+seed]; } + var sync = function() { fill = .iso96[tile][tile+seed]; } sync(); - thisbox.addPiece = function(type, top, left) + thisbox.addPiece = function(type, top, left, zoffset) { - var z = static.zindex[type]; + type = type.split('.'); + var z = static.zindex[type[0]]; if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy; + // dont add null/undeclared to z + z += zoffset ? zoffset : 0; + var p; var i = 0; - var p; while (numchildren > i) { 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 (p.z == z and p.left == left and p.top == top) + throw "tried to add a duplicate tile piece of type '"+type[0]+"' from "+posx+", "+posy; if (p.z > z) break; i++; } + var r = .iso96; + for (var i=0; type.length>i; i++) + r = r[type[i]]; var b = vexi.box; - b.fill = .image[static.tileset][type]; + b.fill = r; b.left = left; b.top = top; b.shrink = true; @@ -56,13 +62,17 @@ return b; } - thisbox.delPiece = function(type, top, left) + thisbox.delPiece = function(type, top, left, zoffset) { + var z = static.zindex[type]; + if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy; + // dont add null/undeclared to z + z += zoffset ? zoffset : 0; var p; for (var i=0; numchildren>i; i++) { p = thisbox[i]; - if (p.type == type and p.left == left and p.top == top) + if (p.z == z and p.left == left and p.top == top) { thisbox[i] = null; return; @@ -103,9 +113,7 @@ { register("highlight"); register("grid"); - register("towerbase"); - register("towerstem"); - register("towertop"); + register("squaretower"); } { init(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cl...@us...> - 2007-08-17 03:35:49
|
Revision: 83 http://fortress.svn.sourceforge.net/fortress/?rev=83&view=rev Author: clrg Date: 2007-08-16 20:35:50 -0700 (Thu, 16 Aug 2007) Log Message: ----------- Fix grass and make piece zoffset effective 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-08-17 03:25:55 UTC (rev 82) +++ trunk/client/src/net/sourceforge/fortress/twoquarter.t 2007-08-17 03:35:50 UTC (rev 83) @@ -22,9 +22,9 @@ // 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.tile = "grass"; + thisbox.base = "grass"; - var sync = function() { fill = .iso96[tile][tile+seed]; } + var sync = function() { fill = .iso96[base][base+seed]; } sync(); thisbox.addPiece = function(type, top, left, zoffset) @@ -32,15 +32,15 @@ type = type.split('.'); var z = static.zindex[type[0]]; if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy; - // dont add null/undeclared to z - z += zoffset ? zoffset : 0; + // static.z*zoffset allows us to place tiles untouchably infronts + z += static.z * (zoffset ? zoffset : 0); var p; var i = 0; while (numchildren > i) { p = thisbox[i]; if (p.z == z and p.left == left and p.top == top) - throw "tried to add a duplicate tile piece of type '"+type[0]+"' from "+posx+", "+posy; + throw "tried to add a duplicate piece '"+type[0]+"("+z+") ' from "+posx+", "+posy; if (p.z > z) break; i++; } @@ -66,8 +66,8 @@ { var z = static.zindex[type]; if (z == null) throw "tried to add nonregistered type '"+type+"' from "+posx+", "+posy; - // dont add null/undeclared to z - z += zoffset ? zoffset : 0; + // static.z*zoffset allows us to place tiles untouchably infront + z += static.z * (zoffset ? zoffset : 0); var p; for (var i=0; numchildren>i; i++) { @@ -78,7 +78,7 @@ return; } } - throw "tried to clear a non-existent piece of type '"+type+"' from "+posx+", "+posy; + throw "tried to clear a non-existent piece of type '"+type[0]+"' from "+posx+", "+posy; } thisbox.posx ++= static.posFunc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |