From: <ko...@us...> - 2009-01-12 21:06:40
|
Revision: 2870 http://planeshift.svn.sourceforge.net/planeshift/?rev=2870&view=rev Author: kougaro Date: 2009-01-12 21:06:27 +0000 (Mon, 12 Jan 2009) Log Message: ----------- added a mount NPC in the DB, and the buttons to interact with it through the right-click menu Modified Paths: -------------- personal/kougaro/data/gui/interact.xml personal/kougaro/src/server/database/mysql/character_relationships.sql personal/kougaro/src/server/database/mysql/characters.sql personal/kougaro/src/server/database/mysql/commonstrings.sql personal/kougaro/src/server/database/mysql/race_info.sql personal/kougaro/src/server/database/mysql/race_spawns.sql Modified: personal/kougaro/data/gui/interact.xml =================================================================== --- personal/kougaro/data/gui/interact.xml 2009-01-12 15:36:16 UTC (rev 2869) +++ personal/kougaro/data/gui/interact.xml 2009-01-12 21:06:27 UTC (rev 2870) @@ -131,6 +131,16 @@ <frame x="128" y="128" width="64" height="64" /> <bgimage resource="ButtonIntroduce" /> </widget> + + <widget name="ButtonMount" factory="pawsButton" id="2600" tooltip="Mount"> + <frame x="128" y="128" width="64" height="64" /> + <bgimage resource="ButtonCombine" /> + </widget> + + <widget name="ButtonUnmount" factory="pawsButton" id="2700" tooltip="Mount"> + <frame x="128" y="128" width="64" height="64" /> + <bgimage resource="ButtonBanking" /> + </widget> </widget> Modified: personal/kougaro/src/server/database/mysql/character_relationships.sql =================================================================== --- personal/kougaro/src/server/database/mysql/character_relationships.sql 2009-01-12 15:36:16 UTC (rev 2869) +++ personal/kougaro/src/server/database/mysql/character_relationships.sql 2009-01-12 21:06:27 UTC (rev 2870) @@ -23,3 +23,4 @@ INSERT INTO character_relationships VALUES( 2, 1, "buddy" , "" ); INSERT INTO character_relationships VALUES( 9, 2, "buddy" , "" ); INSERT INTO character_relationships VALUES( 1, 11, "familiar" , "" ); +INSERT INTO character_relationships VALUES( 1, 59, "familiar" , "" ); Modified: personal/kougaro/src/server/database/mysql/characters.sql =================================================================== --- personal/kougaro/src/server/database/mysql/characters.sql 2009-01-12 15:36:16 UTC (rev 2869) +++ personal/kougaro/src/server/database/mysql/characters.sql 2009-01-12 21:06:27 UTC (rev 2870) @@ -121,7 +121,7 @@ INSERT INTO `characters` VALUES (57,'Loudon','','',4,1,44.00,40.00,44.00,40.00,40.00,40.00,50.00,100.00,100.00,100.00,100.00,100.00,100,100,100,100,100,100,100,100,0,3,-1.00,0.00,-175.00,0.00,0,0,0,'','',0,NULL,'1,30,2,-30','',1,4,'N',9,0,0,0,0,'description','','',10,'',0,'0000-00-00 00:00:00',0); INSERT INTO `characters` VALUES (58,'Cabot','','',5,1,44.00,40.00,44.00,40.00,40.00,40.00,50.00,100.00,100.00,100.00,100.00,100.00,100,100,100,100,100,100,100,100,0,3,-1.00,0.00,-174.00,0.00,0,0,0,'','',0,NULL,'1,30,2,-30','',1,4,'N',9,0,0,0,0,'description','','',10,'',0,'0000-00-00 00:00:00',0); -INSERT INTO `characters` VALUES (59,'Mount1','','',23,3,100.00,100.00,100.00,100.00,100.00,100.00,200.00,200.00,100.00,100.00,100.00,100.00,100,100,100,100,100,100,100,100,0,3,-90.00,0.00,-260.00,0.00,0,0,0,'','',0,NULL,'1,35,2,-35','',1,6,'Y',9,0,2,0,0,'description','','',10,'',0,'0000-00-00 00:00:00',0); +INSERT INTO `characters` VALUES (59,'Mount1','','',32,3,100.00,100.00,100.00,100.00,100.00,100.00,200.00,200.00,100.00,100.00,100.00,100.00,100,100,100,100,100,100,100,100,0,3,-42.86,-0.01,-152.30,0.00,0,0,0,'','',0,NULL,'1,35,2,-35','',1,6,'Y',9,0,2,0,0,'description','','',10,'',0,'0000-00-00 00:00:00',0); /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; Modified: personal/kougaro/src/server/database/mysql/commonstrings.sql =================================================================== --- personal/kougaro/src/server/database/mysql/commonstrings.sql 2009-01-12 15:36:16 UTC (rev 2869) +++ personal/kougaro/src/server/database/mysql/commonstrings.sql 2009-01-12 21:06:27 UTC (rev 2870) @@ -205,16 +205,7 @@ INSERT INTO common_strings VALUES("183","$F_head_2"); INSERT INTO common_strings VALUES("184", "/planeshift/models/$F/$F_head_2.dds"); INSERT INTO common_strings VALUES("187","rogue"); -INSERT INTO common_strings VALUES("2701","Torso"); -INSERT INTO common_strings VALUES("2702","Arm"); -INSERT INTO common_strings VALUES("2703","Foot"); -INSERT INTO common_strings VALUES("2704","Hand"); -INSERT INTO common_strings VALUES("2705","Legs"); -INSERT INTO common_strings VALUES("2706","/planeshift/models/$F/$F_torso_leather.dds"); -INSERT INTO common_strings VALUES("2707","/planeshift/models/$F/$F_arm_leather.dds"); -INSERT INTO common_strings VALUES("2708","/planeshift/models/$F/$F_foot_leather.dds"); -INSERT INTO common_strings VALUES("2709","/planeshift/models/$F/$F_hand_leather.dds"); -INSERT INTO common_strings VALUES("2710","/planeshift/models/$F/$F_legs_leather.dds"); + INSERT INTO common_strings VALUES("211","/planeshift/models/$F/$F_torso_chainmail.dds"); INSERT INTO common_strings VALUES("212","/planeshift/models/$F/$F_arm_chainmail.dds"); INSERT INTO common_strings VALUES("213","/planeshift/models/$F/$F_foot_chainmail.dds"); @@ -231,5 +222,18 @@ INSERT INTO common_strings VALUES("224","items#campfire01a"); INSERT INTO common_strings VALUES("225","/planeshift/items/campfire01a.dds"); +INSERT INTO common_strings VALUES("400","drifter"); + INSERT INTO common_strings VALUES("1162","weapons#round_shield_01a"); INSERT INTO common_strings VALUES("1163","/planeshift/weapons/roundshield01a_icon.dds"); + +INSERT INTO common_strings VALUES("2701","Torso"); +INSERT INTO common_strings VALUES("2702","Arm"); +INSERT INTO common_strings VALUES("2703","Foot"); +INSERT INTO common_strings VALUES("2704","Hand"); +INSERT INTO common_strings VALUES("2705","Legs"); +INSERT INTO common_strings VALUES("2706","/planeshift/models/$F/$F_torso_leather.dds"); +INSERT INTO common_strings VALUES("2707","/planeshift/models/$F/$F_arm_leather.dds"); +INSERT INTO common_strings VALUES("2708","/planeshift/models/$F/$F_foot_leather.dds"); +INSERT INTO common_strings VALUES("2709","/planeshift/models/$F/$F_hand_leather.dds"); +INSERT INTO common_strings VALUES("2710","/planeshift/models/$F/$F_legs_leather.dds"); Modified: personal/kougaro/src/server/database/mysql/race_info.sql =================================================================== --- personal/kougaro/src/server/database/mysql/race_info.sql 2009-01-12 15:36:16 UTC (rev 2869) +++ personal/kougaro/src/server/database/mysql/race_info.sql 2009-01-12 21:06:27 UTC (rev 2870) @@ -85,7 +85,8 @@ (29,'Trepor',122,'M',0,0,0,19,100,50,50,50,50,50,50,1.5,1.0,10,10,0,'',18); INSERT INTO `race_info` (`id`,`name`,`cstr_id_mesh`,`sex`,`size_x`,`size_y`,`size_z`,`cstr_id_base_texture`,`initial_cp`,`start_str`,`start_end`,`start_agi`,`start_int`,`start_will`,`start_cha`,`base_physical_regen_still`,`base_physical_regen_walk`,`base_mental_regen_still`,`base_mental_regen_walk`,`armor_id`,`helm`,`race`) VALUES (30,'Ulbernaut',123,'M',0,0,0,19,100,50,50,50,50,50,50,1.5,1.0,10,10,0,'',19), - (31,'Tefusang',124,'M',0,0,0,19,100,50,50,50,50,50,50,2.0,1.5,10,10,0,'',20); + (31,'Tefusang',124,'M',0,0,0,19,100,50,50,50,50,50,50,2.0,1.5,10,10,0,'',20), + (32,'Drifter',121,'M',0,0,0,19,100,50,50,50,50,50,50,2.0,1.5,10,10,0,'',21); /*!40000 ALTER TABLE `race_info` ENABLE KEYS */; Modified: personal/kougaro/src/server/database/mysql/race_spawns.sql =================================================================== --- personal/kougaro/src/server/database/mysql/race_spawns.sql 2009-01-12 15:36:16 UTC (rev 2869) +++ personal/kougaro/src/server/database/mysql/race_spawns.sql 2009-01-12 21:06:27 UTC (rev 2870) @@ -55,7 +55,8 @@ (17,-20,4,-150,0,3), (18,-20,4,-150,0,3), (19,-20,4,-150,0,3), - (20,-20,4,-150,0,3); + (20,-20,4,-150,0,3), + (21,-20,4,-150,0,3); /*!40000 ALTER TABLE `race_spawns` ENABLE KEYS */; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-01-12 22:27:25
|
Revision: 2871 http://planeshift.svn.sourceforge.net/planeshift/?rev=2871&view=rev Author: kougaro Date: 2009-01-12 22:12:36 +0000 (Mon, 12 Jan 2009) Log Message: ----------- merged r2804 to r2870 from trunk Modified Paths: -------------- personal/kougaro/data/gui/control.xml personal/kougaro/data/gui/control_styles.xml personal/kougaro/data/gui/interact.xml personal/kougaro/data/help.xml personal/kougaro/docs/compiling.html personal/kougaro/docs/history.txt personal/kougaro/src/client/charapp.cpp personal/kougaro/src/client/gui/pawschardescription.cpp personal/kougaro/src/client/gui/pawscontrolwindow.cpp personal/kougaro/src/client/gui/pawsdetailwindow.cpp personal/kougaro/src/client/gui/pawspetitiongmwindow.cpp personal/kougaro/src/client/pscamera.cpp personal/kougaro/src/client/pscelclient.cpp personal/kougaro/src/client/pscelclient.h personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/client/psmovement.cpp personal/kougaro/src/client/sound/pssoundmngr.cpp personal/kougaro/src/common/engine/linmove.cpp personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/bankmanager.cpp personal/kougaro/src/server/bankmanager.h personal/kougaro/src/server/bulkobjects/dictionary.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/bulkobjects/psspell.cpp personal/kougaro/src/server/bulkobjects/psspell.h personal/kougaro/src/server/chatmanager.cpp personal/kougaro/src/server/chatmanager.h personal/kougaro/src/server/client.cpp personal/kougaro/src/server/client.h personal/kougaro/src/server/combatmanager.cpp personal/kougaro/src/server/combatmanager.h personal/kougaro/src/server/creationmanager.cpp personal/kougaro/src/server/creationmanager.h personal/kougaro/src/server/database/mysql/action_locations.sql personal/kougaro/src/server/database/mysql/gameboards.sql personal/kougaro/src/server/database/mysql/npc_spawn_ranges.sql personal/kougaro/src/server/database/mysql/progress_events.sql personal/kougaro/src/server/database/mysql/quests.sql personal/kougaro/src/server/database/mysql/server_options.sql personal/kougaro/src/server/database/mysql/upgrade_schema.sql personal/kougaro/src/server/entitymanager.cpp personal/kougaro/src/server/entitymanager.h personal/kougaro/src/server/exchangemanager.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/gmeventmanager.cpp personal/kougaro/src/server/gmeventmanager.h personal/kougaro/src/server/groupmanager.cpp personal/kougaro/src/server/groupmanager.h personal/kougaro/src/server/guildmanager.cpp personal/kougaro/src/server/guildmanager.h personal/kougaro/src/server/introductionmanager.cpp personal/kougaro/src/server/introductionmanager.h personal/kougaro/src/server/minigamemanager.cpp personal/kougaro/src/server/minigamemanager.h personal/kougaro/src/server/npcmanager.cpp personal/kougaro/src/server/npcmanager.h personal/kougaro/src/server/paladinjr.cpp personal/kougaro/src/server/paladinjr.h personal/kougaro/src/server/progressionmanager.cpp personal/kougaro/src/server/progressionmanager.h personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserver.h personal/kougaro/src/server/psserverchar.cpp personal/kougaro/src/server/psserverchar.h personal/kougaro/src/server/psserverdr.cpp personal/kougaro/src/server/psserverdr.h personal/kougaro/src/server/questionmanager.cpp personal/kougaro/src/server/questionmanager.h personal/kougaro/src/server/questmanager.cpp personal/kougaro/src/server/questmanager.h personal/kougaro/src/server/slotmanager.cpp personal/kougaro/src/server/slotmanager.h personal/kougaro/src/server/spawnmanager.cpp personal/kougaro/src/server/spawnmanager.h personal/kougaro/src/server/spellmanager.cpp personal/kougaro/src/server/spellmanager.h personal/kougaro/src/server/tutorialmanager.cpp personal/kougaro/src/server/tutorialmanager.h personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/workmanager.cpp personal/kougaro/src/server/workmanager.h Added Paths: ----------- personal/kougaro/docs/todo.txt personal/kougaro/lang/1337/ personal/kougaro/lang/1337/data/ personal/kougaro/lang/1337/data/help.xml personal/kougaro/lang/1337/stringtable.xml Removed Paths: ------------- personal/kougaro/lang/1337/data/ personal/kougaro/lang/1337/data/help.xml personal/kougaro/lang/1337/stringtable.xml Property Changed: ---------------- personal/kougaro/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 + /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870 Modified: personal/kougaro/data/gui/control.xml =================================================================== --- personal/kougaro/data/gui/control.xml 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/data/gui/control.xml 2009-01-12 22:12:36 UTC (rev 2871) @@ -5,8 +5,8 @@ <frame x="10" y="10" width="497" height="36" border="no" /> <minframe width="360" height="30" /> - <widget name="ShowButtonUp" factory="pawsButton" id="10" > - <frame x="5" y="5" width="10" height="10" /> + <widget name="ShowButtonUp" factory="pawsButton" id="10" tooltip="Hide Toolbar/Change Style" > + <frame x="0" y="0" width="10" height="10" /> <bgimage resource="MiniUp" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -15,8 +15,8 @@ <attach point="PROPORTIONAL_TOP" /> </attachpoints> </widget> - <widget name="ShowButtonDown" factory="pawsButton" id="20" visible="no"> - <frame x="5" y="5" width="10" height="10" /> + <widget name="ShowButtonDown" factory="pawsButton" id="20" tooltip="Show Toolbar" visible="no"> + <frame x="0" y="0" width="10" height="10" /> <bgimage resource="MiniDown" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> Modified: personal/kougaro/data/gui/control_styles.xml =================================================================== --- personal/kougaro/data/gui/control_styles.xml 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/data/gui/control_styles.xml 2009-01-12 22:12:36 UTC (rev 2871) @@ -4,8 +4,8 @@ <buttons width="34" height="34" hide_width="10" hide_height="10" /> <!-- Here you align your buttons, using X and Y cords NOTE: 1 = 1px in 800x600 --> - <button name="ShowButtonUp" y="5" x="5" /> - <button name="ShowButtonDown" y="5" x="5" /> + <button name="ShowButtonUp" y="0" x="0" /> + <button name="ShowButtonDown" y="0" x="0" /> <button name="ChatButton" y="19" x="1" /> <button name="SkillsButton" y="53" x="1" /> <button name="InventoryButton" y="87" x="1" /> @@ -29,7 +29,7 @@ <buttons width="34" height="34" hide_width="10" hide_height="10" /> <!-- Standard values --> <button name="ShowButtonUp" x="42" y="42" /> - <button name="ShowButtonDown" x="5" y="5" /> + <button name="ShowButtonDown" x="0" y="0" /> <!-- Right --> <button name="ChatButton" x="5" y="5" /> <button name="SkillsButton" x="39" y="5" /> @@ -52,8 +52,8 @@ <bar width="500" height="36" min_w="360" min_h="30" /> <buttons width="34" height="34" hide_width="10" hide_height="10" /> <!-- Standard values --> - <button name="ShowButtonUp" x="5" y="5" /> - <button name="ShowButtonDown" x="5" y="5" /> + <button name="ShowButtonUp" x="0" y="0" /> + <button name="ShowButtonDown" x="0" y="0" /> <button name="ChatButton" x="19" y="1" /> <button name="SkillsButton" x="53" y="1" /> <button name="InventoryButton" x="87" y="1" /> Modified: personal/kougaro/data/gui/interact.xml =================================================================== --- personal/kougaro/data/gui/interact.xml 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/data/gui/interact.xml 2009-01-12 22:12:36 UTC (rev 2871) @@ -101,7 +101,7 @@ <bgimage resource="ButtonDivorce" /> </widget> - <widget name="ButtonPlayGame" factory="pawsButton" id="2000" tooltip="Play Game"> + <widget name="ButtonPlayGame" factory="pawsButton" id="2000" tooltip="Play/Solve"> <frame x="0" y="64" width="64" height="64" /> <bgimage resource="ButtonPush" /> </widget> Modified: personal/kougaro/data/help.xml =================================================================== --- personal/kougaro/data/help.xml 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/data/help.xml 2009-01-12 22:12:36 UTC (rev 2871) @@ -27,7 +27,7 @@ Ignores all communication from the target player in the Chat Window. Use this if people are rude to you and there is no GM around to kick them. You can use the same command to remove a player from your ignore list. -If you provide an add or remove flag it will try to set the ignore status accordly and won't toggle it. +If you provide an add or remove flag it will try to set the ignore status accordingly and won't toggle it. If no player name is provided it will show the ignore window.</topic> <topic name="/introduce">/introduce @@ -228,7 +228,7 @@ Challenge another player to a duel.</topic> <topic name="/game">/game -Starts a minigame session using the targetted game.</topic> +Starts a minigame session using the targeted game.</topic> <topic name="/loot">/loot Loots an available corpse if you have authority.</topic> @@ -415,8 +415,8 @@ Awards progression points to a player for the completion of a GM run event. (enter a negative value to take away PP)</topic> <topic name="/badtext">/badtext [first entry] [last entry] -Shows what was told to the targetted npc and couldn't be understand by it. -First and last entry must be defined and last entry must be greather than first entry. +Shows what was told to the targeted npc and couldn't be understand by it. +First and last entry must be defined and last entry must be greater than first entry. Example: /badtext 1 10 shows the latest 10 entries</topic> <topic name="/ban">/ban name minutes hours days reason OR /ban name reason @@ -672,7 +672,7 @@ Use /rain sector 0 0 0 or /rain sector off for ending the event. </topic> <topic name="/reload">/reload item -Reloads the currently targetted item from the database.</topic> +Reloads the currently targeted item from the database.</topic> <topic name="/runscript">/runscript [script_name] [me/target/eid/pid/area/name] Runs a progression script on the target.</topic> Modified: personal/kougaro/docs/compiling.html =================================================================== --- personal/kougaro/docs/compiling.html 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/docs/compiling.html 2009-01-12 22:12:36 UTC (rev 2871) @@ -2,7 +2,7 @@ <head> <title>PlaneShift Compiling Guide</title> -<meta name="copyright" content="© 2008 Atomic Blue"> +<meta name="copyright" content="© 2009 Atomic Blue"> <meta http-equiv="content-type" content="text/html"> <script type="text/javascript"> /* @@ -45,7 +45,7 @@ // An additional CS revision (CSrev_HEAD) may be specified for the latest version of PS. var CSrev = "31648"; // CS_SOURCE_REV var CAL3Drev = "507"; // CAL3D_SOURCE_REV - var CSrev_HEAD = "31684"; // CS_SOURCE_REV_HEAD + var CSrev_HEAD = "HEAD"; // CS_SOURCE_REV_HEAD var CAL3Drev_HEAD = "507"; // CAL3D_SOURCE_REV_HEAD var PSStable_Laanx = "2580"; //Last revision of ps stable that works with laanx var PSStable_latest = "2580"; //STABLE HEAD - Set this the same as PSStable_Laanx to hide revision info for stable @@ -640,7 +640,7 @@ <p>Note: This section is incomplete and untested, but contains the Debian specific build information that was previously in the manual.</p> <p>Due to the number of dependencies needed, if you wish to read the homepage listing, or dependency description please select Linux's generic dropdown selection.</p> - <p>via apt-get: <i class="command">#apt-get install jam svn build-essentials libfreetype6-dev libasound2-dev </i></p> + <p>via apt-get: <i class="command">#apt-get install jam subversion build-essential libfreetype6-dev libasound2-dev </i></p> <p>If you are using Debian testing (which uses X.Org), then you need xlibmesa-gl-dev instead of xlibmesa-glu-dev.</p> <p> @@ -652,7 +652,7 @@ They would conflict with the older versions flex-old, bison1.35 and automake1.8 needed to compile PlaneShift.</p> <p><i class="command">#apt-get install libtool bison-1.35 flex-old autoconf automake1.8</i></p> - <p><i class="command">#apt-get install libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng3-dev libjpeg62-dev python2.3-dev libspeex-dev</i></p> + <p><i class="command">#apt-get install libmng-dev libmikmod2-dev libogg-dev libvorbis-dev zlib1g-dev libpng3-dev libjpeg62-dev python2.4-dev libspeex-dev</i></p> <strong> BOTH of these above commands are assuming you do not need a server if you do please follow directions in the <a href="#mysql">mysql</a> section for installing other required packages</strong> </div> @@ -914,7 +914,7 @@ <h3>Updating Sources</h3> <p>From time to time, newer PlaneShift revisions will require you to upgrade your cal3d and CS repositories to a newer revision as well. To update your supporting libraries, always be certain that you use the "-r" option keep from updating to the latest revision:</p> - If you want to update to a new revision replace REVISON with the number of the revision you want to use: + If you want to update to a new revision replace REVISION with the number of the revision you want to use: <p><div class="commandBox"> $HOME/development/cal3d$ svn update -r REVISION<br> $HOME/development/cs$ svn update -r REVISION<br> @@ -1073,7 +1073,7 @@ <h3>Updating Sources</h3> <p>From time to time, newer PlaneShift revisions will require you to upgrade your cal3d and CS repositories to a newer revision as well. To update your supporting libraries, always be certain that you use the "-r" option keep from updating to the latest revision:</p> - If you want to update to a new revision replace REVISON with the number of the revision you want to use: + If you want to update to a new revision replace REVISION with the number of the revision you want to use: <p><div class="commandBox"> $HOME/development/cal3d$ svn update -r REVISION<br> $HOME/development/cs$ svn update -r REVISION<br> @@ -1547,7 +1547,9 @@ <div class="Linux"> <p><i class="command">$HOME/development/planeshift$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/art</i></p> </div> - +<div class="MacOSX"> +<p><i class="command">$HOME/development/planeshift$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/art</i></p> +</div> <div class="Windows"> <p><i class="command">https://planeshift.svn.sourceforge.net/svnroot/planeshift/art</i></p> </div> Modified: personal/kougaro/docs/history.txt =================================================================== --- personal/kougaro/docs/history.txt 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/docs/history.txt 2009-01-12 22:12:36 UTC (rev 2871) @@ -1,4 +1,61 @@ -*** 2009-01-03 by Stefano Angeleri +*** 2009-01-10 by Stefano Angeleri +- Ignoring quest prereqs when questtester is set +- Made an error message in crafting more visible + +*** 2009-01-07 by Steven Patrick +- Fixed FS#2458 : Make NPCs face player when talking, patch by kougaro. + +*** 2009-01-07 by Dave Bentham +- Improved some GUI texts for minigames to distnguish between games + and puzzles. + +*** 2009-01-07 by Stefano Angeleri +- Fixed NPC camera collision detection it was skipping the code acting + always as with collision detection disabled + +*** 2009-01-06 by Keith Fulton +- Changed sector specifier in npc_spawn_ranges table to be a FK directly + to the sectors table instead of a common string with the name of the sector + in the string. This is a tighter structure for this table. + DB VERSION BUMP. +- On a side note, Aiken has tested this functionality and it does work. + We should use it. +- Fixed crash if the speex plugin isn't available, which has the effect of the + file being found but the data still unable to be loaded (crashes the client). +- Fixed crash in npc /give check for frozen targetClient +- Now quests break up dialog into different say commands, one sentence at a time. + The objective of this is to make the chat (and chat bubbles) more readable and + give better pacing with the eventual audio files. + +*** 2009-01-06 by Dave Bentham +- Progression scripts can be kicked by mini-games when won, by adding + script='prog_script_name' to the action_location. In script terms, the + winner = actor, loser = target. + +*** 2009-01-06 by Stefano Angeleri +- Fixed FS#1548 - Battle Helms can be equipped in hands. + The code replaced $H (which is used only for replacements for helms + and most probably was intended so) only in case the helm was in the + helm slot making it impossible to get the right mesh if you hold + it in the hands for example. Also removed the definition of a psstring + to use replaceallsubstring as the replaceall in crystal space csstring + does already what's needed avoiding useless assignments and conversions + +*** 2009-01-05 by Keith Fulton +- Now Paladin detects speed hacks and kicks you off the server if you run too quickly + for more than a few seconds. Needs to be tested more by the Testing team if + possible for false positives mostly. +- New fixed version doesn't hardcode max speed to always be 1. :) + + +*** 2009-01-04 by Stefano Angeleri +- Changed cordinates of the hide/show button in order to make it not + move around when clicked (except style 2) +- Disabled Style change if the toolbar is hidden +- Added some descriptive tooltip on the hide/show button +- Fix for FS#673 - trias in skills panel not updated patch by kougaro + +*** 2009-01-03 by Stefano Angeleri - Lowered access level of /killnpc to gm2 - Added /assignfaction [target] [factioname] value for gm4+ It allows to assign relative factions to targets Copied: personal/kougaro/docs/todo.txt (from rev 2870, trunk/docs/todo.txt) =================================================================== --- personal/kougaro/docs/todo.txt (rev 0) +++ personal/kougaro/docs/todo.txt 2009-01-12 22:12:36 UTC (rev 2871) @@ -0,0 +1,31 @@ +This file contains detailed To Do's for the engine team or prospects looking to help. +Put an X in between the brackets as you commit one of these items or a patch for one of these items. + + +PAWS enhancements / Fixes +------------------------- +[ ] Add support for pawsBorder to buttons and other widgets +[ ] Make a new type of pawsBorder which has only left->middle tiled->right images (3 images) +[ ] Make buttons support Up, Down, Up with mouseover, Down with mouseover, Disabled Up and Disabled Down in 6 border references +[ ] Make the font definition hierarchical, so that each child inherits the font from the parent without needing it specified over and over. +[ ] Extend an image resource to be a subrectangle from an image file, so that a single image file can contain many resources +[ ] Fix multiline edit textboxes to wordwrap correctly long lines without spaces + +Paladin Fixes +------------- +The following give false positives in PaladinJr when performed by a player validly. Fix: +[ ] Move then teleport +[ ] Teleport then move +[ ] Move then slide +[ ] Slide then move +[ ] Move and use an AL that teleports you to the same sector +[ ] Fall off a map + +NPC Interaction +--------------- +[ ] Fix npc chat bubbles displaying +[ ] Do the question popup widget +[ ] Make the camera look from person to person when talking and fixate on the player when NPC response is complete +[ ] Make Option GUI for enabling/disabling voice audio +[ ] Make Option GUI for making bubbles disappear slower/faster +[ ] Make a way for players to skip a bubble and cut off audio by clicking the bubble. Deleted: personal/kougaro/lang/1337/data/help.xml =================================================================== --- trunk/lang/1337/data/help.xml 2009-01-12 21:06:27 UTC (rev 2870) +++ personal/kougaro/lang/1337/data/help.xml 2009-01-12 22:12:36 UTC (rev 2871) @@ -1,817 +0,0 @@ -<?xml version="1.0"?> -<help> - <branch name="Chat Commands"> -Commands used to talk. You can also specify your chat method by simply typing into that method's tab. - <topic name="/away">/away message - -Sets an auto-reply message if people send you tells and you are going to be away from your keyboard but still logged in. ('/away off' will disable auto-reply).</topic> - <topic name="/auction">/auction description - -Put an item up for sale or offer to buy something.</topic> - <topic name="/clear">/clear - -Clears the history of the Chat Window.</topic> - <topic name="/emote">/emote [emotename|list] - -Returns the emote list with list or sends an emote with name emotename.</topic> - <topic name="/greet">/greet - -Wave hello to your friends.</topic> - <topic name="/group">/group message - -Talk to your group privately. This is good when your group is farther than 10 meters apart and lets you avoid shouting.</topic> - <topic name="/guild">/guild message - -Talk to everyone in your guild privately. Only guild members in the same guild as you can see what you write.</topic> - <topic name="/ignore">/ignore [player] [add|remove] - -Ignores all communication from the target player in the Chat Window. Use this if people are rude to you and there is no GM around to kick them. -You can use the same command to remove a player from your ignore list. -If you provide an add or remove flag it will try to set the ignore status accordingly and won't toggle it. -If no player name is provided it will show the ignore window.</topic> - <topic name="/introduce">/introduce - -Introduce yourself to the targeted player, or everyone within 10 meters if you haven't targeted anyone.</topic> - <topic name="/me">/me action - -Perform an action seen by people in your vicinity (within 10 meters). This is a great roleplaying tool when you want your character to do something not directly supported by the game. -You can also use /my to describe yourself. Both these commands work in the tell, group and guild tabs as well.</topic> - <topic name="/mypet">/mypet action - -Have your pet perform an action seen by those in its vicinity (within 10 meters). This is a great roleplaying tool when you want your pet to do something not directly supported by the game. You can also use "/mypet 's property" to describe your pet, similar to the /my command.</topic> - <topic name="/report">/report player - -Makes the server log everything the indicated player says for 5 minutes. -Use this when a player is rude, cheating or grifting so the GMs and Devs can later review the log and find a proof for the -misbehaviour.</topic> - <topic name="/say">/say message - -Talk to the people in your immediate vicinity (within 10 meters). This should be your normal way of talking most of the time.</topic> - <topic name="/shout">/shout message - -Talk to people within 100 meters of you. Only use /shout in emergencies.</topic> - <topic name="/tell">/tell player message - -Talk to someone privately. With this command you can send text only the person you specify can see.</topic> - <topic name="/tellnpc">/tellnpc message - -Talk to the currently targeted npc.</topic> - <topic name="/npcmenu">/npcmenu - -Shows a menu to talk to npcs where available.</topic> - </branch> - <branch name="User Commands"> -Commands to control various player actions. Many of these are also available via windows and context menus. - <topic name="/advice">/advice player message - -Use this command if you are an advisor to send a reply to a player. eg. /advice Eliandrus Middle click on a monster and then press Attack in your Shortcut Window.</topic> - <topic name="/advisor">/advisor [list|requests|sessions|on|off] - -This is a command which brings the advisor various tools and has a different behaviour depending of the command argument: - -If run with no parameters, will indicate your current advisor status. - -on and off changes your advisor mode. if you make yourself an advisor, other players will be able to contact you using the /help for help. - -list returns how many advisors are online at the moment. - -requests, if you are an advisor, lists all currently unanswered questions. - -sessions, if you are an advisor, lists all the advice sessions currently assigned to you.</topic> - <topic name="/bank">/bank [personal|guild] - -Select a banker npc and use this command to access your bank account, either personal or guild. The money tab will allow you to deposit, withdraw and exchange your coins. -Move your mouse over each number to get a tooltip explaining what it means.</topic> - <topic name="/buddy">/buddy [player] [add|remove] - -Adds/remove the named player to/from your buddy list. You are automatically notified when people from your buddy list go online/offline, and it is easy to send them tells from the Buddy window. -If you don't provide the add/remove argument the player will be added or removed depending if it's already or it isn't in the buddy list. -If you don't provide a player name this command will open the buddy window.</topic> - <topic name="/buy">/buy merchant - -Buy from specified merchant. If no merchant specified, buy from current target.</topic> - <topic name="/combine">/combine - -Combines items in a container.</topic> - <topic name="/dequip">/dequip item_name|slot_name - -Unequips the specified item or slot. This is equivalent to moving equipped items back into your inventory in your Inventory Window. -Slot Names: righthand, lefthand, helm, legs, boots, bracers, torso, gloves, neck, rightfinger, leftfinger, belt, arms, back</topic> - <topic name="/die">/die - -Use to commit suicide, for example when /unstick does not get you free.</topic> - <topic name="/dig">/dig for resource - -Mine for natural resources in the ground. For example: /dig for gold. Some locations are better than others for digging, and how well you do depends on where you are, your skill and your tools.</topic> - <topic name="/drop">/drop [quantity|all] (any) (noguard) (inplace) item_name - -Drop the specified quantity of a certain item from your inventory. example : /drop 15 apple -"all" will try and drop all items of this kind available, in the limit of 65 items. -The "any" flag allows the function to search for items in containers. -The "noguard" flag allows you to drop unguarded items. -The "inplace" flag allows you to drop items at your current position.</topic> - <topic name="/equip">/equip quantity item_name - -Equips the specified quantity of a certain item. This is equivalent to equipping items in your Inventory Window.</topic> - <topic name="/fish">/fish - -See /dig.</topic> - <topic name="/give">/give - -Give items to current Target NPC.</topic> - <topic name="/guard">/guard [target] [off] - -This command allows you to unguard an item actually guarded by you. Most probably you will need to use this command without any parameter after targetting the item you want to unguard.</topic> - <topic name="/help">/help message - -Ask one of the advisors a question. eg. /help How do I attack something?. Anything you type in the Help channel of the Chat Window will be sent as an advice request automatically.</topic> - <branch name="/pet"> Control your pet(s). -/pet [petname,] assist -/pet [petname,] attack -/pet [petname,] dismiss -/pet [petname,] follow -/pet [petname,] name -/pet [petname,] guard -/pet [petname,] stay -/pet [petname,] summon -/pet [petname,] target - <topic name="/pet assist">/pet [petname,] assist -</topic> - <topic name="/pet attack">/pet [petname,] attack -</topic> - <topic name="/pet dismiss">/pet [petname,] dismiss -</topic> - <topic name="/pet follow">/pet [petname,] follow -</topic> - <topic name="/pet name">/pet [petname,] name <newname> - -Give your pet a new name.</topic> - <topic name="/pet guard">/pet [petname,] guard -</topic> - <topic name="/pet stay">/pet [petname,] stay -</topic> - <topic name="/pet summon">/pet [petname,] summon -</topic> - <topic name="/pet target">/pet [petname,] target [<Name>|me|pid:<PID>|eid:<EID>] - -Set the target for your pet. If no target is given use your target. You will be the target for option me. pid: will target -the actor with the given pid.</topic> - </branch> - <topic name="/petition">/petition request - -Submits a petition to the GMs for a feature or bug fix.</topic> - <topic name="/picklock">/picklock - -Attempts to pick a lock.</topic> - <topic name="/pickup">/pickup - -Pickup the targeted item.</topic> - <topic name="/pos">/pos - -Shows your current location in the 3D world. (Debug purposes only.)</topic> - <topic name="/repair">/repair [slot name] - -Begins a repair on the item in the specified slot. Default slot is righthand - -Slot Names: righthand, lefthand, helm, legs, boots, bracers, torso, gloves, neck, rightfinger, leftfinger, belt, arms, back -</topic> - <topic name="/roll">/roll times sides target - -Rolls a certain number of dice with the specified sides and gives the answer. Example: "/roll 2 6" rolls 2 6-sided dice. If target is defined it will only announce the number of dice which got a number higher than the specified one. Example: "/roll 2 6 3" rolls a 2 6-sided dice and tells how many of them got a 3 or an higher number. Use this to invent your own gambling games.</topic> - <topic name="/sell">/sell merchant - -Sell to specified merchant. If no merchant specified, sell to current target.</topic> - <topic name="/show">/show - -Opens or closes the named window. Valid targets are: skills, spells, inv, help, buddy, info, petition, quest, shortcut, group, guild, glyph, bag, chat, activemagic</topic> - <topic name="/sit">/sit - -Makes you sit down.</topic> - <topic name="/stand">/stand - -Makes you stand up.</topic> - <topic name="/starttrading">/starttrading - -You are ready to trade.</topic> - <topic name="/stoptrading">/stoptrading - -Prevent anyone from trading with you.</topic> - <topic name="/trade">/trade - -Start a trade with current Target player.</topic> - <topic name="/train">/train - -Start a training session with a trainer target.</topic> - <topic name="/unstick">/unstick - -Moves you to your last known valid location. Should be used when you are stuck in geometry. If a valid location cannot be found you will be sent to the death realm.</topic> - <topic name="/use">/use - -Uses the targeted item.</topic> - <topic name="/who">/who filter - -Lists players currently online matching filter. If no filter is specified, then all online players are listed.</topic> - </branch> - <branch name="Combat & Target Commands"> -Commands used to manually control combat and the targeting system. Attacking is normally done via the context menu or the info window's stance buttons. Some commands like /cast and /target are useful for creating shortcuts to more easily perform certain actions. - <topic name="/assist">/assist player - -Make the specified player's target your own.</topic> - <topic name="/attack">/attack [bloody|aggressive|normal|defensive|fullydefensive] - -Attack the targeted character. Normal stance will be used if none is specified. Bloody stance will increase the attack damage, but reduce the defense, fullydefensive does the opposite, and the other stances range between.</topic> - <topic name="/cast">/cast spell_name - -Start casting spell.</topic> - <topic name="/challenge">/challenge - -Challenge another player to a duel.</topic> - <topic name="/game">/game - -Starts a minigame session using the targeted game.</topic> - <topic name="/loot">/loot - -Loots an available corpse if you have authority.</topic> - <topic name="/stopattack">/stopattack - -Stops attacking.</topic> - <topic name="/target">/target [next|prev] [npc|pc|item|any|clear OR a player name] - -Searches for a target that matches the parameters. With no parameters targets yourself. You may search for an NPC, PC (player), or item. 'Any' will find anything to target, and 'clear' will deselect your target. You may also specify your target by entering the player's name. You may optionally specify the direction with 'next' (default) or 'prev', for searching outwards or inwards from your location. - -Examples: "/target Bob" will target the player named Bob. "/target prev npc" will target the next closest NPC from the one you already have selected.</topic> - <topic name="/targetinfo">/targetinfo target - -Displays more info about the target.</topic> - <topic name="/targetcontext">/targetcontext - -Displays the options for interacting with the target item. The same as what is normally the right click menu.</topic> - <topic name="/yield">/yield - -Surrender to a dueling player.</topic> - </branch> - <branch name="Group Commands"> -Commands used to give additional control over a player group. - <topic name="/confirmgroupjoin">/confirmgroupjoin - -Accept an invitation to join a group</topic> - <topic name="/disband">/disband - -If specified by group leader, the group is disbanded.</topic> - <topic name="/groupremove">/groupremove player - -Allows the group leader to remove a player from the group.</topic> - <topic name="/groupmembers">/groupmembers - -Lists all group members.</topic> - <topic name="/invite">/invite player - -Invites the named player to join the leader's group.</topic> - <topic name="/leavegroup">/leavegroup - -You leave your current group.</topic> - </branch> - <branch name="Guild Commands"> -Commands used to perform guild actions, many of which are available via the guild window. - <topic name="/endguild">/endguild - -Disbands your guild.</topic> - <topic name="/guildinfo">/guildinfo - -Opens the Guild Window.</topic> - <topic name="/guildinvite">/guildinvite player - -Invites the named player to join your guild.</topic> - <topic name="/guildlevel">/guildlevel level name - -Names the level # as the specified name for your guild.</topic> - <topic name="/guildmembers">/guildmembers level - -Lists all guild members, filtered by level if specified.</topic> - <topic name="/guildmotd">/guildmotd message - -Sets/views the guild's MOTD.</topic> - <topic name="/guildname">/guildname guild_name - -Changes name of your guild to the new guild name.</topic> - <topic name="/guildpoints">/guildpoints guild_name - -Shows karma points of named guild.</topic> - <topic name="/guildpromote">/guildpromote player level - -Sets the named player to specified level in your guild.</topic> - <topic name="/guildremove">/guildremove player - -Removes the named player from your guild.</topic> - <topic name="/guildsecret">/guildsecret on|off - -Toggles the guild secrecy flag. If called without an argument, it shows the current value of the secrecy flag.</topic> - <topic name="/guildsymbol">/guildsymbol symbol_name - -Sets your guild symbol to the named symbol.</topic> - <topic name="/guildwar">/guildwar guild_name - -Invites another guild (the target's guild) to start a guild war.</topic> - <topic name="/guildweb">/guildweb URL - -Sets URL of guild web page.</topic> - <topic name="/guildyield">/guildyield guild_name - -Surrenders to the target's guild to end a guild war.</topic> - <topic name="/newguild">/newguild guild_name - -This creates a new guild with the specified name and you as leader.</topic> - </branch> - <branch name="Alliance Commands"> -Commands used to create and maintain guild alliances. - <topic name="/allianceinvite">/allianceinvite leader_name - -Invites leader of another guild to your guild alliance.</topic> - <topic name="/allianceleader">/allianceleader guild_name - -Hands over alliance leadership to another guild.</topic> - <topic name="/allianceleave">/allianceleave - -Leave your guild alliance.</topic> - <topic name="/allianceremove">/allianceremove guild_name - -Removes a guild from your guild alliance.</topic> - <topic name="/endalliance">/endalliance - -Disband your guild alliance.</topic> - <topic name="/newalliance">/newalliance alliance_name - -Creates new alliance of guilds.</topic> - </branch> - <branch name="Utility Commands"> -Additional commands used for other game functions. - <topic name="/confirm">/confirm message yes_command no_command - -This shows a confirmation box that displays the message and Yes and No buttons. On pressing Yes, the yes_command is executed and on pressing No, the no_command is executed.</topic> - <topic name="/echo">/echo message - -This repeats the message in the Chat Window without sending it to anyone else.</topic> - <topic name="/graphicbug">/graphicbug - -Saves a graphic report that you can mail to a developer.</topic> - <topic name="/motd">/motd - -Requests the MOTD from the server.</topic> - <topic name="/ping">/ping - -Shows your average ping to the server.</topic> - <topic name="/repaintlabels">/repaintlabels - -Will redraw corrupted labels. "/repaintlabels force" can be used if the regular command doesn't work.</topic> - <topic name="/quit [now]">/quit - -This exits you from the game. With the "now" option exits without asking.</topic> - <topic name="/screenshot">/screenshot [options] - -Takes a screenshot and saves it in a folder named "screenshots" in your PlaneShift directory. The "nogui" option can be used to ignore the onscreen windows and control bar, and the "lossless" option can be used to save without compression to PNG instead of JPG.</topic> - <topic name="/testanim">/testanim [name] [fade in] [fade out] - -Allows to test an animation. No one will be able to see it except you. Name is the name of the animation, fade in and fade out define the fade time for the animation.</topic> - <topic name="/tip">/tip - -Requests a tip from the server.</topic> - </branch> - <branch name="GM Commands" level="1"> -Commands available to game master level characters. Note that this is a full list of abilities, and not all access groups have everything listed here. - <branch name="General Syntax"> -Commands which act on a target all use the same system. A number of keywords and features are available to make specifying the target easier and more flexible. - <topic name="area">area syntax: 'area:[type]:range' - -Used run a command on all entities of a specific type within a range. (crosses portals; range doesn't include yourself) Available types are players (default), actors, npcs, items, and entities. (no spaces before/after colons) Note that this is a very powerful feature; be careful! Examples: "/info area:entities:30" lists info on everything within 30m, "/modify area:items:10 remove" deletes all litter within 10m, "/teleport area:players:5 hydlaa_plaza" teleports you and all players within 5m to the plaza</topic> - <topic name="here">keyword 'here' - -Used to specify your current sector for sector based commands. Also may be used as a destination for /teleport to indicate your exact location. Examples: "/thunder here", "/teleport target here"</topic> - <topic name="IDs">ID syntax: 'pid:#' and 'eid:#' - -Targets and destinations may be specified by either player/character ID (PID) or entity ID (EID). (no spaces before/after colon) IDs may be obtained via the /info command. Note that while PIDs do not change, EIDs do. Example: "/teleport eid:42 here"</topic> - <topic name="names"> - -Targets and destinations with more than one word in them must be specified using quotes, for most commands. Full names must be used for NPCs and items; only first names are needed for players. In the case of non-unique names, it will simply use the first it finds. Example: /teleport me "Grok Idon"</topic> - <topic name="me">keyword 'me' - -Used to target yourself for a command. Example: "/slide me F"</topic> - <topic name="target">keyword 'target' - -Used to act on your currently selected entity with a command. In commands that only need one parameter, this keyword is implicit. Also supported as a destination for /teleport. Example: "/mute target" or simply "/mute"</topic> - </branch> - <topic name="/action">Action location commands. -To create a new action location entrance: -/action create_entrance [sector_name] [description]</topic> - <topic name="/admin">/admin - -Resets your admin level. Lists and allows you to use various GM/admin commands.</topic> - <topic name="/assignfaction"> /assignfaction [me/target/eid/pid/area/name] [factionname] [points] - -Awards the player of a positive or negative faction points for a particular faction. -factionname is the name of the faction of which the player is being changed -points can be negative or positive and it's relative to the current player faction points</topic> - <topic name="/awardexp">/awardexp target value - -Awards progression points to a player for the completion of a GM run event. (enter a negative value to take away PP)</topic> - <topic name="/badtext">/badtext [first entry] [last entry] - -Shows what was told to the targeted npc and couldn't be understand by it. -First and last entry must be defined and last entry must be greater than first entry. -Example: /badtext 1 10 shows the latest 10 entries</topic> - <topic name="/ban">/ban name minutes hours days reason -OR /ban name reason - -Bans a player from logging into the game for a specified amount of time. (default is 1 year) 'Name' may be a character name, an account name, or an account number. A reason must be specified.</topic> - <topic name="/banadvisor">/banadvisor name - -Bans a player from advising until /unbanadvisor is used.</topic> - <topic name="/banname">/banname name - -Bans a name from use in character creation</topic> - <topic name="/changeguildleader">/changeguildleader [new leader] [guildname] - -Change the guilds leader.</topic> - <topic name="/changeguildname">/changeguildname - -Change the selected guilds name.</topic> - <topic name="/changename">/changename [me/target/eid/pid/area/old name] [force|forceall] new name [new lastname] - -Changes the player's name. If force is given, the lastname doesn't have to be unique. If forceall is given name and lastname doesn't have to be unique. If the lastname is not given the lastname will be preseved. If no is given as lastname, the lastname will be removed.</topic> - <topic name="/charlist">/charlist [me/target/eid/pid/area/name] - -Informs the GM of the IDs and names of all characters on the same account as the account of the given character.</topic> - <topic name="/checkitem">/checkitem [target] [quantity|''] [item|tria] - -Commands used to check the presence of an item in another character. Example: "/checkitem Bob 42 tria"</topic> - <topic name="/crystal">/crystal [interval] [max random interval modifier] [amount] [range] [item] - -Create a new hunt location which spawns an item in interval + random secs up to a max of amount within the range. -Notice: The intervals are in seconds, not milliseconds</topic> - <topic name="/death">/death name - -Kills something.</topic> - <topic name="/deletechar">/deletechar [character name] [petitioner name] -OR /deletechar pid:# - -Deletes a character on the same account as the specified petitioner's. (petition fraud check) A player or NPC may also be specified by player ID. (no checks done for players; unique/master NPCs may not be deleted by this method)</topic> - <topic name="/deputize">/deputize player level - -Temporarily changes a character's access level. Used to give GMs abilities needed for special instances, or to temporarily add a player to a testers group. May also be used to demote yourself to a player's status for testing. (temp level expires on logout, and may be reset by anyone via "/deputize me reset")</topic> - <topic name="/divorce">/divorce name - -Divorce a character from another one if they are married.</topic> - <topic name="/disablequest">/disablequest questname [save] - -This function will toggle the quest from enabled to disabled status and viceversa, if the save flag is used the new status will also be saved in the database.</topic> - <topic name="/event">Administer events. -To create a new event, a GM should enter: -/event create [name] [description] - -To register all players in range, or a player by name, the GM should enter (note, [player] can be by name, or by target): -/event register [range 0-100 | player] - -The GM can remove a player from a current event by (note, [player] can be by name, or by target): -/event remove [player] - -When an event is complete, the GM should enter: -/event complete - -To reward the participants (all of them, those within a specified range or an individual - by name or by target) of a current event: -/event reward [range 0-100 | all | player] # [item name] -[item name] can be "exp" (experience) where # Progression Points are awarded. -[item name] can be "faction [faction name]" to adjust the faction standing. - -If a GM wants to assume control of an ongoing event, because the original GM character has been deleted, or has abandoned it and is offline, the GM can enter: -/event control [name] - -A completed event can be totally discarded by a GM; either by using the 'Discard' button in the Quest/Event Notebook, or by the following command. A GM can discard a completed event of another GM as long as that GM is offline at the time. NOTE: the event will be totally erased from the game and cannot be undone. -/event discard [name]</topic> - <topic name="/freeze">/freeze player - -Prevents a player from moving or using any commands until they quit/relog.</topic> - <topic name="/fog"> /fog sector [density [[r g b] fade]|stop] - -It creates fog effect in a specific sector, with a specific density, the rgb values of the effect and its fading -value (in milliseconds). -With specified sector, it starts fog with default values: density 200, fade 10 sec, soft white (r 200, g 200, w 200). -Use /fog sector off or /fog sector -1 for resetting. </topic> - <topic name="/giveitem">/giveitem [target] [quantity|'all'|''] [item|tria] - -Commands used to transfer an item from you to another character. Example: "/giveitem Bob Apple"</topic> - <topic name="/guard">/guard [target] [off] - -This command allows you to guard or unguard any item in the world. You just have to provide a target (which can be an area, an eid of the currently selected target. If no other parameter is provided it will toggle guard status on the item. -NOTE: If you make an item guarded you will be the one guarding it.</topic> - <topic name="/impersonate">/impersonate name command message - -Talk as if you are 'name'. Command can be say, shout, or worldshout. If you use the keyword 'text' for name it will produce a message similar to /me within the command's range.</topic> - <topic name="/info">/info target - -Reports available information on an object/NPC/player (may be offline): player ID from the database, account ID, IP address, total time connected, and item flags/spawn info. Use this for bug reports about any stuck/glitched item/NPC/player.</topic> - <topic name="/inspect">/inspect target - -Prints the inventory of the specified NPC or player.</topic> - <topic name="/item">/item name [random|quality value] - -Creates a new object from the named item at your current location. With no name specified, it opens the item spawn GUI.</topic> - <topic name="/key">Administrator key commands. -To change the lock on a the targeted item. This removes ability to unlock target from all keys: -/key changelock - -Make a key out of item in right hand: -/key make - -Copy key item in hand: -/key copy - -Clear all locks the key in hand can open: -/key clearlocks - -Add to the key in hand the ability to lock targeted item: -/key addlock - -Remove from the key in hand the ability to lock targeted item: -/key removelock - -Take the key in hand and make or unmake it into a skeleton key that will open any lock, if you have a security level greater than 'player': -/key skel</topic> - <topic name="/kick">/kick name reason - -Kicks the named player off of the server.</topic> - <topic name="/killnpc">/killnpc name reload - -Kills the targeted NPC, using the current target if no name is given. The reload option recreates the NPC with stats and triggers from the DB.</topic> - <topic name="/listwarnings">/listwarnings [me/target/eid/pid/area/name] -List all warnings given to the targeted account.</topic> - <topic name="/managepetitions">/managepetitions - -Manage petitions to help users.</topic> - <topic name="/marriageinfo">/marriageinfo [me/target/eid/pid/area/name] - -View the details of a characters marriage.</topic> - <topic name="/modify">/modify [target OR eid:#] [action] [setting(s)] - -Alters the settings for an item. Allowed actions: - -'intervals' followed by 2 integer values for the interval and max modifier for spawning this item (must already spawn) - -'amount' followed by an integer for the amount of items to spawned (must already spawn) - -'range' followed by the range in which the items should spawn (must already spawn) - -'remove' deletes this item and its spawn if it has one - -'pickskill' followed by the name of a skill allows to change the skill required to pick the lock of the item. Use none to remove it. - -'picklevel' followed by the level required of the currently set skill in order to be able to pick the lock of the item - -'pickupable' followed by 'true' or 'false' sets the pickupable flag - -'unpickable' followed by 'true' or 'false' sets the unpickable flag - -'transient' followed by 'true or 'false' sets the transient flag (transient items auto-delete in ~3 hours) - -'npcowned' followed by 'true' or 'false' sets the npcowned flag - -'move' followed by x, y, z and optionally y-rotation coordinates - -'collide' - enable/disable collision detection for that item.</topic> - <topic name="/money">/money [circles|hexas|octas|trias] [random|quantity value] - -Will spawn the specified amount of money items to your inventory. Use random to spawn a random amount of money. -Example: "/money trias 10" will spawn 10 trias to your inventory.</topic> - <topic name="/morph">/morph [player] [mesh name] - -Changes the model used for a player until logout. Use 'reset' in place of the mesh name to reset the mesh. Do "/morph list" to see the full list of available meshes.</topic> - <topic name="/mute">/mute player - -Mutes the named player until they log back in to this server.</topic> - <topic name="/npc">/npc [master npc name] - -Creates a clone of the named NPC at your current location.</topic> - <branch name="/path">Online edit of paths - -/path adjust -/path alias -/path display|show -/path format -/path hide -/path help -/path info -/path point -/path remove -/path rename -/path select -/path split -/path start -/path stop|end - -To create a path you need to do the following commands: -1) /path format <format> -2) /path start -3) /path point (Any number of times) -4) /path stop - <topic name="/path adjust">/path adjust [<radius>] - -Adjust the position of the nearest path point to your current position.</topic> - <topic name="/path alias">/path alias [*add|remove] [<alias>] - -Add or remove a alias to/from the nearest waypoint. The default is add if neither add or remove is specified.</topic> - <topic name="/path display|show">/path display|show [Points|Waypoints] - -Display all waypoints and points unless either points or waypoints is specefied. In that case only points or waypoints are displayed.</topic> - <topic name="/path format">/path format <format> [first] - -Set up the format to be used for waypoint name when creating new waypoints. Use /path format wp%03d 10 to create waypoints with name wp010, wp011,... First waypoint will be added when /path start is used in an location where there are no waypoint from before.</topic> - <topic name="/path help">/path help [sub command] - -Display a short summary of commands or detailed syntax for a sub command if given.</topic> - <topic name="/path hide">/path hide [Points|Waypoints] - -Hide all points. If waypoints or points are specified only either points or waypoints are hidden.</topic> - <topic name="/path info">/path info - -Show info about the nearest path or waypoint.</topic> - <topic name="/path point">/path point - -Add a new point to the current selected path at your position. A path will be automaticaly be selected on the /path start command. You could use the /path select command as well to select a new path.</topic> - <topic name="/path remove">/path remove [<radius>] - -Remove the nearest path. Use /path info to view information about the path that will be deleted.</topic> - <topic name="/path rename">/path rename [<radius>] <name> - -Rename the nearest waypoint or path. Use /path info to view information about the path that will be renamed. If both a path and a waypoint is inn range the waypoint will be the target.</topic> - <topic name="/path select">/path select <radius> - -Select the nearest path to be your current path. You need a select path to use /path point.</topic> - <topic name="/path split">/path split <radius> [WP flags] - -Split a path into two paths inserting a new waypoint with name according to whats set with /path format.</topic> - <topic name="/path start">/path start <radius> [WP flags] [Path flags] - -Start a new path. If there are a waypoint nearby the waypoint is used to start the path. Otherwise a new waypoint is created.</topic> - <topic name="/path stop|end">/path stop|end <radius> [WP flags] - -Stop the current path. If there are a waypoint nearby the waypoint is used to end the path. Otherwise a new aypoint is created.</topic> - </branch> - <topic name="/pickup">/pickup [eid/area] - -GM have an enhaced version of /pickup which supports also eid and area arguments.</topic> - <topic name="/pos">/pos target - -GMs have an enhanced version of the /pos command which shows your current region and the direction you are facing. It also has an optional parameter to get the position of another entity. (may specify by name or an ID)</topic> - <topic name="/quest">/quest [me/target/eid/pid/area/name] [list|discard|complete|assign] - -Manage completion of quests for the targeted player, or your own if you aren't targeting anyone. Use /quest [target] to list quest completion status, and /quest target assign|discard|complete (quest name) to change it.</topic> - <topic name="/rain"> /rain sector [drops [length [fade]]|stop] - -It creates rain effect in a specific sector, with a specific number of drops, the length of the effect (in milliseconds) and its fading -value (in milliseconds). -With specified sector, it starts rain with default values: density 4000 drops, length 10 minutes and 10 seconds of fade. -The maximum number of drops allowed is 8000. -Use /rain sector 0 0 0 or /rain sector off for ending the event. </topic> -<topic name="/reload">/reload item - -Reloads the currently targeted item from the database.</topic> -<topic name="/runscript">/runscript [script_name] [me/target/eid/pid/area/name] - -Runs a progression script on the target.</topic> - <topic name="/set">/set attribute on|off - -Set a GM attribute on or off. Available flags are: invincible, invisible, viewall (see invisibles), nevertired, nofalldamage, infiniteinventory, questtester (bypass quest lockouts). Many of these features are enabled by default for GMs. You can also do "/set list" to view your current attributes.</topic> -<topic name="/setlabelcolor">/setlabelcolor [target] [npc|player|tester|gm|gm1|dead|alive|normal] - -Set the color of the label of target to the given value. The normal setting will again display the targets normal label color.</topic> - <topic name="/setitemname">/setitemname [target/eid/area/original name] [name] [description] - -Allows changing the name and description of the targeted item. Description is optional.</topic> - <topic name="/setquality">/setquality [target/eid/area/name] [quality] [max quality] - -Allows changing the quality of the targeted item. Max quality is optional.</topic> - <topic name="/setskill">/setskill [target] [skill|'all'] [value|-1] - -Set one of your or target's skills or stats to a specific value. Use 'all' as the name to set all skills and stats to the given value. Use -1 for value if you would like to view the current value of a skill or stat. If no value is given 100 will be used as default.</topic> - <topic name="/setstackable">/setstackable [on|off|reset|info] - -Enables or disables the ability to stack the targeted item. Info will give the current status of this flag. Reset returns the item to the default stack mode for the item.</topic> - <topic name="/settrait">/settrait [[target] [trait] | list [race] [gender]] - -Allows changing the traits of a character. -Use "/settrait list [race] [gender]" to list all available traits for given race and gender. -Note: The adequate gender for Krans is "none".</topic> - - <topic name="/show gm">/show gm - -Shows the GM GUI, a window with a player list and quick access to many commands.</topic> - <topic name="/slide">/slide target direction distance - -Slides the target object/NPC/player in the direction specified (L,R,F,B,U,D,T). Moves one space or the distance specified. The "direction" 'T' turns the target. (in degrees; default is 90)</topic> - <topic name="/snow">/snow sector [flakes [length [fade]]|stop] - -It creates snow effect in a specific sector, with a specific number of flakes, the length of the effect (in milliseconds) and its fading -value (in milliseconds). -With specified sector, it starts snow with default values: density 4000 flakes, length 10 minutes and 10 seconds of fade. -The maximum number of flakes allowed is 8000. -Use /snow sector 0 or /snow sector off for ending the event.</topic> - <topic name="/takeitem">/takeitem [target] [quantity|'all'|''] [item|tria] - -Command used to transfer an item to you from another character. Example: "/takeitem target 3 Sabre"</topic> - <topic name="/teleport">/teleport <subject> <destination> - -Move the subject to the given destination. - -Subject might be one of the following: -me - Subject is you -target - Subject... [truncated message content] |
From: <ko...@us...> - 2009-02-04 04:59:15
|
Revision: 2973 http://planeshift.svn.sourceforge.net/planeshift/?rev=2973&view=rev Author: kougaro Date: 2009-02-04 04:59:09 +0000 (Wed, 04 Feb 2009) Log Message: ----------- merged r2872-2972 from trunk Modified Paths: -------------- personal/kougaro/data/gui/chardescwindow.xml personal/kougaro/data/gui/configchatbubbles.xml personal/kougaro/data/gui/ok.xml personal/kougaro/data/gui/quitinfo.xml personal/kougaro/data/gui/shortcutwindow.xml personal/kougaro/data/gui/styles.xml personal/kougaro/data/gui/yesno.xml personal/kougaro/data/help.xml personal/kougaro/data/options/chatbubbles_def.xml personal/kougaro/docs/compiling.html personal/kougaro/docs/history.txt personal/kougaro/docs/todo.txt personal/kougaro/lang/1337/data/help.xml personal/kougaro/lang/cesky/data/help.xml personal/kougaro/lang/deutsch/data/help.xml personal/kougaro/lang/french/data/help.xml personal/kougaro/lang/italian/data/help.xml personal/kougaro/lang/italian/stringtable.xml personal/kougaro/pslaunch.cfg personal/kougaro/src/client/chatbubbles.cpp personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/gui/pawscharcreatemain.cpp personal/kougaro/src/client/gui/pawscharcreatemain.h personal/kougaro/src/client/gui/pawschardescription.cpp personal/kougaro/src/client/gui/pawschardescription.h personal/kougaro/src/client/gui/pawsconfigchatbubbles.cpp personal/kougaro/src/client/gui/pawsdetailwindow.cpp personal/kougaro/src/client/gui/pawsgameboard.cpp personal/kougaro/src/client/gui/pawsgameboard.h personal/kougaro/src/client/gui/pawsilluminationwindow.cpp personal/kougaro/src/client/gui/pawsilluminationwindow.h personal/kougaro/src/client/gui/pawsslot.cpp personal/kougaro/src/client/gui/pawsslot.h personal/kougaro/src/client/guihandler.cpp personal/kougaro/src/client/pscamera.cpp personal/kougaro/src/client/pscelclient.cpp personal/kougaro/src/client/pscelclient.h personal/kougaro/src/client/pscharcontrol.h personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/client/psclientchar.h personal/kougaro/src/client/psinventorycache.cpp personal/kougaro/src/client/psinventorycache.h personal/kougaro/src/common/effects/pseffectobj.cpp personal/kougaro/src/common/effects/pseffectobjspire.cpp personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/paws/pawsborder.cpp personal/kougaro/src/common/paws/pawsborder.h personal/kougaro/src/common/paws/pawsbutton.cpp personal/kougaro/src/common/paws/pawsbutton.h personal/kougaro/src/common/paws/pawsframedrawable.cpp personal/kougaro/src/common/paws/pawsframedrawable.h personal/kougaro/src/common/paws/pawsimagedrawable.cpp personal/kougaro/src/common/paws/pawsimagedrawable.h personal/kougaro/src/common/paws/pawslistbox.cpp personal/kougaro/src/common/paws/pawsmanager.cpp personal/kougaro/src/common/paws/pawsmanager.h personal/kougaro/src/common/paws/pawsmenu.cpp personal/kougaro/src/common/paws/pawsmenu.h personal/kougaro/src/common/paws/pawsmouse.cpp personal/kougaro/src/common/paws/pawsmouse.h personal/kougaro/src/common/paws/pawsprefmanager.cpp personal/kougaro/src/common/paws/pawsstyles.cpp personal/kougaro/src/common/paws/pawstexturemanager.cpp personal/kougaro/src/common/paws/pawstexturemanager.h personal/kougaro/src/common/paws/pawstree.cpp personal/kougaro/src/common/paws/pawstree.h personal/kougaro/src/common/paws/pawswidget.cpp personal/kougaro/src/common/paws/pawswidget.h personal/kougaro/src/eedit/eeditpositiontoolbox.cpp personal/kougaro/src/eedit/eedittargettoolbox.cpp personal/kougaro/src/npcclient/npcoperations.cpp personal/kougaro/src/pslaunch/pawslauncherwindow.cpp personal/kougaro/src/pslaunch/pawslauncherwindow.h personal/kougaro/src/pslaunch/pslaunch.cpp personal/kougaro/src/pslaunch/pslaunch.h personal/kougaro/src/pslaunch/updaterconfig.h personal/kougaro/src/pslaunch/updaterengine.cpp personal/kougaro/src/pslaunch/updaterengine.h personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/adminmanager.h personal/kougaro/src/server/bulkobjects/pscharacter.cpp personal/kougaro/src/server/bulkobjects/pscharacter.h personal/kougaro/src/server/bulkobjects/pscharacterloader.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.h personal/kougaro/src/server/bulkobjects/psitem.cpp personal/kougaro/src/server/bulkobjects/psitem.h personal/kougaro/src/server/combatmanager.cpp personal/kougaro/src/server/command.cpp personal/kougaro/src/server/database/mysql/characters.sql personal/kougaro/src/server/database/mysql/command_access.sql personal/kougaro/src/server/database/mysql/create_all.sql personal/kougaro/src/server/database/mysql/factions.sql personal/kougaro/src/server/database/mysql/item_instances.sql personal/kougaro/src/server/database/mysql/server_options.sql personal/kougaro/src/server/database/mysql/upgrade_schema.sql personal/kougaro/src/server/entitymanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/minigamemanager.cpp personal/kougaro/src/server/minigamemanager.h personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserver.h personal/kougaro/src/server/psserverchar.cpp personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/workmanager.cpp personal/kougaro/src/tools/pawseditor/pawseditorapp.cpp personal/kougaro/src/tools/pawseditor/peskinselector.cpp Added Paths: ----------- personal/kougaro/src/server/database/mysql/wc_statistics.sql Property Changed: ---------------- personal/kougaro/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870 + /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972 Modified: personal/kougaro/data/gui/chardescwindow.xml =================================================================== --- personal/kougaro/data/gui/chardescwindow.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/chardescwindow.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -1,38 +1,92 @@ <widget_description> - + <widget name="DescriptionEdit" factory="pawsCharDescription" - visible="yes" savepositions="no" movable="yes" - resizable="no" configurable="yes"> - + visible="yes" savepositions="no" movable="yes" keepaspect="no" + resizable="yes" configurable="yes"> + <frame x="100" y="100" width="320" height="270" border="yes" /> + <minframe width="250" height="250" /> <title resource="Blue Title" text="Modify description" align="left" close_button="yes" /> <bgimage resource="Modify Description BG" alpha="128" /> - + <widget name="lbl" factory="pawsTextBox" > <frame x="34" y="8" width="200" height="20" border="no" /> - <font name="/planeshift/data/ttf/scurlock.ttf" r="255" g="255" b="255" size="14" /> + <font name="/planeshift/data/ttf/scurlock.ttf" r="255" g="255" b="255" size="14" scalefont="no"/> <text string="Character description:" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="PROPORTIONAL_LEFT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="PROPORTIONAL_BOTTOM" /> + </attachpoints> </widget> - <widget name="lblb" factory="pawsTextBox" > + <widget name="lblb" factory="pawsTextBox" > <frame x="35" y="9" width="200" height="20" border="no" /> - <font name="/planeshift/data/ttf/scurlock.ttf" r="0" g="0" b="0" size="14" /> + <font name="/planeshift/data/ttf/scurlock.ttf" r="0" g="0" b="0" size="14" scalefont="no"/> <text string="Character description:" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="PROPORTIONAL_LEFT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="PROPORTIONAL_BOTTOM" /> + </attachpoints> </widget> - + <widget name="Description" factory="pawsMultilineEditTextBox" > <frame x="25" y="30" width="270" height="185" border="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" scalefont="no" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="PROPORTIONAL_LEFT" /> + <attach point="PROPORTIONAL_BOTTOM" /> + </attachpoints> </widget> + <widget name="OK" factory="pawsButton" id="100"> - <frame x="38" y="238" width="85" height="30" /> + <frame x="5" y="238" width="70" height="30" /> <bgimage resource="Modify Save" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="ATTACH_LEFT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_BOTTOM" /> + </attachpoints> <label text="OK" /> </widget> <widget name="Cancel" factory="pawsButton" id="101"> - <frame x="200" y="238" width="85" height="30" /> + <frame x="80" y="238" width="70" height="30" /> <bgimage resource="Modify Cancel" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="PROPORTIONAL_LEFT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_BOTTOM" /> + </attachpoints> <label text="Cancel" /> </widget> + <widget name="Save" factory="pawsButton" id="102"> + <frame x="170" y="238" width="65" height="30" /> + <bgimage resource="Modify Save" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="ATTACH_LEFT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_BOTTOM" /> + </attachpoints> + <label text="Save" /> + </widget> + <widget name="Load" factory="pawsButton" id="103"> + <frame x="240" y="238" width="75" height="30" /> + <bgimage resource="Modify Cancel" /> + <attachpoints> + <attach point="PROPORTIONAL_RIGHT" /> + <attach point="PROPORTIONAL_LEFT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_BOTTOM" /> + </attachpoints> + <label text="Load" /> + </widget> </widget> - + </widget_description> - Modified: personal/kougaro/data/gui/configchatbubbles.xml =================================================================== --- personal/kougaro/data/gui/configchatbubbles.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/configchatbubbles.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -475,6 +475,41 @@ <text string="Mix Action colours" /> </widget> + <widget name="npcinternalText" factory="pawsTextBox"> + <frame x="10" y="30" width="130" height="20" /> + <text string="npcinternal text colour" /> + </widget> + <widget name="npcinternalTextR" factory="pawsEditTextBox"><frame border="yes" x="140" y="30" width="30" height="20" /></widget> + <widget name="npcinternalTextG" factory="pawsEditTextBox"><frame border="yes" x="180" y="30" width="30" height="20" /></widget> + <widget name="npcinternalTextB" factory="pawsEditTextBox"><frame border="yes" x="220" y="30" width="30" height="20" /></widget> + <widget name="npcinternalEnabled" factory="pawsCheckBox"> + <frame x="260" y="30" width="130" height="20"/> + <text string="Enable npcinternal" /> + </widget> + <widget name="npcinternalShadow" factory="pawsTextBox"> + <frame x="10" y="50" width="130" height="20" /> + <text string="npcinternal shadow colour" /> + </widget> + <widget name="npcinternalShadowR" factory="pawsEditTextBox"><frame border="yes" x="140" y="50" width="30" height="20" /></widget> + <widget name="npcinternalShadowG" factory="pawsEditTextBox"><frame border="yes" x="180" y="50" width="30" height="20" /></widget> + <widget name="npcinternalShadowB" factory="pawsEditTextBox"><frame border="yes" x="220" y="50" width="30" height="20" /></widget> + <widget name="npcinternalOutline" factory="pawsTextBox"> + <frame x="10" y="70" width="130" height="20" /> + <text string="npcinternal outline colour" /> + </widget> + <widget name="npcinternalOutlineR" factory="pawsEditTextBox"><frame border="yes" x="140" y="70" width="30" height="20" /></widget> + <widget name="npcinternalOutlineG" factory="pawsEditTextBox"><frame border="yes" x="140" y="70" width="30" height="20" /></widget> + <widget name="npcinternalOutlineB" factory="pawsEditTextBox"><frame border="yes" x="140" y="70" width="30" height="20" /></widget> + <widget name="npcinternalAlignText" factory="pawsTextBox"> + <frame x="10" y="70" width="130" height="20" /> + <text string="npcinternal Alignment" /> + </widget> + <widget name="npcinternalAlign" factory="pawsComboBox" > + <listbox rows="3" height="20" text="Left" /> + <frame x="150" y="20" width="200" height="25" border="no" /> + </widget> + + </widget> </widget_description> Modified: personal/kougaro/data/gui/ok.xml =================================================================== --- personal/kougaro/data/gui/ok.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/ok.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -2,7 +2,7 @@ <widget name="OkWindow" factory="pawsOkBox" visible="no" savepositions="no" movable="yes" - resizable="no" > + resizable="no" style="New Standard GUI" > <frame x="0" y="0" width="644" height="300" border="no" /> <bgimage resource="YesNo" alpha="0" /> @@ -18,8 +18,7 @@ <widget name="OkButton" factory="pawsButton" id="-30"> <frame x="270" y="220" width="80" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="25" /> - <label text="Ok" /> + <label text="Ok" /> </widget> </widget> Modified: personal/kougaro/data/gui/quitinfo.xml =================================================================== --- personal/kougaro/data/gui/quitinfo.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/quitinfo.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -2,9 +2,9 @@ <widget name="QuitInfoWindow" factory="pawsQuitInfoBox" visible="no" savepositions="no" movable="yes" - resizable="no" > + resizable="no" style="New Standard GUI" > + <frame x="0" y="0" width="512" height="240" border="no" /> - <bgimage resource="YesNo" alpha="0" /> <widget name="Message Box" factory="pawsMultiLineTextBox"> <frame x="100" y="60" width="300" height="100" border="no" /> Modified: personal/kougaro/data/gui/shortcutwindow.xml =================================================================== --- personal/kougaro/data/gui/shortcutwindow.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/shortcutwindow.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -1,20 +1,21 @@ <widget_description> <widget name="ShortcutWindow" factory="pawsShortcutWindow" visible="yes" configurable="yes" - savepositions="yes" movable="yes" resizable="yes" keepaspect="no" > - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + savepositions="yes" movable="yes" resizable="yes" keepaspect="no" style="New Standard GUI"> + + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> <frame x="526" y="545" width="280" height="55" border="no" /> - <minframe width="105" height="32" /> - <bgimage resource="Shortcut Background" alpha="128" /> + <minframe width="105" height="32" /> </widget> <widget name="ShortcutEdit" factory="pawsWidget" visible="no" savepositions="yes" movable="yes" - resizable="yes" configurable="yes" keepaspect="no" > + resizable="yes" configurable="yes" keepaspect="no" style="New Standard GUI"> + <frame x="30" y="30" width="330" height="220" border="yes" /> <title resource="Blue Title" text="Edit Shortcut..." align="left" close_button="yes" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - <bgimage resource="Options Background" alpha="128"/> + <!--bgimage resource="Options Background" alpha="128"/--> <minframe width="300" height="200" /> + <widget name="Infobox1" factory="pawsTextBox"> <frame x="20" y="7" width="60" height="20" /> <text string="Name:" /> @@ -47,10 +48,9 @@ </attachpoints> </widget> <widget name="SetKeyButton" factory="pawsButton" toggle="no" id="1102" notify="ShortcutWindow"> - <frame x="260" y="28" width="50" height="20" border="yes" /> + <frame x="260" y="28" width="50" height="24" /> <notify name="ShortcutWindow" /> - <buttonup resource="Blue Title" /> - <buttondown resource="Blue Title" /> + <bgimage resource="Scaling Red Button" /> <label text="Set" /> <attachpoints> <attach point="ATTACH_RIGHT" /> @@ -66,7 +66,8 @@ </attachpoints> </widget> <widget name="CommandBox" factory="pawsMultilineEditTextBox"> - <frame x="20" y="90" width="300" height="70" border="yes" /> + <frame x="20" y="90" width="300" height="70" border="no" /> + <bgimage resource="Scaling Button Background"/> <attachpoints> <attach point="ATTACH_LEFT" /> <attach point="ATTACH_RIGHT" /> @@ -75,10 +76,9 @@ </attachpoints> </widget> <widget name="DoneButton" factory="pawsButton" toggle="no" id="1100" notify="ShortcutWindow"> - <frame x="20" y="180" width="50" height="20" border="yes" /> + <frame x="20" y="180" width="50" height="24" /> <notify name="ShortcutWindow" /> - <buttonup resource="Blue Title" /> - <buttondown resource="Blue Title" /> + <bgimage resource="Scaling Red Button" /> <label text="Done" /> <attachpoints> <attach point="ATTACH_LEFT" /> @@ -86,9 +86,8 @@ </attachpoints> </widget> <widget name="ClearButton" factory="pawsButton" toggle="no" id="1103" notify="ShortcutWindow"> - <frame x="80" y="180" width="50" height="20" border="yes" /> - <buttonup resource="Blue Title" /> - <buttondown resource="Blue Title" /> + <frame x="80" y="180" width="50" height="24" /> + <bgimage resource="Scaling Red Button" /> <label text="Clear" /> <attachpoints> <attach point="ATTACH_LEFT" /> @@ -96,9 +95,8 @@ </attachpoints> </widget> <widget name="CancelButton" factory="pawsButton" toggle="no" id="1101" notify="ShortcutWindow"> - <frame x="140" y="180" width="60" height="20" border="yes" /> - <buttonup resource="Blue Title" /> - <buttondown resource="Blue Title" /> + <frame x="140" y="180" width="60" height="24" /> + <bgimage resource="Scaling Red Button" /> <label text="Cancel" /> <attachpoints> <attach point="ATTACH_LEFT" /> Modified: personal/kougaro/data/gui/styles.xml =================================================================== --- personal/kougaro/data/gui/styles.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/styles.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -69,6 +69,19 @@ <bgimage resource="Standard Button" alpha="0"/> </style> + <!-- red button --> + <style name="redbutton" toggle="no" > + <frame width="80" height="22" border="no" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> + <bgimage resource="Glossy Red Button" alpha="0"/> + </style> + + <!-- scaling red button --> + <style name="scaleredbutton" toggle="no" > + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> + <bgimage resource="Scaling Red Button" alpha="0"/> + </style> + <style name="nicebutton" toggle="no" > <frame width="80" height="22" border="no" /> <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="240" g="240" b="200" size="8" /> @@ -105,4 +118,9 @@ </childborders> </style> + <style name="New Standard GUI"> + <bgimage resource="Scaling Widget Background" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="20" g="20" b="20" size="10" /> + <defaultstyle factory="pawsButton" style="scaleredbutton"/> + </style> </styles> Modified: personal/kougaro/data/gui/yesno.xml =================================================================== --- personal/kougaro/data/gui/yesno.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/gui/yesno.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -2,26 +2,22 @@ <widget name="YesNoWindow" factory="pawsYesNoBox" visible="no" savepositions="no" movable="yes" - resizable="no" > + resizable="no" style="New Standard GUI" > - <frame x="0" y="0" width="644" height="300" border="no" /> - <bgimage resource="YesNo" alpha="0" /> - + <frame x="0" y="0" width="500" height="250" border="no" /> + <widget name="Message Box" factory="pawsMultiLineTextBox"> - <frame x="180" y="80" width="300" height="108" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" /> + <frame x="100" y="40" width="300" height="150" border="no" /> </widget> <widget name="YesButton" factory="pawsButton" id="-10" key="Y"> - <frame x="212" y="185" width="80" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> + <frame x="140" y="185" width="100" height="40" /> <label text="Yes" /> </widget> <widget name="NoButton" factory="pawsButton" id="-20" key="N"> - <frame x="370" y="185" width="50" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="20" /> + <frame x="260" y="185" width="100" height="40" /> <label text="No" /> </widget> Modified: personal/kougaro/data/help.xml =================================================================== --- personal/kougaro/data/help.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/help.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -177,7 +177,13 @@ </topic> <topic name="/roll">/roll times sides target -Rolls a certain number of dice with the specified sides and gives the answer. Example: "/roll 2 6" rolls 2 6-sided dice. If target is defined it will only announce the number of dice which got a number higher than the specified one. Example: "/roll 2 6 3" rolls a 2 6-sided dice and tells how many of them got a 3 or an higher number. Use this to invent your own gambling games.</topic> +Rolls a certain number of dice with the specified sides and gives the answer. +Example: "/roll 2 6" rolls 2 6-sided dice. If target is defined it will only announce the number of dice which got a number higher than the specified one. +Example: "/roll 2 6 3" rolls a 2 6-sided dice and tells how many of them got a 3 or an higher number. Use this to invent your own gambling games.</topic> + <topic name="/rotate">/rotate target x y z or /rotate [axis] [angle] + +Rotate an object along the x, y, and z axis. Values are in degrees. Please note that y is the vertical axis. +The rotation is added to the item's current rotation. Instead of specifying an angle, you can input "reset" which will reset the rotation to 0.</topic> <topic name="/sell">/sell merchant Sell to specified merchant. If no merchant specified, sell to current target.</topic> @@ -237,7 +243,9 @@ Stops attacking.</topic> <topic name="/target">/target [next|prev] [npc|pc|item|any|clear OR a player name] -Searches for a target that matches the parameters. With no parameters targets yourself. You may search for an NPC, PC (player), or item. 'Any' will find anything to target, and 'clear' will deselect your target. You may also specify your target by entering the player's name. You may optionally specify the direction with 'next' (default) or 'prev', for searching outwards or inwards from your location. +Searches for a target that matches the parameters. With no parameters targets yourself. +You may search for an NPC, PC (player), or item. 'Any' will find anything to target, and 'clear' will deselect your target. +You may also specify your target by entering the player's name. You may optionally specify the direction with 'next' (default) or 'prev', for searching outwards or inwards from your location. Examples: "/target Bob" will target the player named Bob. "/target prev npc" will target the next closest NPC from the one you already have selected.</topic> <topic name="/targetinfo">/targetinfo target @@ -273,6 +281,27 @@ </branch> <branch name="Guild Commands"> Commands used to perform guild actions, many of which are available via the guild window. + <branch name="Alliance Commands"> +Commands used to create and maintain guild alliances. + <topic name="/allianceinvite">/allianceinvite leader_name + +Invites leader of another guild to your guild alliance.</topic> + <topic name="/allianceleader">/allianceleader guild_name + +Hands over alliance leadership to another guild.</topic> + <topic name="/allianceleave">/allianceleave + +Leave your guild alliance.</topic> + <topic name="/allianceremove">/allianceremove guild_name + +Removes a guild from your guild alliance.</topic> + <topic name="/endalliance">/endalliance + +Disband your guild alliance.</topic> + <topic name="/newalliance">/newalliance alliance_name + +Creates new alliance of guilds.</topic> + </branch> <topic name="/endguild">/endguild Disbands your guild.</topic> @@ -322,27 +351,6 @@ This creates a new guild with the specified name and you as leader.</topic> </branch> - <branch name="Alliance Commands"> -Commands used to create and maintain guild alliances. - <topic name="/allianceinvite">/allianceinvite leader_name - -Invites leader of another guild to your guild alliance.</topic> - <topic name="/allianceleader">/allianceleader guild_name - -Hands over alliance leadership to another guild.</topic> - <topic name="/allianceleave">/allianceleave - -Leave your guild alliance.</topic> - <topic name="/allianceremove">/allianceremove guild_name - -Removes a guild from your guild alliance.</topic> - <topic name="/endalliance">/endalliance - -Disband your guild alliance.</topic> - <topic name="/newalliance">/newalliance alliance_name - -Creates new alliance of guilds.</topic> - </branch> <branch name="Utility Commands"> Additional commands used for other game functions. <topic name="/confirm">/confirm message yes_command no_command @@ -382,7 +390,11 @@ Commands which act on a target all use the same system. A number of keywords and features are available to make specifying the target easier and more flexible. <topic name="area">area syntax: 'area:[type]:range' -Used run a command on all entities of a specific type within a range. (crosses portals; range doesn't include yourself) Available types are players (default), actors, npcs, items, and entities. (no spaces before/after colons) Note that this is a very powerful feature; be careful! Examples: "/info area:entities:30" lists info on everything within 30m, "/modify area:items:10 remove" deletes all litter within 10m, "/teleport area:players:5 hydlaa_plaza" teleports you and all players within 5m to the plaza</topic> +Used to run a command on all entities of a specific type within a range. (crosses portals; range doesn't include yourself) +Available types are players (default), actors, npcs, items, and entities. (no spaces before/after colons) Note that this is a very powerful feature; be careful! +Examples: "/info area:entities:30" lists info on everything within 30m, +"/modify area:items:10 remove" deletes all litter within 10m, +"/teleport area:players:5 hydlaa_plaza" teleports you and all players within 5m to the plaza</topic> <topic name="here">keyword 'here' Used to specify your current sector for sector based commands. Also may be used as a destination for /teleport to indicate your exact location. Examples: "/thunder here", "/teleport target here"</topic> @@ -543,6 +555,10 @@ Kills the targeted NPC, using the current target if no name is given. The reload option recreates the NPC with stats and triggers from the DB.</topic> <topic name="/listwarnings">/listwarnings [me/target/eid/pid/area/name] List all warnings given to the targeted account.</topic> + <topic name="/loadquest">/loadquest questname + +Reloads the given quest. +Note that you might need to wrap it like this \"quest name\" in case the quest name has spaces</topic> <topic name="/managepetitions">/managepetitions Manage petitions to help users.</topic> @@ -678,13 +694,29 @@ Runs a progression script on the target.</topic> <topic name="/set">/set attribute on|off -Set a GM attribute on or off. Available flags are: invincible, invisible, viewall (see invisibles), nevertired, nofalldamage, infiniteinventory, questtester (bypass quest lockouts). Many of these features are enabled by default for GMs. You can also do "/set list" to view your current attributes.</topic> +Many of these attribute are enabled by default for GMs. +You can also do "/set list" to view your current attributes. + +Available attributes are: +- invincible +- invisible +- viewall (see invisibles) +- nevertired +- nofalldamage +- infiniteinventory +- questtester (bypass quest lockouts and prerequisites). +- instantcast (bypasses spell casting time) +- givekillexp (awards experience when a GM is killed, as in an event)</topic> <topic name="/setlabelcolor">/setlabelcolor [target] [npc|player|tester|gm|gm1|dead|alive|normal] Set the color of the label of target to the given value. The normal setting will again display the targets normal label color.</topic> <topic name="/setitemname">/setitemname [target/eid/area/original name] [name] [description] Allows changing the name and description of the targeted item. Description is optional.</topic> + <topic name="/setkillexp">/setkillexp [exp amount] + +Allows to set the experience (not measured in PP) the gm will give to who kills him. +This command doesn't support targeting and it's temporary.</topic> <topic name="/setquality">/setquality [target/eid/area/name] [quality] [max quality] Allows changing the quality of the targeted item. Max quality is optional.</topic> @@ -809,6 +841,78 @@ <topic name="Z">Sit down or stand back up.</topic> <topic name="1 - 0">Shortcuts one through to ten in the Shortcuts Window.</topic> </branch> + <branch name="Files And Folders">File Locations + +Windows: %AppData%\PlaneShift +Mac: ~/Library/Application Support/PlaneShift +Linux: $HOME/.PlaneShift + <topic name="Files">Files + +options.cfg: This file contains some camera-settings + +planeshift.cfg: This file contains additional settings, like the email seen on the login-screen and options which can be set via the pssetup application. + +questnotes_YourCharactersFirstName_YourCharactersLastName.xml: This file contains all the notes you made on the quests you have done. + </topic> + <topic name="Folders">Folders + +books: This folder contains books you have saved from planeshift. It is also used to store texts you have created outside of planeshift and want to load into a book + +logs: This folder contains your log files. +- Chat Log: 'YourCharactersFirstName_YourCharactersLastName_chat.txt'. +- System Log: 'YourCharactersFirstName_YourCharactersLastName_system.txt'. + +options: The files within contain the options you can set from within planeshift itself. + +screenshots: The screenshots you take from within planeshift via the command '/screenshot' are saved here. + +sketches: The sketches (maps) you have saved from ingame. These are saved in .xml format. + +Description: This folder contains all the descriptions you have saved from ingame [yours only] and any you wish to upload. + </topic> + </branch> + <branch name="Using The Updater">Using The Updater + +The Updater is a utility to get your installed client files in sync with the lastest version available on the server. + <topic name="Updating">Updating + +To update PlaneShift you just need to launch PSlaunch and it will tell you if you need to update the game or not. + </topic> + + <topic name="Repair">Repairing PlaneShift +If your client is not working as well as it could, you can run the repair updater in PSlaunch. To do this just click "repair" in the launcher and it will tell you if there are any files that are not updated or dont match what it has to offer, then allow you the choice of updating those files or not. +</topic> + + </branch> + <branch name="Web Links"> +Web Links + +FAQ: +http://www.planeshift.it/faq.html + +Players Guides: +http://www.planeshift.it/guide/en/index.html +http://pswiki.xordan.com + +Policies: +http://www.planeshift.it/policies.html + +More Policies: +http://www.hydlaaplaza.com/smf/index.php?topic=31960.0 + +Tutorial Walkthrough: +http://hydlaaplaza.com/smf/index.php?branch=30436.0 + +Forums: +http://forums.hydlaaplaza.com + +Bug Tracker: +http://www.hydlaaplaza.com/flyspray + +Non-RP Server: +Register: http://planeshift.ezpcusa.com/register +Connect: planeshift.ezpcusa.com 7777 + </branch> </help> <!-- These commands are missing a topic (updated r2512): Modified: personal/kougaro/data/options/chatbubbles_def.xml =================================================================== --- personal/kougaro/data/options/chatbubbles_def.xml 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/data/options/chatbubbles_def.xml 2009-02-04 04:59:09 UTC (rev 2973) @@ -1,11 +1,12 @@ <?xml version="1.0" ?> -<chat_bubbles maxLineLen="32" shortPhraseCharCount="9" longPhraseLineCount="5" mixActionColours="yes" enabled="yes"> +<chat_bubbles maxLineLen="32" shortPhraseCharCount="9" longPhraseLineCount="5" enabled="yes"> <chat type="say" enabled="yes" colourR="186" colourG="168" colourB="126" shadowR="108" shadowG="98" shadowB="73" align="left" effectPrefix="chatbubble_" /> <chat type="tell" enabled="yes" colourR="38" colourG="196" colourB="15" shadowR="22" shadowG="66" shadowB="9" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="group" enabled="yes" colourR="108" colourG="57" colourB="222" shadowR="46" shadowG="24" shadowB="94" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="guild" enabled="yes" colourR="55" colourG="89" colourB="213" shadowR="22" shadowG="36" shadowB="87" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="shout" enabled="yes" colourR="188" colourG="12" colourB="12" shadowR="87" shadowG="5" shadowB="5" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="npc" enabled="yes" colourR="189" colourG="12" colourB="174" shadowR="86" shadowG="5" shadowB="80" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> + <chat type="npcinternal" enabled="yes" colourR="189" colourG="12" colourB="174" shadowR="86" shadowG="5" shadowB="80" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="auction" enabled="no" colourR="133" colourG="212" colourB="199" shadowR="5" shadowG="110" shadowB="95" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="me" enabled="no" colourR="251" colourG="180" colourB="87" shadowR="130" shadowG="80" shadowB="0" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="tellself" enabled="no" colourR="197" colourG="199" colourB="226" shadowR="83" shadowG="93" shadowB="140" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> @@ -13,4 +14,4 @@ <chat type="npc_me" enabled="no" colourR="68" colourG="136" colourB="255" shadowR="0" shadowG="68" shadowB="147" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="npc_my" enabled="no" colourR="251" colourG="180" colourB="87" shadowR="130" shadowG="80" shadowB="80" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> <chat type="npc_narrate" enabled="no" colourR="186" colourG="168" colourB="126" shadowR="108" shadowG="98" shadowB="73" outlineR="0" outlineG="0" outlineB="0" align="left" effectPrefix="chatbubble_" /> -</chat_bubbles> +</chat_bubbles> \ No newline at end of file Modified: personal/kougaro/docs/compiling.html =================================================================== --- personal/kougaro/docs/compiling.html 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/docs/compiling.html 2009-02-04 04:59:09 UTC (rev 2973) @@ -52,8 +52,8 @@ var csWinLibsVersionStab = "1.3_004"; // cs win32 libs version. var csWinLibsVersion = "1.3_004"; // cs win32 libs version. //Update date and author, to be changed everytime and updates occurred - var UpdateDate = "07 Dec 2008"; //Date when the update occurred - var UpdateAuthor = "Stefano Angeleri"; //Author of the update + var UpdateDate = "22 Jan 2009"; //Date when the update occurred + var UpdateAuthor = "Alec Rusanda (Allaann)"; //Author of the update --> </script> @@ -98,6 +98,7 @@ .Linux-Gentoo { display: none; } .Linux-Slackware { display: none; } .Linux-Ubuntu { display: none; } +.FreeBSD { display: none; } .Windows { display: none; } .MacOSX { display: none; } @@ -312,6 +313,7 @@ <option value="Linux-Gentoo">Gentoo Linux</option> <option value="Linux-Slackware">Slackware Linux</option> <option value="Linux-Ubuntu">Ubuntu Linux</option> + <option value="FreeBSD">FreeBSD</option> <option value="Windows">Windows</option> <option value="MacOSX">Mac OSX</option> </select> @@ -392,7 +394,23 @@ Platyna, author of the first compiling guide for Slackware distribution.<br> Mike Gist, author of the static compiling guide.<br> </div> - <div class="MacOSX"> + +<div class="FreeBSD"> + This guide gives a fairly detailed description on how to get a working client up and + running in FreeBSD. It gives instructions on how to get all the required tools and how + to check out the source code and configure it. At the end there you will have a + PlaneShift client and a PlaneShift updater application, and if you want also the server.<br><br> + + <b>Credits</b><br> + Caarrie, Trying to maintain the guide;<br> + Arianna Benigno, maintained the guide;<br> + Dave Garrett, author of the new compiling guides layout;<br> + Andrew Craig, author of the first Linux guides that were available on <a href="http://laanx.fragnetics.com">Laanx website</a>;<br> + + Platyna, author of the first compiling guide for Slackware distribution.<br> + Mike Gist, author of the static compiling guide.<br> +</div> +<div class="MacOSX"> This guide gives a very basic description on how to get a working client up and running on a Mac. It gives instructions on how to get to check out the source code and configure it. At the end there you will have a PlaneShift client and a PlaneShift updater application, and if you want also the server.<br><br> @@ -448,13 +466,18 @@ <div class="Linux"> <p><i class="command">$HOME/development/</i></p> - Many people get confused here because they copy and paste commands which contain this path. User generally refers to your username. The above path is only useable if you create it manually. + Many people get confused here because they copy and paste commands which contain this path. $HOME is a system environment variable that will always point to your users home directory. </div> +<div class="FreeBSD"> + <p><i class="command">$HOME/development/</i></p> + Many people get confused here because they copy and paste commands which contain this path. $HOME is a system environment variable that will always point to your users home directory. +</div> <div class="Windows"> - <p><i class="command">C:\development\</i></p> + <p><i class="command">C:\development\</i></p> </div> <div class="MacOSX"> <p><i class="command">$HOME/development</i></p> +$HOME is a system environment variable that will always point to your users home directory. </div> <div class="Windows"><div class="MINGW"> @@ -583,6 +606,22 @@ A GUI is available at: <a href="http://esvn.umputun.com/">http://esvn.umputun.com/</a> You can also use your distro's package manger to install it.</p> </div> +<div class="FreeBSD"> + <h3>Jam</h3> + <p>You will need a tool called Jam. Jam is a replacement for make. It's a bit easier to maintain and create + custom builds. If you do not already have Jam, you can find it at <a href="ftp://ftp.perforce.com/pub/jam/">ftp://ftp.perforce.com/pub/jam/</a> - install it system wide. You can also use FreeBSD ports to install it.</p> +<div class="commandBox"># cd /usr/ports/devel/jam</br> + # make install clean</br> +</div></br> + <h3>SVN</h3> + <p>CS and PlaneShift use SVN for their source repositories, so you'll need that too.<br> + You can find the software at: <a href="http://subversion.tigris.org/">http://subversion.tigris.org/</a><br> + A GUI is available at: <a href="http://esvn.umputun.com/">http://esvn.umputun.com/</a> You can also use FreeBSD ports to install it.</p> + <div class="commandBox"># cd /usr/ports/devel/subversion</br> + # make install clean</br> +</div></br> +</div> + <div class="Windows"> <h3>SVN client</h3> <p>PS and CS use SVN for their source repositories, so you will need an SVN client.<br> @@ -838,6 +877,17 @@ <p>If after building if you see that mysql was not found when running the server and you get the following error:<br /><br /> <i class="command">WARNING: could not load plugin 'planeshift.database.mysql'</i> <br /><br />make sure you have libmysqlclient-dev installed, if it was not installed, ./autogen.sh, ./configure, and recompile the server again, according to the documentation below.</p></div> + <div class="FreeBSD"> + <p>install from ports: <div class="commandBox"># cd /usr/ports/databases/mysql50-server <br> + # make install clean <br> + # cd /usr/ports/databases/mysql50-client <br> + # make install clean <br> + </div></p> + + <p>Note: This section is incomplete and untested, but contains the FreeBSD specific build information.</p> + + </div> + <div class="MacOSX"> We need to install mysql. In order to do this we need to use fink.<br /><br /> <i class="command">fink -y -v install mysql mysql-client mysql15-dev mysql15-shlibs</i><br /><br /> @@ -936,6 +986,68 @@ $HOME/development/planeshift$ jam -aq </div></p> </div> +<div class="FreeBSD"><h4>Do NOT install Cal3D, CrystalSpace and PlaneShift from FreeBSD ports<h4> + <h3>Cal3D</h3> + <p>We need to build cal3d from source before we can start on Crystal Space. Cal3d is a library that is used for + handling skeleton systems. This is a very nice system and can allow for fluid transformations between animations. + This needs to be built/installed first because when we configure Crystal Space it has to find the cal3d libraries + so it can know to build the sprcal3d plugin. Cal3D doesn't change much, so just download latest stable or checkout latest from svn:</p> + <p><a href="http://home.gna.org/cal3d/">Cal3D Home</a></p> + <p><i class="command">$HOME/development$ svn co -r CAL3D_SOURCE_REV svn://svn.gna.org/svn/cal3d/trunk/cal3d cal3d</i></p> + + <p>In case of a slow download use the following command:</p> + <p><i class="command">$HOME/development$ svn co -r CAL3D_SOURCE_REV http://svn.gna.org/svn/cal3d/trunk/cal3d cal3d</i></p> + + <h3>Crystal Space (CS)</h3> + <p>Crystal Space 3D SDK is the engine that we use for rendering and sound.</p> + <div class="User"> + <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV https://crystal.svn.sourceforge.net/svnroot/crystal/CS/branches/release/V1.4 cs</i></p> + + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co -r CS_SOURCE_REV_HEAD https://crystal.svn.sourceforge.net/svnroot/crystal/CS/trunk cs</i></p> + </div> + + <h3>PlaneShift</h3> + <p>Lastly, download our source:</p> + <div class="User"> + + <div class="NOTPS"> <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/stable planeshift</i></p> + </div> <div class="PS"> + <i class="command">$HOME/development$ svn co -r PS_Laanx https://planeshift.svn.sourceforge.net/svnroot/planeshift/stable planeshift</i> + </div> + </div> + <div class="Developer"> + <p><i class="command">$HOME/development$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/trunk planeshift</i></p> + + </div> + <h3>Updating Sources</h3> + <p>From time to time, newer PlaneShift revisions will require you to upgrade your cal3d and CS repositories to a newer revision as well. To update your supporting libraries, always be certain that you use the "-r" option keep from updating to the latest revision:</p> + + If you want to update to a new revision replace REVISION with the number of the revision you want to use: + <p><div class="commandBox"> + $HOME/development/cal3d$ svn update -r REVISION<br> + + $HOME/development/cs$ svn update -r REVISION<br> + </div></p> + <p>Unlike the supporting libraries, you will generally want to use the latest PlaneShift source (or the HEAD) rather than an intermediate revision. In this case, you will omit the "-r" option like so: + <div class="commandBox"> + $HOME/development/planeshift$ svn update + </div></p><br> + If, for some reason, you wish to update any of the supporting libraries to the latest version (i.e. the HEAD), you have to remove the sticky date tag. WE DO NOT RECOMMEND THIS as it may break your build: + <p><div class="commandBox"> + $HOME/development/cal3d$ svn update -r HEAD<br> + + $HOME/development/cs$ svn update -r HEAD<br> + </div></p> + + +If you update a repository, you will need to recompile that repository and each repository that depends on it. Before doing so, you should do a "jam clean" for each project you want to jam again. So, for example, if you want to rebuild PS you will do: + <p><div class="commandBox"> + $HOME/development/planeshift$ jam clean<br> + $HOME/development/planeshift$ jam -aq + </div></p> +</div> <div class="Windows"> <h3>Crystal Space (CS)</h3> <p>Crystal Space is the 3D Software Development Kit (SDK) that is used in PlaneShift mainly for rendering and sound.</p> @@ -1102,6 +1214,27 @@ <h2><a name="compile">Compile the Code</a></h2> <div class="GCC"> + <div class="FreeBSD" > + <p>If you have a dual core or better processor then you can take advantage of parallel make or jam by adding -j3 after the command. You can replace 3 with the number of jobs you want to run in parallel.</p> + <h3>Cal3D</h3> + <p>Since cal3d is a library in development we probably don't want to 'install' this one as root since there is a good + possibility it will change in the future. Instead we will 'install' it into our working directory. This is done + by using the --prefix option when we configure it.</p> + Using a text editor open configure.in and remove the line + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> + <p> Then you can build cal3d </p> + <p><div class="commandBox"> + $HOME/development/cal3d$ autoreconf --install --force<br> + $HOME/development/cal3d$ ./configure --prefix=$HOME/development/cal3d<br> + $HOME/development/cal3d$ make<br> + $HOME/development/cal3d$ make install + </div></p> + <p>Because we did not install cal3d we need to make sure other things can find it. This is done using the LD_LIBRARY_PATH:<br> + Using a text editor open $HOME/.cshrc and add the line: <br></p> + <p><div class="commandBox"> + setenv LD_LIBRARY_PATH /home/development/cal3d/lib/:/home/development/cs/ </div>(need user relog)</p> + </div> <div class="Linux"> <p>If you have a dual core or better processor then you can take advantage of parallel make or jam by adding -j3 after the command. You can replace 3 with the number of jobs you want to run in parallel.</p> <h3>Cal3D</h3> @@ -1185,6 +1318,10 @@ Because we did not install cal3d we need to make sure other things can find it. This is done using the LD_LIBRARY_PATH: <p><i class="command">export LD_LIBRARY_PATH=$HOME/development/cal3d/src/cal3d/.libs/:$LD_LIBRARY_PATH</i></p> </div></div></div> + <div class="FreeBSD"> + <h3>Crystal Space (CS)</h3> + <p>Now we can build it and use the configure line to tell it where we installed the cal3d libraries. + To do this, use the prefix line that was used for Cal3d above.</p></div> <div class="Linux"> <h3>Crystal Space (CS)</h3> <p>Now we can build it and use the configure line to tell it where we installed the cal3d libraries. @@ -1239,8 +1376,65 @@ <div class="Static"><i class="command"> $HOME/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i></div><br> </div></div> + <div class="FreeBSD" > + <div class="User"><div class="commandBox"> + $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + <div class="Developer"><div class="commandBox"> + $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + <div class="Normal"><i class="command"> + $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> + <div class="Static"><i class="command"> + $HOME/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i><br> + </div><p>We should export the CRYSTAL environment variable so applications outside the Crystal Space + tree know where to find the .so's. <br>Using a text editor open $HOME/.cshrc and add the line: <br></p> + <p><div class="commandBox"> + setenv CRYSTAL /home/development/cs/ </div>(need user relog)</p> + <h3>PlaneShift</h3> + First of all Using a text editor open $HOME/planeshift/src/tools/wordnet/wnutil.c <br> + At line 20 change :<br><br> + + <div class="commandBox"> + malloc.h </div> + with + <div class="commandBox"> + stdlib.h </div><br> + You can now start to compile PlaneShift + + <p><div class="commandBox"> + $HOME/development/planeshift$ ./autogen.sh<br> + <div class="User"> + $HOME/development/planeshift$ ./configure --with-cal3d=$HOME/development/cal3d<br> + </div> + <div class="Developer"> + $HOME/development/planeshift$ ./configure --enable-debug --with-cal3d=$HOME/development/cal3d<br> + </div> + <div class="Normal"> + $HOME/development/planeshift$ jam -aq client + </div> + <div class="Static"> + $HOME/development/planeshift$ jam -aq client_static + </div> +</div></p> + If you also want to build the server, do this as well: + <div class="Normal"> + <p><i class="command">$HOME/development/planeshift$ jam -aq server</i></p> + </div> + <div class="Static"> + <p><i class="command">$HOME/development/planeshift$ jam -aq server_static</i></p> + </div> + If you want to build the extra tools, just do "jam -a". + <p>If your psclient has no skin you are used to seeing launch pssetup after you have copied your art over and select a new skin</p> + <p>If you wish for your psclient to not use the same user files as your other build/install you may run ps with the following command<br /> + <div class="commandBox"> + $HOME/development/planeshift$ ./psclient -cfgset=PlaneShift.UserConfigPath=$HOME/.PlaneShift2</div> + <p> You can also edit this in the psclient.cfg file under the game section uncomment the appropriate line and edit the path.</p> + + </div> +</div></div></div> + + <div class="Linux"> We should export the CRYSTAL environment variable so applications outside the Crystal Space tree know where to find the .so's. @@ -1547,6 +1741,9 @@ <div class="Linux"> <p><i class="command">$HOME/development/planeshift$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/art</i></p> </div> +<div class="FreeBSD"> +<p><i class="command">$HOME/development/planeshift$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/art</i></p> +</div> <div class="MacOSX"> <p><i class="command">$HOME/development/planeshift$ svn co https://planeshift.svn.sourceforge.net/svnroot/planeshift/art</i></p> </div> @@ -1607,6 +1804,16 @@ If you wish to put a password on the root account you can <i class="command"> $ mysqladmin -u root password "newpwd"</i> </div> +<div class="FreeBSD"> + + Using a text editor open /etc/rc.conf and add the line: + <p><i class="command">mysql_enable="YES"</i></p>then use + <p><i class="command"># /usr/local/etc/rc.d/mysql.sh start</i></p> + to start the mysql server.<br> + Then login to the MySQL client using (default username with no password): + <p><i class="command">$ mysql -u username -ppassword</i></p> + The default username is root with no password. +</div> <div class="MacOSX"> To start mysql automatically on boot do the following: @@ -1641,6 +1848,12 @@ home/development/planeshift/src/server/database/mysql/$ mysql -u planeshift -pplaneshift </div></p> </div> +<div class="FreeBSD"> + <p><div class="commandBox"> + $ cd home/development/planeshift/src/server/database/mysql/<br> + home/development/planeshift/src/server/database/mysql/$ mysql -u planeshift -pplaneshift + </div></p> +</div> <div class="Windows"> <p><div class="commandBox"> cd c:\development\planeshift\src\server\database\mysql\<br> @@ -1674,6 +1887,9 @@ <div class="Linux">Go to your PlaneShift directory ($HOME/development/planeshift) and run psserver, this will start the server. If you have a script to start your server or load maps you can use<br><br> <i class="command">./psserver --run=/this/script_name</i> <br> <br> </div> +<div class="FreeBSD">Go to your PlaneShift directory ($HOME/development/planeshift) and run psserver, this will start the server. If you have a script to start your server or load maps you can use<br><br> +<i class="command">./psserver --run=/this/script_name</i> <br> <br> +</div> <div class="MacOSX">Go to your PlaneShift directory ($HOME/development/planeshift) and run psserver, this will start the server. If you have a script to start your server or load maps you can use<br><br> <i class="command">./psserver --run=/this/script_name</i><br></div> Once the server has been started, you should see a "PS Server:" prompt. Not always does the prompt show PS Server: on first start but this is ok as long as you have gotten no errors so far.</p> @@ -1702,8 +1918,8 @@ <div class="Windows">The servers list is located in <i class="Command">C:\development\planeshift\data\servers.xml.</i></div> <br> <div class="Linux">The servers list is located in <i class="Command"> $HOME/development/planeshift/data/servers.xml</i></div><br> <div class="MacOSX">The servers list is located in <i class="Command" >$HOME/development/planeshift/data/servers.xml</i></div><br> +<div class="FreeBSD">The servers list is located in <i class="Command"> $HOME/development/planeshift/data/servers.xml</i></div><br> - The following accounts are in the SVN DB:</p> <table> @@ -1860,6 +2076,10 @@ On Linux it will be a forwardslash. <p><i class="command">PlaneShift.Mount.characterszip = /svn/planeshift/art/characters.zip/</i></p> </div> +<div class="FreeBSD"> + On FreeBSD it will be a forwardslash. + <p><i class="command">PlaneShift.Mount.characterszip = /svn/planeshift/art/characters.zip/</i></p> +</div> <div class="MacOSX"> On Mac it will be a forwardslash. <p><i class="command">PlaneShift.Mount.characterszip = /svn/planeshift/art/characters.zip/</i></p> Modified: personal/kougaro/docs/history.txt =================================================================== --- personal/kougaro/docs/history.txt 2009-02-03 21:16:02 UTC (rev 2972) +++ personal/kougaro/docs/history.txt 2009-02-04 04:59:09 UTC (rev 2973) @@ -1,4 +1,113 @@ -*** 2009-01-10 by Stefano Angeleri +*** 2009-02-03 by Stefano Angeleri +- Made the editable life event field working in editing and reading from + the description +- Some improvements in comments + +*** 2009-02-02 by Stefano Angeleri +- Added all-axis rotation support for items by kougaro +- Added a wrapper to check access to a certain command more easily by kougaro +- Changed hardcoded PI values to the Crystal Space provided PI define +- Added a faction_character column in the faction table which should store + how the dinamyc faction should be applied in the life events of a character +- added a life_description column in character which holds the editable + part of the char creation/life events tab in the character description + +*** 2009-01-31 by Steven Patrick +- Fix to application title for linux, patch by V... [truncated message content] |
From: <ko...@us...> - 2009-02-17 20:32:08
|
Revision: 3051 http://planeshift.svn.sourceforge.net/planeshift/?rev=3051&view=rev Author: kougaro Date: 2009-02-17 20:32:03 +0000 (Tue, 17 Feb 2009) Log Message: ----------- merged r2974-r3050 from trunk Modified Paths: -------------- personal/kougaro/data/gui/pslaunch.xml personal/kougaro/data/gui/splash.xml personal/kougaro/docs/compiling.html personal/kougaro/docs/history.txt personal/kougaro/lang/italian/stringtable.xml personal/kougaro/psclient.cfg personal/kougaro/src/client/charapp.cpp personal/kougaro/src/client/charapp.h personal/kougaro/src/client/cmdgroups.cpp personal/kougaro/src/client/cmdguilds.cpp personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/cmdutil.cpp personal/kougaro/src/client/gui/pawscharcreatemain.cpp personal/kougaro/src/client/gui/pawscharcreatemain.h personal/kougaro/src/client/gui/pawscharpick.cpp personal/kougaro/src/client/gui/pawsdetailwindow.cpp personal/kougaro/src/client/gui/pawsgmspawn.cpp personal/kougaro/src/client/gui/pawsgmspawn.h personal/kougaro/src/client/gui/pawssplashwindow.cpp personal/kougaro/src/client/gui/pawssplashwindow.h personal/kougaro/src/client/modehandler.cpp personal/kougaro/src/client/pscelclient.cpp personal/kougaro/src/client/pscelclient.h personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/client/psengine.cpp personal/kougaro/src/client/psengine.h personal/kougaro/src/client/psslotmgr.cpp personal/kougaro/src/client/zonehandler.cpp personal/kougaro/src/common/effects/pseffectlight.cpp personal/kougaro/src/common/engine/loader.cpp personal/kougaro/src/common/engine/loader.h personal/kougaro/src/common/engine/psworld.cpp personal/kougaro/src/common/engine/psworld.h personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/net/msghandler.h personal/kougaro/src/common/rpgrules/factions.h personal/kougaro/src/npcclient/gem.cpp personal/kougaro/src/npcclient/gem.h personal/kougaro/src/pslaunch/pawslauncherwindow.cpp personal/kougaro/src/pslaunch/pslaunch.cpp personal/kougaro/src/pslaunch/updaterengine.cpp personal/kougaro/src/server/bulkobjects/pscharacter.cpp personal/kougaro/src/server/bulkobjects/pscharacter.h personal/kougaro/src/server/bulkobjects/psnpcdialog.cpp personal/kougaro/src/server/bulkobjects/psquest.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.h personal/kougaro/src/server/bulkobjects/psraceinfo.cpp personal/kougaro/src/server/bulkobjects/psraceinfo.h personal/kougaro/src/server/cachemanager.cpp personal/kougaro/src/server/creationmanager.cpp personal/kougaro/src/server/database/mysql/factions.sql personal/kougaro/src/server/database/mysql/race_info.sql personal/kougaro/src/server/entitymanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/gemmesh.cpp personal/kougaro/src/server/groupmanager.cpp personal/kougaro/src/server/msgmanager.cpp personal/kougaro/src/server/psserverchar.cpp personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h Added Paths: ----------- personal/kougaro/data/shader/lighting/lighting_character.xml Property Changed: ---------------- personal/kougaro/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972 + /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972,2975-3050 Modified: personal/kougaro/data/gui/pslaunch.xml =================================================================== --- personal/kougaro/data/gui/pslaunch.xml 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/data/gui/pslaunch.xml 2009-02-17 20:32:03 UTC (rev 3051) @@ -60,6 +60,11 @@ <bgimage resource="Launcher Other" alpha="0" fading="false"/> <frame x="0" y="0" width="850" height="600" border="no"/> + <widget name="LauncherUpdaterLogo" factory="pawsWidget" visible="yes" savepositions="no" movable="no" resizable="no" id="110"> + <bgimage resource="PSLogo" alpha="0" fading="false"/> + <frame x="430" y="25" width="300" height="80" border="no"/> + </widget> + <widget name="UpdaterOutput" factory="pawsMessageTextBox" id="121" alwaysontop="true"> <frame x="90" y="205" width="670" height="290" /> </widget> @@ -98,6 +103,11 @@ <bgimage resource="Launcher Other" alpha="0" fading="false"/> <frame x="0" y="0" width="850" height="600" border="no"/> + <widget name="LauncherSettingsLogo" factory="pawsWidget" visible="yes" savepositions="no" movable="no" resizable="no" id="110"> + <bgimage resource="PSLogo" alpha="0" fading="false"/> + <frame x="430" y="25" width="300" height="80" border="no"/> + </widget> + <!-- Ok button --> <widget name="SettingsOkButton" factory="pawsButton" id="131" changeonmouseover="true"> <buttonup resource="Ok Button"/> @@ -176,8 +186,8 @@ </widget> <widget name="GraphicsPreset" factory="pawsComboBox" id="1392" alwaysontop="true"> - <frame x="100" y="0" width="70" height="20" border="no" /> - <listbox rows="6" height="25" useScrollBar="false" /> + <frame x="100" y="0" width="90" height="20" border="no" /> + <listbox rows="4" height="25" useScrollBar="false" /> </widget> <widget name="AspectRatioText" factory="pawsTextBox" id="1393"> @@ -186,8 +196,8 @@ </widget> <widget name="AspectRatio" factory="pawsComboBox" id="1394" alwaysontop="true"> - <frame x="100" y="20" width="70" height="20" border="no" /> - <listbox rows="9" height="25" useScrollBar="false" /> + <frame x="100" y="20" width="90" height="20" border="no" /> + <listbox rows="4" height="25" useScrollBar="false" /> </widget> <widget name="ScreenResolutionText" factory="pawsTextBox" id="1395"> @@ -196,8 +206,8 @@ </widget> <widget name="ScreenResolution" factory="pawsComboBox" id="1396" alwaysontop="true"> - <frame x="100" y="40" width="70" height="20" border="no" /> - <listbox rows="9" height="25" useScrollBar="false" /> + <frame x="100" y="40" width="90" height="20" border="no" /> + <listbox rows="4" height="25" useScrollBar="true" /> </widget> <widget name="Fullscreen" factory="pawsCheckBox" id="1397"> @@ -213,7 +223,7 @@ <widget name="Skins" factory="pawsComboBox" id="1399" alwaysontop="true"> <frame x="100" y="100" width="70" height="20" border="no"/> - <listbox rows="3" height="25" useScrollBar="false" /> + <listbox rows="3" height="25" useScrollBar="true" /> </widget> <widget name="SkinDescription" factory="pawsMultiLineTextBox" id="13991"> @@ -256,7 +266,7 @@ <widget name="AntiAiasing" factory="pawsComboBox" id="13104" alwaysontop="true"> <frame x="120" y="20" width="70" height="20" border="no" /> - <listbox rows="9" height="25" useScrollBar="false" /> + <listbox rows="6" height="25" useScrollBar="false" /> </widget> <widget name="AnisotropicFilteringText" factory="pawsTextBox" id="13105"> @@ -266,7 +276,7 @@ <widget name="AnisotropicFiltering" factory="pawsComboBox" id="13106" alwaysontop="true"> <frame x="120" y="40" width="70" height="20" border="no" /> - <listbox rows="6" height="25" useScrollBar="false" /> + <listbox rows="3" height="25" useScrollBar="false" /> </widget> <widget name="TextureQualityText" factory="pawsTextBox" id="13107"> @@ -276,7 +286,7 @@ <widget name="TextureQuality" factory="pawsComboBox" id="13108" alwaysontop="true"> <frame x="120" y="60" width="70" height="20" border="no" /> - <listbox rows="4" height="25" useScrollBar="false" /> + <listbox rows="3" height="25" useScrollBar="false" /> </widget> <widget name="ShadersText" factory="pawsTextBox" id="13109"> @@ -307,23 +317,17 @@ <text string="Load All Maps:" position="left"/> </widget> - <widget name="KeepMapsLoaded" factory="pawsCheckBox" id="13113"> + <widget name="KeepMapsLoaded" factory="pawsCheckBox" id="13114"> <frame x="0" y="163" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> <text string="Keep Maps Loaded:" position="left"/> </widget> - <widget name="PreloadModels" factory="pawsCheckBox" id="13115"> + <widget name="ThreadedWorldLoading" factory="pawsCheckBox" id="13115"> <frame x="0" y="183" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Preload Models:" position="left"/> + <text string="Threaded World Loading:" position="left"/> </widget> - - <widget name="ThreadedLoading" factory="pawsCheckBox" id="13116"> - <frame x="0" y="203" width="130" height="15"/> - <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Threaded Loading:" position="left"/> - </widget> </widget> </widget> Modified: personal/kougaro/data/gui/splash.xml =================================================================== --- personal/kougaro/data/gui/splash.xml 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/data/gui/splash.xml 2009-02-17 20:32:03 UTC (rev 3051) @@ -4,11 +4,6 @@ visible="yes" movable="no" resizable="no" resizetoscreen="yes"> <frame x="0" y="0" width="800" height="600" border="no" /> <bgimage resource="Splash Background" /> - - <widget name="Progress" factory="pawsProgressBar"> - <frame x="10" y="570" height="20" width="700" border="yes" /> - <fadecolor r="100" g="100" b="255" /> - </widget> </widget> </widget_description> Copied: personal/kougaro/data/shader/lighting/lighting_character.xml (from rev 3050, trunk/data/shader/lighting/lighting_character.xml) =================================================================== --- personal/kougaro/data/shader/lighting/lighting_character.xml (rev 0) +++ personal/kougaro/data/shader/lighting/lighting_character.xml 2009-02-17 20:32:03 UTC (rev 3051) @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + Copyright (C) 2007 by Frank Richter + (C) 2007 by Jorrit Tyberghein + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +--> +<shader compiler="shaderweaver" name="lighting_character" lights="3"> + <alias name="ambient" file="/shader/snippets/lighting/ambient-simple.xml" /> + <alias name="apply_alpha" file="/shader/snippets/surface/alpha-nochange.xml" /> + <alias name="lighting" file="/shader/snippets/lighting/lighting-ppl.xml" /> + <alias name="surface" file="/shader/snippets/surface/surface-overlay.xml" /> + + <technique priority="300" minlights="3"> + <tag>per_pixel_lighting</tag> + <!-- 1 pass, 3 lights --> + <pass> + <?if (vars."pass number".int == 0) && (vars."pass do_ambient") ?> + <!-- First pass: blend with alpha --> + <mixmode> + <blendop src="srcalpha" dst="srcalpha_inv" /> + <alphatest>enable</alphatest> + </mixmode> + <?else?> + <!-- Later pass: blend with add --> + <mixmode> + <blendop src="one" dst="one" /> + <alphatest>enable</alphatest> + </mixmode> + <?endif?> + + <!-- Combiner to use for this particular pass. + Techniques Referenced snippets must only utilize the same + combiner with compatible options specified. If a technique + doesn't meet that requirement, the next one is tried. + --> + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <!-- The meat of the shader is actually in a snippet. to be shared more + easily across all techniques --> + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">0</parameter> + <parameter id="maxLights" type="int">3</parameter> + <parameter id="minLights" type="int">1</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + <connection from="minLights" to="shared" /> + </pass> + </technique> + + <technique priority="200" minlights="2"> + <tag>per_pixel_lighting</tag> + <!-- 2 passes, 2+1 lights --> + <pass minlights="1"> + <?if (vars."pass number".int == 0) && (vars."pass do_ambient") ?> + <!-- First pass: blend with alpha --> + <mixmode> + <blendop src="srcalpha" dst="srcalpha_inv" /> + <alphatest>enable</alphatest> + </mixmode> + <?else?> + <!-- Later pass: blend with add --> + <mixmode> + <blendop src="one" dst="one" /> + <alphatest>enable</alphatest> + </mixmode> + <?endif?> + + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">0</parameter> + <parameter id="maxLights" type="int">2</parameter> + <parameter id="minLights" type="int">2</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + <connection from="minLights" to="shared" /> + </pass> + <pass minlights="3"> + <!-- Later pass: blend with add --> + <mixmode> + <blendop src="one" dst="one" /> + <alphatest>enable</alphatest> + </mixmode> + + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <alias name="ambient" file="/shader/snippets/lighting/ambient-null.xml" /> + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">2</parameter> + <parameter id="maxLights" type="int">1</parameter> + <parameter id="minLights" type="int">3</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + <connection from="minLights" to="shared" /> + </pass> + </technique> + + <technique priority="100" minlights="1"> + <tag>per_pixel_lighting</tag> + <!-- 3 passes, 1+1+1 lights --> + <pass minlights="1"> + <?if (vars."pass number".int == 0) && (vars."pass do_ambient") ?> + <!-- First pass: blend with alpha --> + <mixmode> + <blendop src="srcalpha" dst="srcalpha_inv" /> + <alphatest>enable</alphatest> + </mixmode> + <?else?> + <!-- Later pass: blend with add --> + <mixmode> + <blendop src="one" dst="one" /> + <alphatest>enable</alphatest> + </mixmode> + <?endif?> + + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">0</parameter> + <parameter id="maxLights" type="int">1</parameter> + <parameter id="minLights" type="int">1</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + <connection from="minLights" to="shared" /> + </pass> + <pass minlights="2"> + <!-- Later pass: blend with add --> + <mixmode> + <blendop src="one" dst="one" /> + <alphatest>enable</alphatest> + </mixmode> + + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <alias name="ambient" file="/shader/snippets/lighting/ambient-null.xml" /> + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">1</parameter> + <parameter id="maxLights" type="int">1</parameter> + <parameter id="minLights" type="int">2</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + <connection from="minLights" to="shared" /> + </pass> + <pass minlights="3"> + <!-- Later pass: blend with add --> + <mixmode> + <blendop src="one" dst="one" /> + <alphatest>enable</alphatest> + </mixmode> + + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <alias name="ambient" file="/shader/snippets/lighting/ambient-null.xml" /> + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">2</parameter> + <parameter id="maxLights" type="int">1</parameter> + <parameter id="minLights" type="int">3</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + <connection from="minLights" to="shared" /> + </pass> + </technique> + + <!-- No lights (ie ambient only) technique --> + <?if (vars."pass number".int == 0) && (vars."pass do_ambient") ?> + <technique priority="50"> + <tag>per_pixel_lighting</tag> + <pass> + <!-- First(only) pass: blend with alpha --> + <mixmode> + <blendop src="srcalpha" dst="srcalpha_inv" /> + <alphatest>enable</alphatest> + </mixmode> + + <!-- Combiner to use for this particular pass. + Techniques Referenced snippets must only utilize the same + combiner with compatible options specified. If a technique + doesn't meet that requirement, the next one is tried. + --> + <combiner plugin="crystalspace.graphics3d.shader.combiner.glcg" /> + + <!-- The meat of the shader is actually in a snippet. to be shared more + easily across all techniques --> + <snippet id="shared" file="/shader/snippets/lighting/lighting_default-shared.xml" /> + + <parameter id="lightOffset" type="int">0</parameter> + <parameter id="maxLights" type="int">0</parameter> + <connection from="lightOffset" to="shared" /> + <connection from="maxLights" to="shared" /> + </pass> + </technique> + <?endif?> + + <fallbackshader name="lighting_basic" file="/shader/lighting/lighting_basic.xml" /> +</shader> Modified: personal/kougaro/docs/compiling.html =================================================================== --- personal/kougaro/docs/compiling.html 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/docs/compiling.html 2009-02-17 20:32:03 UTC (rev 3051) @@ -1825,7 +1825,7 @@ To make the database you need to do the following:<br /> <div class="commandBox">cd $HOME/development/planeshift/src/server/database/mysql<br /> -mysql -r root -pyourpasswordhere<br /> +mysql -u root -pyourpasswordhere<br /> </div> </div> <div class="Windows"> @@ -1860,7 +1860,12 @@ C:\mysql\bin\mysql -u planeshift -pplaneshift </div></p> </div> - +<div class="MacOSX"> + <p><div class="commandBox"> + $ cd $HOME/development/planeshift/src/server/database/mysql/<br> + home/development/planeshift/src/server/database/mysql/$ mysql -u planeshift -pplaneshift + </div></p> +</div> <p><div class="commandBox"> mysql> source create_all.sql;<br> mysql> quit Modified: personal/kougaro/docs/history.txt =================================================================== --- personal/kougaro/docs/history.txt 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/docs/history.txt 2009-02-17 20:32:03 UTC (rev 3051) @@ -1,3 +1,82 @@ +*** 2009-02-15 by Stefano Angeleri +- Added a knownspell quest prerequisite operator + eg: <knownspell spell="Darkness" /> + where spell is the name of the spell we are looking for +- Removed a non working and deprecated /confirmgroupjoin, fixes to + /guildinfo and to the bugreport command patch by loyni + +*** 2009-02-14 by Stefano Angeleri +- Changed the marriage quest prerequisite operator to be easier + now it's just <married /> which will be true if the character is + married and false if he isn't. To get the the inverse value as true + (you want a not married character) just do <not><married /></not> + +*** 2009-02-13 by Stefano Angeleri +- Added a marriage quest prerequisite operator + eg: <marriage status="yes"> + status can be either yes or no. yes will return true if the character + is married else false. no will return true if the character isn't + married else false + + +*** 2009-02-11 by Kenny Graunke +- Patch for PS#2745 by Caarrie - the wrong sound resource was being used. +- Patch for PS#2745 by Loyni - fixes regressions in last fix for #2677. + +*** 2009-02-09 by Stefano Angeleri +- Fixed PS#2677 - server crash on opening skill window patch by loyni +- Fixed a bug in gender and race prerequiste operators +- Fixed missing icon during drag and drop patch by loyni + +*** 2009-02-08 by Stefano Angeleri +- Added an advisor point quest prerequisite + eg: <advisorpoint min="0" max="100" type="both"/> + min and max are the minimum and maximum advisor points where + the quest will be allowed to be taken + Type can have 3 values: + both = It means min and max will be taken in consideration + min = It means min will be taken in consideration + max = It means max will be taken in consideration +- Added a $time variable for npc texts which will be substituted to + morning/afternoon/evening/night depending on the hour patch by Lanarel + +*** 2009-02-08 by Stefano Angeleri +- Added an online time quest prerequisites + eg: <onlinetime min="0" max="100" type="both"/> + min and max are the minimum and maximum online time where + the quest will be allowed to be taken + Type can have 3 values: + both = It means min and max will be taken in consideration + min = It means min will be taken in consideration + max = It means max will be taken in consideration + +*** 2009-02-06 by Stefano Angeleri +- Added guild quest prerequisites eg: <guild type="public"/> + These are the allowed values: + none = the player isn't in a guild + public = the player is in a public guild + private = the player is in a private guild + both = the player is in a guild, regardless of it's public status +- Removed duplicate code in pawsdetailwindow + +*** 2009-02-05 by Stefano Angeleri +- Various fixes and clean ups by kougaro +- Completed work on the new descriptions +- Fixed an issue which would stop the player from editing his custom + life events if there was nothing in the tab +- Added the possibility to add little scripts which will define dynamically + generated life events based on the character faction points. The script + must be ordered from the absolute highest value to the lowest one. The + fact a number is negative doesn't matter so: 20 10 is correct, 20 -20 + 10 -10 is correct, 10 -20 is correct but 10 20 -10 -20 and 20 10 -10 -20 + are wrong. +- Added some sample data to faction.sql to demonstrate the dynamic life + events function, part of it was provided by Xillix +- Some commenting improvements +- Tab/spaces fixes +- Added race and gender quest prerequisites for race it's + <race name="Klyros"/> for gender it's <gender type="M"/> + *** 2009-02-03 by Stefano Angeleri - Made the editable life event field working in editing and reading from the description Modified: personal/kougaro/lang/italian/stringtable.xml =================================================================== --- personal/kougaro/lang/italian/stringtable.xml 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/lang/italian/stringtable.xml 2009-02-17 20:32:03 UTC (rev 3051) @@ -32,6 +32,7 @@ <item orig="Talk to people in your sector." trans="Parla alle persone nel tuo settore." /> <item orig="Factions:" trans="Fazioni:" /> <item orig="Paths" trans="Vie" /> + <item orig="male " trans="maschio di " /> <item orig="Active" trans="Attivo" /> <item orig="Creatures:" trans="" /> <item orig="View" trans="Vedi" /> @@ -132,6 +133,7 @@ <item orig="Upload!" trans="Carica!" /> <item orig="Deposit" trans="Deposita" /> <item orig="? Weight" trans="? Peso" /> + <item orig="You see a " trans="Vedi un " /> <item orig="No Target" trans="Nessuno obiettivo" /> <item orig="Tria" trans="" /> <item orig="Group text color" trans="" /> @@ -171,6 +173,9 @@ <item orig="mouse" trans="" /> <item orig="Various Skills List:" trans="" /> <item orig="Stats description:" trans="" /> + <item orig=" in front +of you named " trans=" davanti a te +chiamato " /> <item orig="Lets go !" trans="Andiamo!" /> <item orig="Account:" trans="" /> <item orig="%s %s" trans="%s %s" /> @@ -465,4 +470,4 @@ <item orig="Select a reward:" trans="Seleziona una ricompensa:" /> <item orig="Ambient Volume" trans="Volume Ambiente" /> <item orig="Hair Colour" trans="Colore Capelli" /> -</StringTable> \ No newline at end of file +</StringTable> Modified: personal/kougaro/psclient.cfg =================================================================== --- personal/kougaro/psclient.cfg 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/psclient.cfg 2009-02-17 20:32:03 UTC (rev 3051) @@ -213,5 +213,4 @@ PlaneShift.Graphics.EnableGrass = true Planeshift.Loading.AllMaps = false Planeshift.Loading.KeepMaps = false -Planeshift.Loading.PreloadModels = false -ThreadManager.AlwaysRunNow = true \ No newline at end of file +PlaneShift.Loading.WorldLoad = NThreaded \ No newline at end of file Modified: personal/kougaro/src/client/charapp.cpp =================================================================== --- personal/kougaro/src/client/charapp.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/charapp.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -25,11 +25,12 @@ //============================================================================= #include "charapp.h" #include "psengine.h" -#include "clientcachemanager.h" #include "pscelclient.h" #include "psclientchar.h" #include "globals.h" +static const uint meshCount = 9; +static const char* meshNames[meshCount] = { "Head", "Torso", "Hand", "Legs", "Foot", "Arm", "Eyes", "Hair", "Beard" }; psCharAppearance::psCharAppearance(iObjectRegistry* objectReg) { @@ -47,6 +48,7 @@ eyeColorSet = false; hairAttached = true; hairColorSet = false; + sneak = false; } psCharAppearance::~psCharAppearance() @@ -362,6 +364,7 @@ // If it's a new mesh attach that mesh. if ( mesh.Length() ) { + Error3("Attach mesh %s to slot %s", mesh.GetData(), slotname.GetData()); Attach(slotname, mesh); } @@ -513,45 +516,29 @@ bool psCharAppearance::Attach(const char* socketName, const char* meshFactName) { if (!socketName || !meshFactName) + { return false; + } csRef<iSpriteCal3DSocket> socket = state->FindSocket( socketName ); if ( !socket ) { - Notify2(LOG_CHARACTER, "Socket %s not found.", socketName ); + Error2("Socket %s not found.", socketName ); return false; } - csRef<iMeshFactoryWrapper> factory = engine->GetMeshFactories()->FindByName (meshFactName); - if ( !factory ) + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(meshFactName); + if(!factory.IsValid()) { - // Try loading the mesh again - csString filename; - if (!psengine->GetFileNameByFact(meshFactName, filename)) + Attachment attach; + attach.factName = meshFactName; + attach.socket = socket; + if(delayedAttach.IsEmpty()) { - Error2("Mesh Factory %s not found", meshFactName ); - return false; + psengine->RegisterDelayedLoader(this); } - - // Check for factory and set up callback if not loaded yet. - FactoryIndexEntry* fie = psengine->GetCacheManager()->GetFactoryEntry(filename); - if(!fie) - { - Attachment attach; - attach.filename = filename; - attach.socket = socket; - if(delayedAttach.IsEmpty()) - { - psengine->RegisterDelayedLoader(this); - } - delayedAttach.PushBack(attach); - } - else - { - factory = fie->factory; - ProcessAttach(factory, meshFactName, socket); - } + delayedAttach.PushBack(attach); } else { @@ -597,10 +584,10 @@ if(!delayedAttach.IsEmpty()) { Attachment attach = delayedAttach.Front(); - FactoryIndexEntry* fie = psengine->GetCacheManager()->GetFactoryEntry(attach.filename); - if(fie) + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(attach.factName); + if(factory.IsValid()) { - ProcessAttach(fie->factory, fie->factname, attach.socket); + ProcessAttach(factory, attach.factName, attach.socket); delayedAttach.PopFront(); } } @@ -843,3 +830,41 @@ this->hairColorSet = clone->hairColorSet; this->effectids = clone->effectids; } + +void psCharAppearance::SetSneak(bool sneaking) +{ + if(sneak != sneaking) + { + sneak = sneaking; + + if(sneaking) + { + baseMesh->SetRenderPriority(engine->GetRenderPriority("alpha")); + } + else + { + baseMesh->SetRenderPriority(engine->GetRenderPriority("object")); + } + + CS::ShaderVarStringID varName = stringSet->Request("alpha factor"); + for(uint i=0; i<meshCount; i++) + { + iShaderVariableContext* context = state->GetCoreMeshShaderVarContext(meshNames[i]); + if(context) + { + csShaderVariable* var = context->GetVariableAdd(varName); + if(var) + { + if(sneaking) + { + var->SetValue(0.5f); + } + else + { + var->SetValue(1.0f); + } + } + } + } + } +} Modified: personal/kougaro/src/client/charapp.h =================================================================== --- personal/kougaro/src/client/charapp.h 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/charapp.h 2009-02-17 20:32:03 UTC (rev 3051) @@ -136,6 +136,8 @@ void ClearEquipment(const char* slot = NULL); void CheckMeshLoad(); + + void SetSneak(bool sneaking); private: /** Parse a string from it's parts into a proper string. @@ -227,6 +229,8 @@ bool eyeColorSet; // Flag if eye colour set. bool hairColorSet; // Flag if hair colour set. + + bool sneak; // Flag if we're in sneak mode. csString faceMaterial; // Default face materail. csArray<SkinToneSet> skinToneSet; // Default skin colours. @@ -239,7 +243,7 @@ struct Attachment { csRef<iSpriteCal3DSocket> socket; - csString filename; + csString factName; }; csList<Attachment> delayedAttach; Modified: personal/kougaro/src/client/cmdgroups.cpp =================================================================== --- personal/kougaro/src/client/cmdgroups.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/cmdgroups.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -48,7 +48,6 @@ cmdsource->Subscribe("/groupremove",this); // remove player from group (leader only) cmdsource->Subscribe("/leavegroup",this); // name group level something (ranks) cmdsource->Subscribe("/groupmembers",this); // see list of members (optional level #) - cmdsource->Subscribe("/confirmgroupjoin", this ); } psGroupCommands::~psGroupCommands() @@ -58,7 +57,6 @@ cmdsource->Unsubscribe("/groupremove",this); // remove player from group (leader only) cmdsource->Unsubscribe("/leavegroup",this); cmdsource->Unsubscribe("/groupmembers",this); - cmdsource->Unsubscribe("/confirmgroupjoin", this ); } const char *psGroupCommands::HandleCommand(const char *cmd) @@ -72,5 +70,3 @@ { } - - Modified: personal/kougaro/src/client/cmdguilds.cpp =================================================================== --- personal/kougaro/src/client/cmdguilds.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/cmdguilds.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -47,8 +47,8 @@ iObjectRegistry* obj ) : psCmdBase(mh,ch,obj) { - cmdsource->Subscribe("/guildinfo",this); // create new guild (requires list of names) - cmdsource->Subscribe("/newguild",this); // create new guild (requires list of names) + cmdsource->Subscribe("/guildinfo",this); // displays + cmdsource->Subscribe("/newguild",this); // create new guild cmdsource->Subscribe("/endguild",this); // disband guild cmdsource->Subscribe("/guildinvite",this); // ask player to join guild cmdsource->Subscribe("/guildremove",this); // remove player from guild @@ -109,16 +109,20 @@ psGUIGuildMessage msg(psGUIGuildMessage::SUBSCRIBE_GUILD_DATA, "<x/>"); msg.SendMessage(); if ( words.GetCount() == 2 ) - { + { + if ((words[1]!="yes")&&(words[1]!="no")) + return "Syntax: /guildinfo yes|no"; + pawsCheckBox* onlineOnly = (pawsCheckBox*)PawsManager::GetSingleton().FindWidget("GuildWindow")->FindWidget("OnlineOnly"); + onlineOnly->SetState(words[1]=="yes"); csString command; command.Format("<r onlineonly=\"%s\"/>", (const char*)words[1] ); psGUIGuildMessage msg2(psGUIGuildMessage::SET_ONLINE, command ); - msg2.SendMessage(); - } + msg2.SendMessage(); + } else { csString command; - pawsCheckBox* onlineOnly = (pawsCheckBox*)PawsManager::GetSingleton().FindWidget("GuildWindow")->FindWidget("OnlineOnly"); + pawsCheckBox* onlineOnly = (pawsCheckBox*)PawsManager::GetSingleton().FindWidget("GuildWindow")->FindWidget("OnlineOnly"); command.Format("<r onlineonly=\"%s\"/>", onlineOnly->GetState() ? "yes":"no"); psGUIGuildMessage msg2(psGUIGuildMessage::SET_ONLINE, command ); msg2.SendMessage(); Modified: personal/kougaro/src/client/cmdusers.cpp =================================================================== --- personal/kougaro/src/client/cmdusers.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/cmdusers.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -832,10 +832,7 @@ cmdmsg.SendMessage(); } else - { - psUserCmdMessage cmdmsg(cmd); - cmdmsg.SendMessage(); - } + return "Mount not found!"; } else if(words[0] == "/unmount") { Modified: personal/kougaro/src/client/cmdutil.cpp =================================================================== --- personal/kougaro/src/client/cmdutil.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/cmdutil.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -242,7 +242,8 @@ //Write to the file psengine->GetVFS()->WriteFile (filename.GetData(), s.GetData(), s.Length()); - return "Saved graphic bug report (" + filename + "). Please take your time and read 'Bug Report' under 'Help Us' on www.hydlaa.com"; + return csString().Format("Saved graphic bug report (graphicbug%u.cam). " + "Report it to http://hydlaaplaza.com/flyspray/", reportNum); } Modified: personal/kougaro/src/client/gui/pawscharcreatemain.cpp =================================================================== --- personal/kougaro/src/client/gui/pawscharcreatemain.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawscharcreatemain.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -24,10 +24,10 @@ #include "../globals.h" #include "../charapp.h" +#include "engine/loader.h" #include "net/messages.h" #include "net/charmessages.h" #include "iclient/isoundmngr.h" -#include "clientcachemanager.h" #include "paws/pawsmanager.h" #include "paws/pawstextbox.h" @@ -1018,10 +1018,8 @@ createManager->SetGender( currentGender ); lastGender = -1; - csString factName = createManager->GetModelName( id, currentGender ); - - // Store the factory name and file name for the mesh - fileName.Format("/planeshift/models/%s/%s.cal3d",factName.GetData(), factName.GetData()); + // Store the factory name for the selected model. + factName = createManager->GetModelName( id, currentGender ); // Show the model for the selected race. view->Show(); @@ -1034,13 +1032,12 @@ { if(!loaded) { - FactoryIndexEntry* entry = psengine->GetCacheManager()->GetFactoryEntry(fileName); - - if(entry && entry->factory) + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); + if(factory.IsValid()) { - view->View(entry->factory); + view->View(factory); - iMeshWrapper * mesh = view->GetObject(); + iMeshWrapper* mesh = view->GetObject(); charApp->SetMesh(mesh); if (!mesh) { Modified: personal/kougaro/src/client/gui/pawscharcreatemain.h =================================================================== --- personal/kougaro/src/client/gui/pawscharcreatemain.h 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawscharcreatemain.h 2009-02-17 20:32:03 UTC (rev 3051) @@ -164,7 +164,7 @@ psCharAppearance* charApp; bool loaded; - csString fileName; + csString factName; }; Modified: personal/kougaro/src/client/gui/pawscharpick.cpp =================================================================== --- personal/kougaro/src/client/gui/pawscharpick.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawscharpick.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -24,6 +24,7 @@ #include "globals.h" #include "charapp.h" +#include "engine/loader.h" #include "pawscharpick.h" #include "pawsloginwindow.h" #include "paws/pawsbutton.h" @@ -36,7 +37,6 @@ #include "net/messages.h" #include "iclient/isoundmngr.h" #include "psnetmanager.h" -#include "clientcachemanager.h" #include "pscelclient.h" #include "psclientdr.h" @@ -523,11 +523,11 @@ { if(!loaded) { - FactoryIndexEntry* entry = psengine->GetCacheManager()->GetFactoryEntry(models[selectedCharacter].fileName); - if (entry && entry->factory) + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(models[selectedCharacter].factName); + if (factory.IsValid()) { psengine->UnregisterDelayedLoader(this); - view->View(entry->factory); + view->View(factory); iMeshWrapper * mesh = view->GetObject(); if (!mesh) Modified: personal/kougaro/src/client/gui/pawsdetailwindow.cpp =================================================================== --- personal/kougaro/src/client/gui/pawsdetailwindow.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawsdetailwindow.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -162,25 +162,25 @@ { psCharacterDetailsMessage msg(me); - if ( msg.requestor!="pawsDetailWindow" - && msg.requestor!="behaviorMsg" + if ( msg.requestor!="pawsDetailWindow" + && msg.requestor!="behaviorMsg" && msg.requestor!="ShowDetailsOp") return; //Begin sentence - csString str("You see a "); + csString str(PawsManager::GetSingleton().Translate("You see a ")); //Add gender switch(msg.gender) { case PSCHARACTER_GENDER_FEMALE: { - str.Append("female "); + str.Append(PawsManager::GetSingleton().Translate("female ")); break; } case PSCHARACTER_GENDER_MALE: { - str.Append("male "); + str.Append(PawsManager::GetSingleton().Translate("male ")); break; } case PSCHARACTER_GENDER_NONE: @@ -193,7 +193,7 @@ str.Append(msg.race); //Add seperator - str.Append(" in front\nof you named "); + str.Append(PawsManager::GetSingleton().Translate(" in front\nof you named ")); //Add name str.Append(msg.name); @@ -220,7 +220,9 @@ "epic descriptions of all sorts, quote great authors and even recite your own unpublished " "novels with no limitation whatsoever."); if(!storedoocdescription.Length()) //if the player didn't input anything in ooc description inform him - storedoocdescription = PawsManager::GetSingleton().Translate("Here you can place any OOC information except to advertise companies, products, or services from the real world.\n\nTo disable this feature delete everything in the window by using the Modify Description button."); + storedoocdescription = PawsManager::GetSingleton().Translate("Here you can place any OOC " + "information except to advertise companies, products, or services from the real world.\n\n" + "To disable this feature delete everything in the window by using the Modify Description button."); } else { @@ -228,7 +230,7 @@ } //checks what tabs should be shown - UpdateTabsVisibility(msg.skills.GetSize() != 0, storedcreationinfo.Length() != 0, + UpdateTabsVisibility(msg.skills.GetSize() != 0, storedcreationinfo.Length() != 0 || details_editable, storedoocdescription.Length() != 0 || details_editable); for(int i=0; i<6; i++) @@ -243,7 +245,7 @@ { skills[cat].Append(msg.skills[s].text); } - SelectTab((pawsWidget*)lastTab); + SelectTab((pawsWidget*)lastTab); } } @@ -260,7 +262,7 @@ } bool pawsDetailWindow::SelectTab( pawsWidget* widget ) -{ +{ switch ( widget->GetID() ) { case BTN_EDIT: @@ -284,7 +286,7 @@ case BTN_MAGIC: case BTN_JOBS: case BTN_VARIOUS: - { + { int id = widget->GetID() - 1000; if(id >= 0 && id < 6) { @@ -315,24 +317,16 @@ { lastTab->SetState(true); } + + if(details_editable) editButton->Show(); //if it's editable show the button + else editButton->Hide(); + if(widget->GetID() == BTN_DESCR) - { description->SetText(storedescription); - if(details_editable) editButton->Show(); //if it's editable show the button - else editButton->Hide(); - } else if(widget->GetID() == BTN_DESCRCC) - { description->SetText(storedcreationinfo); - if(details_editable) editButton->Show(); //if it's editable show the button - else editButton->Hide(); - } else - { description->SetText(storedoocdescription); - if(details_editable) editButton->Show(); //if it's editable show the button - else editButton->Hide(); - } break; } } Modified: personal/kougaro/src/client/gui/pawsgmspawn.cpp =================================================================== --- personal/kougaro/src/client/gui/pawsgmspawn.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawsgmspawn.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -20,10 +20,10 @@ #include <psconfig.h> #include <iutil/objreg.h> +#include "engine/loader.h" #include "net/cmdhandler.h" #include "net/msghandler.h" #include "net/messages.h" -#include "clientcachemanager.h" #include "../globals.h" #include "paws/pawslistbox.h" @@ -162,19 +162,11 @@ psString fact_name(item.mesh); fact_name.ReplaceAllSubString("$H", "stonebm"); item.mesh = fact_name; + factName = item.mesh; - psString file_name(filename); - file_name.ReplaceAllSubString("$H", "stonebm"); - filename = file_name; - - csRef<iMeshFactoryWrapper> factory = psengine->GetEngine()->GetMeshFactories()->FindByName (item.mesh); + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); if(!factory) { - // Try loading the mesh again - if (!psengine->GetFileNameByFact(item.mesh, filename)) - { - Error2("Mesh Factory %s not found", item.mesh.GetData() ); - } loaded = false; CheckMeshLoad(); } @@ -203,8 +195,7 @@ lockStr->SetText("5"); imagename->SetText(item.icon); factname->SetText(item.mesh); - //we need to check if the factory was found and get the updated filename to show it - meshname->SetText(item.mesh && psengine->GetFileNameByFact(item.mesh, filename) ? filename: ""); + meshname->SetText(item.name); cbLockable->Show(); cbLocked->Show(); @@ -230,12 +221,11 @@ { if(!loaded) { - FactoryIndexEntry* indexEntry = psengine->GetCacheManager()->GetFactoryEntry(filename); - - if(indexEntry && indexEntry->factory) + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); + if(factory.IsValid()) { psengine->UnregisterDelayedLoader(this); - objView->View(indexEntry->factory); + objView->View(factory); loaded = true; } else Modified: personal/kougaro/src/client/gui/pawsgmspawn.h =================================================================== --- personal/kougaro/src/client/gui/pawsgmspawn.h 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawsgmspawn.h 2009-02-17 20:32:03 UTC (rev 3051) @@ -72,7 +72,7 @@ csString currentItem; bool loaded; - csString filename; + csString factName; }; Modified: personal/kougaro/src/client/gui/pawssplashwindow.cpp =================================================================== --- personal/kougaro/src/client/gui/pawssplashwindow.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawssplashwindow.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -29,8 +29,7 @@ pawsSplashWindow::pawsSplashWindow() { - firstDraw = true; - playingSplashMusic = false; + firstDraw = true; } pawsSplashWindow::~pawsSplashWindow() @@ -38,9 +37,7 @@ } bool pawsSplashWindow::PostSetup() -{ - bar = (pawsProgressBar*) FindWidget("Progress"); - bar->Hide(); +{ return true; } @@ -54,21 +51,11 @@ return; } - if ( !playingSplashMusic) - { - if(psengine->GetSoundStatus() && psengine->PreloadingModels()) - { - psengine->GetSoundManager()->StartMusicSound("splash"); - } - psengine->Initialize( 1 ); - playingSplashMusic=true; - } - - - if ( bar->IsDone() ) - { - PawsManager::GetSingleton().LoadWidget("data/gui/loginwindow.xml"); - Hide(); - } + psengine->Initialize(1); + PawsManager::GetSingleton().LoadWidget("data/gui/loginwindow.xml"); + Hide(); + PawsManager::GetSingleton().GetMouse()->ChangeImage("Standard Mouse Pointer"); + PawsManager::GetSingleton().GetMouse()->Hide(false); + delete this; } Modified: personal/kougaro/src/client/gui/pawssplashwindow.h =================================================================== --- personal/kougaro/src/client/gui/pawssplashwindow.h 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/gui/pawssplashwindow.h 2009-02-17 20:32:03 UTC (rev 3051) @@ -33,10 +33,7 @@ void Draw(); private: - bool firstDraw; - bool playingSplashMusic; - - pawsProgressBar* bar; + bool firstDraw; }; CREATE_PAWS_FACTORY( pawsSplashWindow ); Modified: personal/kougaro/src/client/modehandler.cpp =================================================================== --- personal/kougaro/src/client/modehandler.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/modehandler.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -367,7 +367,7 @@ break; case psModeMessage::DEAD: if (soundmanager->PlayingMusic()) - soundmanager->OverrideBGSong("death",iSoundManager::LOOP_SOUND); + soundmanager->OverrideBGSong("sound.msg.death",iSoundManager::LOOP_SOUND); break; } } Modified: personal/kougaro/src/client/pscelclient.cpp =================================================================== --- personal/kougaro/src/client/pscelclient.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/pscelclient.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -82,7 +82,6 @@ #include "psclientdr.h" #include "entitylabels.h" #include "shadowmanager.h" -#include "clientcachemanager.h" #include "pscharcontrol.h" #include "psclientchar.h" #include "pscal3dcallback.h" @@ -207,7 +206,7 @@ bool psCelClient::IsReady() { if ( local_player == NULL || - (!psengine->ThreadedLoading() && gameWorld == NULL)) + (!psengine->ThreadedWorldLoading() && gameWorld == NULL)) return false; else return true; @@ -215,11 +214,11 @@ void psCelClient::HandleWorld( MsgEntry* me ) { - if(!psengine->ThreadedLoading()) + if(!psengine->ThreadedWorldLoading()) { psPersistWorld mesg( me ); gameWorld = new psWorld; - gameWorld->Initialize(object_reg, psengine->UnloadingLast(), psengine->GetGFXFeatures()); + gameWorld->Initialize(object_reg, psengine->GetGFXFeatures()); zonehandler->SetWorld(gameWorld); zonehandler->LoadZone(mesg.sector); @@ -313,29 +312,11 @@ { local_player->charApp->ClearEquipment(); - csRef<iMeshFactoryWrapper> factory = psengine->GetEngine()->GetMeshFactories()->FindByName(mesg.factname); - if (!factory) + csRef<iMeshFactoryWrapper> factory; + while(!factory.IsValid()) { - // Try loading the mesh from file - csString filename; - if (!psengine->GetFileNameByFact(mesg.factname, filename)) - { - Error2( "Mesh Factory %s not found", mesg.factname.GetData() ); - return; - } - FactoryIndexEntry* fie = psengine->GetCacheManager()->GetFactoryEntry(filename); - while(!fie) - { - csSleep(100); - fie = psengine->GetCacheManager()->GetFactoryEntry(filename); - } - factory = fie->factory; - if(!factory) - { - Error2("Couldn't morph main player! Factory %s doesn't exist!", mesg.factname.GetData() ); - return; - } - } + factory = psengine->GetLoader()->LoadFactory(mesg.factname); + } // New or resetting? if (local_player_defaultFactName != mesg.factname) @@ -364,7 +345,7 @@ } // Update factory - local_player->factname = mesg.factname; + local_player->factName = mesg.factname; // Update cal3d @@ -1218,24 +1199,10 @@ { replacement = cel->GetMainPlayer()->helmGroup; } - psString factoryName(factname); + psString factoryName(factName); factoryName.ReplaceAllSubString("$H", replacement); + factName = factoryName; - csRef<iMeshFactoryWrapper> factory = psengine->GetEngine()->GetMeshFactories()->FindByName (factoryName); - if ( !factory ) - { - // Try loading the mesh again - if (!psengine->GetFileNameByFact(factoryName, filename)) - { - Error2( "Mesh Factory %s not found.\nTrying to use a sack instead.", factoryName.GetData() ); - if (!psengine->GetFileNameByFact("items#sack02a", filename)) - { - Error1( "Replacement Mesh Factory items#sack02a not found.\nGiving up loading the mesh."); - return false; - } - } - } - // Set up callback. psengine->RegisterDelayedLoader(this); @@ -1247,20 +1214,18 @@ void GEMClientObject::CheckMeshLoad() { - FactoryIndexEntry* fie = psengine->GetCacheManager()->GetFactoryEntry(filename); - if(!fie) + csRef<iMeshFactoryWrapper> factory = psengine->GetLoader()->LoadFactory(factName); + if(!factory.IsValid()) { return; } - csRef<iMeshFactoryWrapper> factory = fie->factory; - pcmesh = factory->CreateMeshWrapper(); psengine->GetEngine()->GetMeshes()->Add(pcmesh); if (!pcmesh) { - Error2("Could not create Item because could not load %s file into mesh.", factname.GetData()); + Error2("Could not create Item because could not load %s file into mesh.", factName.GetData()); return; } @@ -1316,8 +1281,7 @@ linmove = 0; groupID = mesg.groupID; gender = mesg.gender; - filename = mesg.filename; - factname = mesg.factname; + factName = mesg.factname; ownerEID = mesg.ownerEID; lastSentVelocity = lastSentRotation = 0.0f; stationary = true; @@ -1340,7 +1304,7 @@ equipment = mesg.equipment; if ( helmGroup.Length() == 0 ) - helmGroup = factname; + helmGroup = factName; Debug3(LOG_CELPERSIST, 0, "Actor %s(%s) Received", mesg.name.GetData(), ShowID(mesg.entityid)); @@ -1749,6 +1713,15 @@ bool useZ = ABS(velocity.z) > ABS(velocity.x); float cal3dvel = useZ ? velocity.z : velocity.x; cal3dstate->SetVelocity(-cal3dvel, &psengine->GetRandomGen()); + + if(abs(cal3dvel) <= 2 && abs(cal3dvel) >= 1) + { + charApp->SetSneak(true); + } + else + { + charApp->SetSneak(false); + } } void GEMClientActor::SetMode(uint8_t mode, bool newactor) @@ -1858,8 +1831,7 @@ name = mesg.name; Debug3(LOG_CELPERSIST, 0, "Item %s(%s) Received", mesg.name.GetData(), ShowID(mesg.eid)); type = mesg.type; - filename = mesg.filename; - factname = mesg.factname; + factName = mesg.factname; solid = 0; pos = mesg.pos; xRot = mesg.xRot; Modified: personal/kougaro/src/client/pscelclient.h =================================================================== --- personal/kougaro/src/client/pscelclient.h 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/pscelclient.h 2009-02-17 20:32:03 UTC (rev 3051) @@ -344,7 +344,7 @@ virtual const char* GetName() { return name; } virtual void ChangeName(const char* name); - const char* GetFactName() { return factname; } + const char* GetFactName() { return factName; } psEffect* GetEntityLabel() { return entitylabel; } void SetEntityLabel(psEffect* el) { entitylabel = el; } @@ -391,8 +391,7 @@ static psCelClient *cel; csString name; - csString factname; - csString filename; + csString factName; EID eid; int type; Modified: personal/kougaro/src/client/psclientchar.cpp =================================================================== --- personal/kougaro/src/client/psclientchar.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/psclientchar.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -421,6 +421,8 @@ Error2("Got equipment for actor %d, but couldn't find it!", playerID); return; } + + Error2("Got equipment for actor %d", playerID); csString slotname(psengine->slotName.GetName(equip.slot)); Modified: personal/kougaro/src/client/psengine.cpp =================================================================== --- personal/kougaro/src/client/psengine.cpp 2009-02-17 18:15:52 UTC (rev 3050) +++ personal/kougaro/src/client/psengine.cpp 2009-02-17 20:32:03 UTC (rev 3051) @@ -118,7 +118,6 @@ #include "util/consoleout.h" #include "entitylabels.h" #include "chatbubbles.h" -#include "clientcachemanager.h" #include "questionclient.h" ///////////////////////////////////////////////////////////////////////////// @@ -219,7 +218,6 @@ loadstate = LS_NONE; loadError = false; - cachemanager = NULL; charmanager = NULL; guiHandler = NULL; charController = NULL; @@ -234,11 +232,6 @@ loadtimeout = 10; // Default load timeout - modelsInit = false; - preloadModels = false; - modelsLoaded = false; - okToLoadModels = false; - modelToLoad = (size_t)-1; drawScreen = true; cal3DCallbackLoader = csPtr<psCal3DCallbackLoader> (new psCal3DCallbackLoader(objectreg)); @@ -299,7 +292,6 @@ delete paws; // Include delete of mainWidget delete questionclient; - delete cachemanager; delete slotManager; delete mouseBinds; delete guiHandler; @@ -389,9 +381,6 @@ return false; } - // Check if we're preloading models. - preloadModels = (cmdline->GetBoolOption("preload_models", false) || GetConfig()->GetBool("PlaneShift.Loading.PreloadModels", false)); - // Check if we're using basic or more advanced shaders. csString advanced("Advanced"); if(advanced.CompareNoCase(GetConfig()->GetStr("PlaneShift.Graphics.Shaders"))) @@ -534,7 +523,54 @@ } else if (level==1) { + threadedWorldLoading = csString("Threaded").Compare(psengine->GetConfig()->GetStr("PlaneShift.Loading.WorldLoad", "NThreaded")); + loader = new Loader(); + Loader::GetSingleton().Init(object_reg, gfxFeatures, 200); + // Fill the loader cache. + csRef<iStringArray> dirs = vfs->FindFiles("/planeshift/models/"); + for(size_t i=0; i<dirs->GetSize(); ++i) + { + csRef<iStringArray> files = vfs->FindFiles(dirs->Get(i)); + for(size_t j=0; j<files->GetSize(); ++j) + { + csString file = files->Get(j); + if(file.Find(".cal3d", file.Length()-7) != size_t(-1)) + { + modelPrecaches.Push(Loader::GetSingleton().PrecacheData(files->Get(j), false)); + } + } + } + + dirs = vfs->FindFiles("/planeshift/"); + for(size_t i=0; i<dirs->GetSize(); ++i) + { + csRef<iStringArray> files = vfs->FindFiles(dirs->Get(i)); + for(size_t j=0; j<files->GetSize(); ++j) + { + csString file = files->Get(j); + if(file.Find(".meshfact", file.Length()-10) != size_t(-1)) + { + modelPrecaches.Push(Loader::GetS... [truncated message content] |
From: <ko...@us...> - 2009-02-28 00:51:07
|
Revision: 3117 http://planeshift.svn.sourceforge.net/planeshift/?rev=3117&view=rev Author: kougaro Date: 2009-02-28 00:33:48 +0000 (Sat, 28 Feb 2009) Log Message: ----------- merged r3051-3116 from trunk Modified Paths: -------------- personal/kougaro/data/gui/buddy.xml personal/kougaro/data/gui/chat.xml personal/kougaro/data/gui/configkeys.xml personal/kougaro/data/gui/configsound.xml personal/kougaro/data/gui/configwindow.xml personal/kougaro/data/gui/gmguiwindow.xml personal/kougaro/data/gui/helpwindow.xml personal/kougaro/data/gui/ok.xml personal/kougaro/data/gui/petition.xml personal/kougaro/data/gui/petitiongm.xml personal/kougaro/data/gui/pslaunch.xml personal/kougaro/data/gui/questnotebook.xml personal/kougaro/data/gui/quitinfo.xml personal/kougaro/data/gui/shortcutwindow.xml personal/kougaro/data/gui/spellwindow.xml personal/kougaro/data/gui/styles.xml personal/kougaro/data/gui/yesno.xml personal/kougaro/data/help.xml personal/kougaro/data/options/shortcutcommands_def.xml personal/kougaro/data/options/sound_def.xml personal/kougaro/docs/history.txt personal/kougaro/docs/todo.txt personal/kougaro/pslaunch.cfg personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/gui/inventorywindow.cpp personal/kougaro/src/client/gui/pawsbuddy.cpp personal/kougaro/src/client/gui/pawsbuddy.h personal/kougaro/src/client/gui/pawscharcreatemain.cpp personal/kougaro/src/client/gui/pawsconfigsound.cpp personal/kougaro/src/client/gui/pawsconfigsound.h personal/kougaro/src/client/gui/pawscreditswindow.cpp personal/kougaro/src/client/gui/pawsgameboard.cpp personal/kougaro/src/client/gui/pawsgroupwindow.cpp personal/kougaro/src/client/gui/pawshelp.cpp personal/kougaro/src/client/gui/pawsilluminationwindow.cpp personal/kougaro/src/client/gui/pawspetitiongmwindow.cpp personal/kougaro/src/client/gui/pawspetitiongmwindow.h personal/kougaro/src/client/gui/pawspetitionwindow.cpp personal/kougaro/src/client/gui/pawspetitionwindow.h personal/kougaro/src/client/gui/pawsquestwindow.cpp personal/kougaro/src/client/gui/pawsquestwindow.h personal/kougaro/src/client/gui/pawsslot.cpp personal/kougaro/src/client/gui/psmainwidget.cpp personal/kougaro/src/client/gui/shortcutwindow.cpp personal/kougaro/src/client/gui/shortcutwindow.h personal/kougaro/src/client/iclient/isoundmngr.h personal/kougaro/src/client/modehandler.cpp personal/kougaro/src/client/psengine.cpp personal/kougaro/src/client/sound/pssoundmngr.cpp personal/kougaro/src/client/sound/pssoundmngr.h personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/paws/pawsborder.cpp personal/kougaro/src/common/paws/pawsbutton.cpp personal/kougaro/src/common/paws/pawscrollbar.cpp personal/kougaro/src/common/paws/pawscrollbar.h personal/kougaro/src/common/paws/pawsframedrawable.cpp personal/kougaro/src/common/paws/pawsframedrawable.h personal/kougaro/src/common/paws/pawsimagedrawable.h personal/kougaro/src/common/paws/pawslistbox.cpp personal/kougaro/src/common/paws/pawsmanager.cpp personal/kougaro/src/common/paws/pawsmanager.h personal/kougaro/src/common/paws/pawsprogressbar.cpp personal/kougaro/src/common/paws/pawspromptwindow.cpp personal/kougaro/src/common/paws/pawsspinbox.cpp personal/kougaro/src/common/paws/pawsspinbox.h personal/kougaro/src/common/paws/pawsstringpromptwindow.cpp personal/kougaro/src/common/paws/pawsstringpromptwindow.h personal/kougaro/src/common/paws/pawsstyles.cpp personal/kougaro/src/common/paws/pawstabwindow.cpp personal/kougaro/src/common/paws/pawstabwindow.h personal/kougaro/src/common/paws/pawstextbox.cpp personal/kougaro/src/common/paws/pawstexturemanager.cpp personal/kougaro/src/common/paws/pawstexturemanager.h personal/kougaro/src/common/paws/pawstextwrap.cpp personal/kougaro/src/common/paws/pawstree.cpp personal/kougaro/src/common/paws/pawswidget.cpp personal/kougaro/src/common/paws/pawswidget.h personal/kougaro/src/common/paws/pawsyesnobox.cpp personal/kougaro/src/common/paws/pawsyesnobox.h personal/kougaro/src/common/util/psxmlparser.cpp personal/kougaro/src/npcclient/npc.cpp personal/kougaro/src/npcclient/pathfind.h personal/kougaro/src/npcclient/tribe.h personal/kougaro/src/npcclient/tribeneed.h personal/kougaro/src/npcclient/walkpoly.h personal/kougaro/src/pslaunch/pawslauncherwindow.cpp personal/kougaro/src/pslaunch/pawslauncherwindow.h personal/kougaro/src/pslaunch/pslaunch.cpp personal/kougaro/src/pslaunch/updaterengine.cpp personal/kougaro/src/pslaunch/updaterengine.h personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/adminmanager.h personal/kougaro/src/server/bulkobjects/dictionary.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.cpp personal/kougaro/src/server/bulkobjects/psitem.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/commandmanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/guildmanager.cpp personal/kougaro/src/server/msgmanager.cpp personal/kougaro/src/server/msgmanager.h personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserver.h personal/kougaro/src/server/slotmanager.cpp personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/workmanager.h personal/kougaro/src/tools/pawseditor/pawseditorapp.cpp Property Changed: ---------------- personal/kougaro/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972,2975-3050 + /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972,2975-3050,3052-3116 Modified: personal/kougaro/data/gui/buddy.xml =================================================================== --- personal/kougaro/data/gui/buddy.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/buddy.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,69 +1,37 @@ <widget_description> <widget name="BuddyWindow" factory="pawsBuddyWindow" - visible="no" savepositions="yes" movable="yes" keepaspect="no" configurable="yes" resizable="yes"> + visible="no" savepositions="yes" movable="yes" keepaspect="no" configurable="yes" resizable="yes" style="New Standard GUI"> <frame x="0" y="100" width="170" height="290" border="yes" /> <minframe width="165" height="230" /> - <maxframe width="355" height="860" /> - <title resource="Blue Title" text="Buddy List" align="left" close_button="yes" /> - <bgimage resource="Buddy Background" alpha="128" /> - - + <maxframe width="355" height="860" /> + + <title resource="Scaling Title Bar" text="Buddy List" align="left" close_button="yes" /> + <widget name="BuddyList" factory="pawsListBox" > - <frame x="33" y="33" width="135" height="219" border="no" /> - <highlight resource="Hightlight" alpha="128" /> + <frame x="12" y="12" width="145" height="240" border="no" /> <columns height="16"> <column width="250" > - <widget name="Name" factory="pawsTextBox"> + <widget name="Name" factory="pawsTextBox" border="yes"> <font name="/planeshift/data/ttf/LiberationMono-Regular.ttf" size="10" scalefont="no" /> </widget> </column> </columns> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> </widget> - <widget name="edit" factory="pawsButton" toggle="no" id="4000" shadows="yes"> - <frame x="5" y="263" width="40" height="20" border="yes" /> - <buttonup resource="Standard Button" /> - <buttondown resource="Standard Button" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="ATTACH_LEFT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_BOTTOM" /> - </attachpoints> + <widget name="edit" factory="pawsButton" id="4000"> + <frame x="10" y="263" width="35" height="20" border="no" /> <label text="Edit" /> </widget> - <widget name="add" factory="pawsButton" toggle="no" id="3000" shadows="yes"> - <frame x="50" y="263" width="40" height="20" border="yes" /> - <buttonup resource="Standard Button" /> - <buttondown resource="Standard Button" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_BOTTOM" /> - </attachpoints> + <widget name="add" factory="pawsButton" id="3000"> + <frame x="65" y="263" width="30" height="20" border="no" /> <label text="Add" /> </widget> - <widget name="remove" factory="pawsButton" toggle="no" id="2000" shadows="yes"> - <frame x="95" y="263" width="60" height="20" border="yes" /> - <buttonup resource="Standard Button" /> - <buttondown resource="Standard Button" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_BOTTOM" /> - </attachpoints> + <widget name="remove" factory="pawsButton" id="2000"> + <frame x="120" y="263" width="40" height="20" border="no" /> <label text="Remove" /> </widget> Modified: personal/kougaro/data/gui/chat.xml =================================================================== --- personal/kougaro/data/gui/chat.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/chat.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,229 +1,106 @@ <widget_description> - <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="no" configurable="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" /> + <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="no" configurable="yes" style="New Standard GUI"> <frame x="360" y="300" width="330" height="122" border="no" /> <minframe width="280" height="110" /> - <bgimage resource="Chat Background" alpha="128" /> <title resource="Nanaki Title Bar" text="Communication" align="left" close_button="yes"/> - <childborders> - <colour r="0" g="0" b="0" /> - <colour r="0" g="0" b="255" /> - <colour r="32" g="32" b="32" /> - <colour r="148" g="138" b="255" /> - <colour r="64" g="64" b="64" /> - </childborders> <widget name="InputText" factory="pawsEditTextBox"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="9" scalefont="no" /> - <frame x="18" y="90" width="287" height="15" border="no" /> + <frame x="6" y="100" width="315" height="20" border="yes" /> <attachpoints> <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_BOTTOM" /> <attach point="ATTACH_LEFT" /> </attachpoints> </widget> <widget name="Chat Tabs" factory="pawsTabWindow"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="9" scalefont="no" /> - <frame x="6" y="2" width="330" height="100" border="no" /> + + <defaultstyle widget="pawsButton" style="New Standard Tab"/> + + <frame x="6" y="2" width="320" height="95" border="no" /> <attachpoints> <attach point="ATTACH_RIGHT" /> <attach point="ATTACH_TOP" /> <attach point="ATTACH_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> + <attach point="ATTACH_BOTTOM" /> </attachpoints> - <childborders> + <!--childborders> <colour r="0" g="0" b="0" /> <colour r="32" g="32" b="32" /> <colour r="180" g="180" b="180" /> <colour r="180" g="180" b="180" /> <colour r="220" g="220" b="220" /> - </childborders> - <widget name="Main Button" factory="pawsButton" toggle="yes" id="1000" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="19" y="0" width="25" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + </childborders--> + + <widget name="Main Button" factory="pawsButton" id="1000" shadows="yes"> <label text="Main" /> + <frame x="0" y="5" width="25" height="16" border="no" /> </widget> - <widget name="NPC Button" factory="pawsButton" toggle="yes" id="1002" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="45" y="0" width="30" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="NPC Button" factory="pawsButton" id="1002" shadows="yes"> <label text="NPC" /> + <frame x="25" y="5" width="30" height="16" border="no" /> </widget> - <widget name="Tell Button" factory="pawsButton" toggle="yes" id="1003" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="76" y="0" width="30" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Tell Button" factory="pawsButton" id="1003" shadows="yes"> <label text="Tells" /> + <frame x="56" y="5" width="30" height="16" border="no" /> </widget> - <widget name="Guild Button" factory="pawsButton" toggle="yes" id="1004" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="107" y="0" width="35" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Guild Button" factory="pawsButton" id="1004" shadows="yes"> <label text="Guild" /> + <frame x="87" y="5" width="35" height="16" border="no" /> </widget> - <widget name="Group Button" factory="pawsButton" toggle="yes" id="1005" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="143" y="0" width="35" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Group Button" factory="pawsButton" id="1005" shadows="yes"> <label text="Group" /> + <frame x="123" y="5" width="35" height="16" border="no" /> </widget> - <widget name="Auction Button" factory="pawsButton" toggle="yes" id="1006" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="179" y="0" width="40" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Auction Button" factory="pawsButton" id="1006" shadows="yes"> <label text="Auction" /> + <frame x="159" y="5" width="40" height="16" border="no" /> </widget> - <widget name="System Button" factory="pawsButton" toggle="yes" id="1001" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="220" y="0" width="45" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="System Button" factory="pawsButton" id="1001"> <label text="System" /> + <frame x="200" y="5" width="45" height="16" border="no" /> </widget> - <widget name="Help Button" factory="pawsButton" toggle="yes" id="1007" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="285" y="0" width="30" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <widget name="Help Button" factory="pawsButton" id="1007"> <label text="Help" /> + <frame x="285" y="5" width="30" height="16" border="no" /> </widget> <widget name="MainText" factory="pawsMessageTextBox" visible="no" id="1100"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="SystemText" factory="pawsMessageTextBox" visible="no" id="1101"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="NpcText" factory="pawsMessageTextBox" visible="no" id="1102"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="TellText" factory="pawsMessageTextBox" visible="no" id="1103"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="GuildText" factory="pawsMessageTextBox" visible="no" id="1104"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="GroupText" factory="pawsMessageTextBox" visible="no" id="1105"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="AuctionText" factory="pawsMessageTextBox" visible="no" id="1106"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="HelpText" factory="pawsMessageTextBox" visible="no" id="1107"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> </widget> </widget> Modified: personal/kougaro/data/gui/configkeys.xml =================================================================== --- personal/kougaro/data/gui/configkeys.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/configkeys.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,7 +1,10 @@ <widget_description> <widget name="ConfigKeysTree" factory="pawsTreeNode" - visible="yes" savepositions="no" movable="no" resizable="no" > - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + visible="yes" savepositions="no" movable="no" resizable="no" > + + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <bgimage resource="Scaling Widget Background" /> + <widget factory="pawsSeqTreeNode"> <widget factory="pawsWidgetTreeNode" name="Movement"> <nodewidget> Modified: personal/kougaro/data/gui/configsound.xml =================================================================== --- personal/kougaro/data/gui/configsound.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/configsound.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,89 +1,103 @@ <widget_description> <widget name="ConfigPvPTree" factory="pawsConfigPvP" visible="no" savepositions="no" movable="no" resizable="no" >\ - <frame x="225" y="10" width="400" height="300" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - + <frame x="225" y="10" width="400" height="300" border="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <widget name="music" factory="pawsCheckBox"> <frame x="10" y="10" width="190" height="20" /> <text string="Background music"/> </widget> - + <widget name="ambient" factory="pawsCheckBox"> - <frame x="10" y="40" width="190" height="20" /> + <frame x="10" y="35" width="190" height="20" /> <text string="Ambient sounds"/> </widget> - + <widget name="actions" factory="pawsCheckBox"> - <frame x="10" y="70" width="190" height="20" /> + <frame x="10" y="60" width="190" height="20" /> <text string="Actions sounds"/> </widget> - + <widget name="gui" factory="pawsCheckBox"> - <frame x="10" y="100" width="190" height="20" /> + <frame x="10" y="85" width="190" height="20" /> <text string="Interface sounds"/> </widget> - + + <widget name="voices" factory="pawsCheckBox"> + <frame x="10" y="110" width="190" height="20" /> + <text string="Voices"/> + </widget> + <widget name="" factory="pawsTextBox"> <frame x="10" y="140" width="140" height="20" /> <text string="Master Volume"/> </widget> - + <widget name="generalVol" factory="pawsScrollBar" direction="horizontal" > <frame x="150" y="140" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> <frame x="10" y="170" width="140" height="20" /> <text string="Music Volume"/> </widget> - + <widget name="musicVol" factory="pawsScrollBar" direction="horizontal" > <frame x="150" y="170" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> - <frame x="10" y="200" width="140" height="20" /> + <frame x="10" y="195" width="140" height="20" /> <text string="Ambient Volume"/> </widget> - + <widget name="ambientVol" factory="pawsScrollBar" direction="horizontal" > - <frame x="150" y="200" width="100" height="15" border="no" /> + <frame x="150" y="195" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> - <frame x="10" y="230" width="140" height="20" /> + <frame x="10" y="220" width="140" height="20" /> <text string="Actions Volume"/> </widget> - + <widget name="actionsVol" factory="pawsScrollBar" direction="horizontal" > - <frame x="150" y="230" width="100" height="15" border="no" /> + <frame x="150" y="220" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> - <frame x="10" y="260" width="140" height="20" /> + <frame x="10" y="245" width="140" height="20" /> <text string="Interface Volume"/> </widget> - - <widget name="guiVol" factory="pawsScrollBar" direction="horizontal" > - <frame x="150" y="260" width="100" height="15" border="no" /> + + <widget name="guiVol" factory="pawsScrollBar" direction="horizontal" > + <frame x="150" y="245" width="100" height="15" border="no" /> </widget> - - <widget name="muteOnFocusLoss" factory="pawsCheckBox"> - <frame x="10" y="280" width="220" height="20" /> - <text string="Mute sounds on focus loss"/> + + <widget name="" factory="pawsTextBox"> + <frame x="10" y="270" width="140" height="20" /> + <text string="Voices Volume"/> </widget> - + + <widget name="voicesVol" factory="pawsScrollBar" direction="horizontal" > + <frame x="150" y="270" width="100" height="15" border="no" /> + </widget> + <widget name="combatMusic" factory="pawsCheckBox"> <frame x="200" y="10" width="220" height="20" /> <text string="Combat music"/> </widget> <widget name="loopBGM" factory="pawsCheckBox"> - <frame x="200" y="40" width="220" height="20" /> + <frame x="200" y="35" width="220" height="20" /> <text string="Loop background music"/> </widget> + <widget name="muteOnFocusLoss" factory="pawsCheckBox"> + <frame x="200" y="60" width="220" height="20" /> + <text string="Mute on focus loss"/> + </widget> + </widget> -</widget_description> \ No newline at end of file +</widget_description> Modified: personal/kougaro/data/gui/configwindow.xml =================================================================== --- personal/kougaro/data/gui/configwindow.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/configwindow.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,21 +1,18 @@ <?xml version="1.0"?> <widget_description> -<widget name="ConfigWindow" factory="pawsConfigWindow" +<pawsConfigWindow name="ConfigWindow" visible="no" savepositions="yes" movable="yes" resizable="no" - configurable="yes" > + configurable="yes" style="New Standard GUI"> <frame x="10" y="100" width="680" height="346" border="yes" /> - <title resource="Blue Title" text="Options" align="left" close_button="yes"/> - <bgimage resource="Config Background" alpha="128"/> + <title resource="Scaling Title Bar" text="Options" align="left" close_button="yes"/> + + <pawsSimpleTree name="ConfigTree" > - <widget name="ConfigTree" factory="pawsSimpleTree" > - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - <frame x="10" y="10" width="200" height="300" border="no" /> - <bgimage resource="Options Background" /> - + <widget factory="pawsSimpleTreeNode"> <frame x="225" y="10" width="400" height="300" border="yes" /> @@ -32,10 +29,10 @@ <attr name="SectionName" value="entityinteract"/> <attr name="factory" value="pawsConfigEntityInteraction"/> </widget> - </widget> + </widget> <widget factory="pawsSimpleTreeNode" label="Graphics"> - <widget factory="pawsSimpleTreeNode" label="Camera"> + <widget factory="pawsSimpleTreeNode" label="Camera"> <attr name="SectionName" value="camera"/> <attr name="factory" value="pawsConfigCamera"/> </widget> @@ -53,12 +50,12 @@ </widget> </widget> - <widget factory="pawsSimpleTreeNode" label="Sound"> + <widget factory="pawsSimpleTreeNode" label="Sound"> <widget factory="pawsSimpleTreeNode" label="General"> <attr name="SectionName" value="configsound"/> <attr name="factory" value="pawsConfigSound"/> </widget> - </widget> + </widget> <widget factory="pawsSimpleTreeNode" label="PvP"> <widget factory="pawsSimpleTreeNode" label="Confirmation"> @@ -83,27 +80,23 @@ <widget factory="pawsSimpleTreeNode" label="Chat - Bubbles"> <attr name="SectionName" value="chatbubbles"/> <attr name="factory" value="pawsConfigChatBubbles"/> - </widget> + </widget> </widget> </widget> - </widget> + </pawsSimpleTree> - <widget name="OKButton" factory="pawsButton" id="-10" toggle="no"> + <pawsButton name="OKButton" id="-10" toggle="no"> <frame x="10" y="320" width="80" height="20" border="no"/> - <buttonup resource="Blue Title"/> - <buttondown resource="Blue Title"/> <label text="Save"/> - </widget> + </pawsButton> - <widget name="ResetButton" factory="pawsButton" id="-20" toggle="no"> + <pawsButton name="ResetButton" id="-20" toggle="no"> <frame x="100" y="320" width="80" height="20" border="no"/> - <buttonup resource="Blue Title"/> - <buttondown resource="Blue Title"/> <label text="Reset"/> - </widget> + </pawsButton> -</widget> +</pawsConfigWindow> </widget_description> \ No newline at end of file Modified: personal/kougaro/data/gui/gmguiwindow.xml =================================================================== --- personal/kougaro/data/gui/gmguiwindow.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/gmguiwindow.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,9 +1,9 @@ <widget_description> - <widget name="GmGUI" factory="pawsGmGUIWindow" style="topwindow"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> - <frame x="0" y="0" width="630" height="425" /> - <title text="Game Master Options" /> - <bgimage resource="GM Background" /> + <widget name="GmGUI" factory="pawsGmGUIWindow" + visible="no" savepositions="yes" movable="yes" + resizable="no" style="New Standard GUI"> + <frame x="0" y="0" width="630" height="425" border="yes"/> + <title resource="Scaling Title Bar" text="Game Master Options" align="left" close_button="yes" /> <widget name="GM Tabs" factory="pawsTabWindow" style="tabwindow"> <frame y="0" width="630" height="425" /> @@ -15,31 +15,16 @@ </attachpoints> <!-- Tabs, there are three tabs. --> <widget name="Players Button" factory="pawsButton" style="tabbuttonskills" id="1000"> - <frame x="20" y="7" width="69" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <frame x="20" y="5" width="69" height="20" /> <label text="Players" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="ATTACH_LEFT" /> - </attachpoints> </widget> <widget name="Action Button" factory="pawsButton" style="tabbuttonskills" id="1002"> - <frame x="89" y="7" width="69" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <frame x="89" y="5" width="69" height="20" /> <label text="Actions" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - </attachpoints> </widget> <widget name="Attributes Button" factory="pawsButton" style="tabbuttonskills" id="1003" > - <frame x="158" y="7" width="69" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <frame x="158" y="5" width="69" height="20" /> <label text="Attributes" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - </attachpoints> </widget> <!-- The Tab Panels --> <!-- The Player Panel here --> @@ -51,48 +36,44 @@ <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - <widget name="PlayerList" factory="pawsListBox" id="1201" style="listbox"> - <frame x="20" y="5" width="465" height="352" /> + <widget name="PlayerList" factory="pawsListBox" id="1201" > + <frame x="20" y="10" width="458" height="350" /> <highlight resource="Hightlight" alpha="128" /> <columns height="25" headings="yes"> <column width="110" > - <widget name="First Name" factory="pawsTextBox"></widget> + <pawsTextBox name="First Name"/> </column> <column width="90" > - <widget name="Last Name" factory="pawsTextBox"></widget> + <pawsTextBox name="Last Name"/> </column> <column width="40" > - <widget name="Gnd" factory="pawsTextBox"></widget> + <pawsTextBox name="Gnd"/> </column> <column width="140" > - <widget name="Guild" factory="pawsTextBox"></widget> + <pawsTextBox name="Guild"/> </column> <column width="120" > - <widget name="Sector" factory="pawsTextBox"></widget> + <pawsTextBox name="Sector"/> </column> </columns> </widget> - <widget name="RefreshPlayerList" factory="pawsButton" id="1298" style="button"> + <widget name="RefreshPlayerList" factory="pawsButton" id="1298"> <frame x="25" y="370" width="130" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Refresh List" /> </widget> <widget name="PlayerCount" factory="pawsTextBox" > <frame x="240" y="375" width="200" height="20"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="SectorLbl" factory="pawsTextBox" style="label" > <frame x="490" y="5" width="120" height="20"/> <text string="Sector:" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="MoveTarget" factory="pawsTextBox" style="label" > - <frame x="525" y="37" width="30" height="20"/> + <frame x="525" y="40" width="30" height="20"/> <text string="SL" horizAdjust="CENTRE" vertAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="8" /> </widget> <widget name="TargetLeft" factory="pawsButton" toggle="no" id="1211" > <frame x="507" y="40" width="20" height="20" border="no" /> @@ -125,86 +106,71 @@ <buttondown resource="Down Arrow" /> </widget> - <widget name="AidPet" factory="pawsButton" toggle="no" id="1210" style="button"> + <widget name="AidPet" factory="pawsButton" toggle="no" id="1210" > <frame x="490" y="80" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Teleport To Player" /> </widget> <widget name="KillWarn" factory="pawsTextBox" style="label" > <frame x="490" y="105" width="115" height="20" /> <text string="!!!WARNING!!!" horizAdjust="CENTRE" vertAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="10" /> </widget> - <widget name="Kill" factory="pawsButton" toggle="no" id="1233" style="button"> + <widget name="Kill" factory="pawsButton" toggle="no" id="1233" > <frame x="490" y="125" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Kill Player" /> </widget> - <widget name="Mute" factory="pawsButton" id="1231" style="button"> + <widget name="Mute" factory="pawsButton" id="1231" > <frame x="490" y="160" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Mute Player" /> </widget> - <widget name="Unmute" factory="pawsButton" id="1232" style="button"> + <widget name="Unmute" factory="pawsButton" id="1232" > <frame x="490" y="185" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Unmute Player" /> </widget> - <widget name="ChangeName" factory="pawsButton" id="1234" style="button"> + <widget name="ChangeName" factory="pawsButton" id="1234" > <frame x="490" y="220" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Change name" /> </widget> - <widget name="ChangeNameRnd" factory="pawsButton" id="1235" style="button"> + <widget name="ChangeNameRnd" factory="pawsButton" id="1235" > <frame x="490" y="245" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Random name" /> </widget> - <widget name="Kick" factory="pawsButton" id="1230" style="button"> + <widget name="Kick" factory="pawsButton" id="1230" > <frame x="490" y="280" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Kick Player" /> </widget> <widget name="BanMin" factory="pawsEditTextBox"> - <frame x="500" y="309" width="20" height="20" border="no"/> + <frame x="500" y="312" width="20" height="20" border="no"/> <text string="30" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="BanHrs" factory="pawsEditTextBox"> - <frame x="534" y="309" width="20" height="20" border="no"/> + <frame x="534" y="312" width="20" height="20" border="no"/> <text string="0" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="BanDays" factory="pawsEditTextBox"> - <frame x="568" y="309" width="20" height="20" border="no"/> + <frame x="568" y="312" width="20" height="20" border="no"/> <text string="0" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="BanMinlbl" factory="pawsTextBox" style="label"> <frame x="490" y="314" width="20" height="20" /> <text string="M:" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="9" /> </widget> <widget name="BanHrslbl" factory="pawsTextBox" style="label"> <frame x="524" y="314" width="20" height="20" /> <text string="H:" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="9" /> </widget> <widget name="BanDayslbl" factory="pawsTextBox" style="label"> <frame x="558" y="314" width="20" height="20" /> <text string="D:" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="9" /> </widget> - <widget name="Ban" factory="pawsButton" id="1236" style="button"> - <frame x="490" y="330" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <widget name="Ban" factory="pawsButton" id="1236" > + <frame x="490" y="335" width="115" height="20" /> <label text="Ban" /> </widget> @@ -218,64 +184,58 @@ <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - <widget name="ActionList" factory="pawsListBox" id="1265" style="listbox"> - <frame x="20" y="5" width="580" height="335" border="no"/> + <widget name="ActionList" factory="pawsListBox" id="1265" > + <frame x="20" y="10" width="580" height="330" /> <highlight resource="Hightlight" alpha="128" /> <columns height="24" headings="yes"> <column width="20" > - <widget name="Id" factory="pawsTextBox"></widget> + <pawsTextBox name="Id"/> </column> <column width="160" > - <widget name="Name" factory="pawsTextBox"></widget> + <pawsTextBox name="Name"/> </column> <column width="135" > - <widget name="Mesh" factory="pawsTextBox"></widget> + <pawsTextBox name="Mesh"/> </column> <column width="40" > - <widget name="Poly" factory="pawsTextBox"></widget> + <pawsTextBox name="Poly"/> </column> <column width="145" > - <widget name="Pos" factory="pawsTextBox"></widget> + <pawsTextBox name="Pos"/> </column> <column width="120" > - <widget name="Type" factory="pawsTextBox"></widget> + <pawsTextBox name="Type"/> </column> </columns> </widget> - <widget name="cmdRefresh" factory="pawsButton" id="1260" style="button"> + <widget name="cmdRefresh" factory="pawsButton" id="1260" > <frame x="20" y="350" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Refresh List" /> </widget> - <widget name="cmdReload" factory="pawsButton" id="1266" style="button"> + <widget name="cmdReload" factory="pawsButton" id="1266" > <frame x="20" y="375" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Reload Cache" /> </widget> - <widget name="cmdAdd" factory="pawsButton" id="1261" style="button"> + <widget name="cmdAdd" factory="pawsButton" id="1261" > <frame x="140" y="350" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Add New" /> </widget> - <widget name="cmdAddLink" factory="pawsButton" id="1262" style="button"> + <widget name="cmdAddLink" factory="pawsButton" id="1262" > <frame x="140" y="375" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Add Linked" /> </widget> - <widget name="cmdEdit" factory="pawsButton" id="1263" style="button"> + <widget name="cmdEdit" factory="pawsButton" id="1263" > <frame x="260" y="350" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Edit" /> </widget> - <widget name="cmdDelete" factory="pawsButton" id="1264" style="button"> + <widget name="cmdDelete" factory="pawsButton" id="1264" > <frame x="260" y="375" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Delete" /> </widget> @@ -292,16 +252,14 @@ </attachpoints> - <widget name="listattributes" factory="pawsButton" toggle="no" id="1250" style="button"> + <widget name="listattributes" factory="pawsButton" toggle="no" id="1250" > <frame x="30" y="20" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="List Attributes" /> </widget> <widget name="invincible" factory="pawsTextBox" id="1251" visible="no" tooltip="set invincible"> <frame x="30" y="44" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Invincible" /> </widget> <widget name="toggleInvincible" factory="pawsCheckBox" id="1251" visible="no"> @@ -312,7 +270,6 @@ <widget name="invisible" factory="pawsTextBox" visible="no" tooltip="set invisible"> <frame x="30" y="68" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Invisible" /> </widget> <widget name="toggleInvisible" factory="pawsCheckBox" id="1252" visible="no"> @@ -323,7 +280,6 @@ <widget name="viewall" factory="pawsTextBox" visible="no" tooltip="set viewall"> <frame x="30" y="92" width="160" height="20" border="no"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="View all" /> </widget> <widget name="toggleViewAll" factory="pawsCheckBox" id="1253" visible="no"> @@ -334,7 +290,6 @@ <widget name="nevertired" factory="pawsTextBox" visible="no" tooltip="set nevertired"> <frame x="30" y="116" width="160" height="20" border="no"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Never tired" /> </widget> <widget name="toggleNeverTired" factory="pawsCheckBox" id="1254" visible="no"> @@ -345,7 +300,6 @@ <widget name="nofalldamage" factory="pawsTextBox" visible="no" tooltip="set nofalldamage"> <frame x="30" y="140" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="No Fall Damage" /> </widget> <widget name="toggleNoFallDamage" factory="pawsCheckBox" id="1255" visible="no"> @@ -356,7 +310,6 @@ <widget name="infiniteinventory" factory="pawsTextBox" visible="no" tooltip="set infiniteinventory"> <frame x="30" y="164" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Infinite Inventory" /> </widget> <widget name="toggleInfiniteInventory" factory="pawsCheckBox" id="1256" visible="no"> @@ -367,7 +320,6 @@ <widget name="questtester" factory="pawsTextBox" visible="no" tooltip="set questtester"> <frame x="30" y="188" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Quest Testing" /> </widget> <widget name="toggleQuestTester" factory="pawsCheckBox" id="1257" visible="no"> @@ -378,7 +330,6 @@ <widget name="infinitemana" factory="pawsTextBox" visible="no" tooltip="set infinitemana"> <frame x="30" y="212" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Infinite Mana" /> </widget> <widget name="toggleInfiniteMana" factory="pawsCheckBox" id="1258" visible="no"> @@ -389,7 +340,6 @@ <widget name="instantcast" factory="pawsTextBox" visible="no" tooltip="set instantcast"> <frame x="30" y="236" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Instant Cast" /> </widget> <widget name="toggleInstantCast" factory="pawsCheckBox" id="1259" visible="no"> @@ -399,7 +349,6 @@ <widget name="givekillexp" factory="pawsTextBox" visible="no" tooltip="set givekillexp"> <frame x="30" y="260" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Give Kill Experience" /> </widget> <widget name="toggleGiveKillExp" factory="pawsCheckBox" id="1267" visible="no"> Modified: personal/kougaro/data/gui/helpwindow.xml =================================================================== --- personal/kougaro/data/gui/helpwindow.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/helpwindow.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,10 +1,14 @@ <widget_description> - <widget name="HelpWindow" factory="pawsHelp" visible="no" savepositions="yes" movable="yes" resizable="no" configurable="yes"> - <frame x="100" y="90" width="630" height="285" border="yes"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - <bgimage resource="Help Background" alpha="0"/> - <title resource="Blue Title" text="Help" align="left" close_button="yes"/> - <widget name="HelpText" factory="pawsMultiLineTextBox"> + <pawsHelp name="HelpWindow" visible="no" savepositions="yes" movable="yes" resizable="yes" configurable="yes" style="New Standard GUI"> + + <frame x="100" y="90" width="630" height="285" border="yes"/> + <title resource="Scaling Title Bar" text="Help" align="left" close_button="yes"/> + + <pawsSimpleTree name="HelpTree"> + <frame x="27" y="29" width="250" height ="224" border="yes" /> + </pawsSimpleTree> + + <pawsMultiLineTextBox name="HelpText"> <frame x="294" y="29" width="300" height="224" border="no"/> <attachpoints> <attach point="ATTACH_RIGHT"/> @@ -12,6 +16,7 @@ <attach point="ATTACH_LEFT"/> <attach point="ATTACH_BOTTOM"/> </attachpoints> - </widget> - </widget> + </pawsMultiLineTextBox> + + </pawsHelp> </widget_description> Modified: personal/kougaro/data/gui/ok.xml =================================================================== --- personal/kougaro/data/gui/ok.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/ok.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,26 +1,24 @@ <widget_description> -<widget name="OkWindow" factory="pawsOkBox" - visible="no" savepositions="no" movable="yes" - resizable="no" style="New Standard GUI" > +<pawsOkBox name="OkWindow" + visible="no" savepositions="no" movable="yes" + resizable="no" style="New Standard GUI" > <frame x="0" y="0" width="644" height="300" border="no" /> - <bgimage resource="YesNo" alpha="0" /> <form> <enter... [truncated message content] |
From: <ko...@us...> - 2009-03-16 00:47:51
|
Revision: 3221 http://planeshift.svn.sourceforge.net/planeshift/?rev=3221&view=rev Author: kougaro Date: 2009-03-16 00:47:38 +0000 (Mon, 16 Mar 2009) Log Message: ----------- merged r3116-3220 from trunk Modified Paths: -------------- personal/kougaro/data/gui/chardescwindow.xml personal/kougaro/data/gui/detailwindow.xml personal/kougaro/data/gui/gmguiwindow.xml personal/kougaro/data/options/controls_def.xml personal/kougaro/data/shader/lighting/lighting_character.xml personal/kougaro/mk/autoconf/checkcommon.m4 personal/kougaro/mk/autoconf/crystal.m4 personal/kougaro/mk/jam/flags.jam personal/kougaro/mk/jam/icons.jam personal/kougaro/mk/jam/msvcgen.jam personal/kougaro/mk/jam/static.jam personal/kougaro/mk/jam/swig.jam personal/kougaro/mk/msvc7/appeedit.vcproj personal/kougaro/mk/msvc7/apppawseditor.vcproj personal/kougaro/mk/msvc7/apppsclient.vcproj personal/kougaro/mk/msvc7/apppsclient_static.vcproj personal/kougaro/mk/msvc7/apppslaunch.vcproj personal/kougaro/mk/msvc7/apppslaunch_static.vcproj personal/kougaro/mk/msvc7/apppsnpcclient.vcproj personal/kougaro/mk/msvc7/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc7/apppsserver.vcproj personal/kougaro/mk/msvc7/apppsserver_static.vcproj personal/kougaro/mk/msvc7/grpall_psminimal.vcproj personal/kougaro/mk/msvc7/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpall_psstatic.vcproj personal/kougaro/mk/msvc7/grpall_pstypical.vcproj personal/kougaro/mk/msvc7/grpapps_psminimal.vcproj personal/kougaro/mk/msvc7/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpapps_psstatic.vcproj personal/kougaro/mk/msvc7/grpapps_pstypical.vcproj personal/kougaro/mk/msvc7/grpclient_psminimal.vcproj personal/kougaro/mk/msvc7/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpclient_psstatic.vcproj personal/kougaro/mk/msvc7/grpclient_pstypical.vcproj personal/kougaro/mk/msvc7/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc7/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc7/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc7/grplibs_psminimal.vcproj personal/kougaro/mk/msvc7/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grplibs_psstatic.vcproj personal/kougaro/mk/msvc7/grplibs_pstypical.vcproj personal/kougaro/mk/msvc7/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc7/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc7/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc7/grpserver_psminimal.vcproj personal/kougaro/mk/msvc7/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpserver_psstatic.vcproj personal/kougaro/mk/msvc7/grpserver_pstypical.vcproj personal/kougaro/mk/msvc7/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc7/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc7/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc7/grptools_psminimal.vcproj personal/kougaro/mk/msvc7/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grptools_psstatic.vcproj personal/kougaro/mk/msvc7/grptools_pstypical.vcproj personal/kougaro/mk/msvc7/libbulkobjects.vcproj personal/kougaro/mk/msvc7/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc7/libeffects.vcproj personal/kougaro/mk/msvc7/libfparser.vcproj personal/kougaro/mk/msvc7/libgui.vcproj personal/kougaro/mk/msvc7/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc7/libpaws.vcproj personal/kougaro/mk/msvc7/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpsengine.vcproj personal/kougaro/mk/msvc7/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpsnet.vcproj personal/kougaro/mk/msvc7/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc7/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpsrpgrules.vcproj personal/kougaro/mk/msvc7/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc7/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpssound.vcproj personal/kougaro/mk/msvc7/libpsutil.vcproj personal/kougaro/mk/msvc7/libwordnet.vcproj personal/kougaro/mk/msvc7/libxdelta3.vcproj personal/kougaro/mk/msvc7/libxpnet.vcproj personal/kougaro/mk/msvc7/plgdbmysql.vcproj personal/kougaro/mk/msvc7/wkspsminimal.sln personal/kougaro/mk/msvc7/wkspsminimalstatic.sln personal/kougaro/mk/msvc7/wkspsstatic.sln personal/kougaro/mk/msvc7/wkspstypical.sln personal/kougaro/mk/msvc71/appeedit.vcproj personal/kougaro/mk/msvc71/apppawseditor.vcproj personal/kougaro/mk/msvc71/apppsclient.vcproj personal/kougaro/mk/msvc71/apppsclient_static.vcproj personal/kougaro/mk/msvc71/apppslaunch.vcproj personal/kougaro/mk/msvc71/apppslaunch_static.vcproj personal/kougaro/mk/msvc71/apppsnpcclient.vcproj personal/kougaro/mk/msvc71/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc71/apppsserver.vcproj personal/kougaro/mk/msvc71/apppsserver_static.vcproj personal/kougaro/mk/msvc71/grpall_psminimal.vcproj personal/kougaro/mk/msvc71/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpall_psstatic.vcproj personal/kougaro/mk/msvc71/grpall_pstypical.vcproj personal/kougaro/mk/msvc71/grpapps_psminimal.vcproj personal/kougaro/mk/msvc71/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpapps_psstatic.vcproj personal/kougaro/mk/msvc71/grpapps_pstypical.vcproj personal/kougaro/mk/msvc71/grpclient_psminimal.vcproj personal/kougaro/mk/msvc71/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpclient_psstatic.vcproj personal/kougaro/mk/msvc71/grpclient_pstypical.vcproj personal/kougaro/mk/msvc71/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc71/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc71/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc71/grplibs_psminimal.vcproj personal/kougaro/mk/msvc71/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grplibs_psstatic.vcproj personal/kougaro/mk/msvc71/grplibs_pstypical.vcproj personal/kougaro/mk/msvc71/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc71/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc71/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc71/grpserver_psminimal.vcproj personal/kougaro/mk/msvc71/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpserver_psstatic.vcproj personal/kougaro/mk/msvc71/grpserver_pstypical.vcproj personal/kougaro/mk/msvc71/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc71/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc71/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc71/grptools_psminimal.vcproj personal/kougaro/mk/msvc71/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grptools_psstatic.vcproj personal/kougaro/mk/msvc71/grptools_pstypical.vcproj personal/kougaro/mk/msvc71/libbulkobjects.vcproj personal/kougaro/mk/msvc71/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc71/libeffects.vcproj personal/kougaro/mk/msvc71/libfparser.vcproj personal/kougaro/mk/msvc71/libgui.vcproj personal/kougaro/mk/msvc71/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc71/libpaws.vcproj personal/kougaro/mk/msvc71/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpsengine.vcproj personal/kougaro/mk/msvc71/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpsnet.vcproj personal/kougaro/mk/msvc71/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc71/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpsrpgrules.vcproj personal/kougaro/mk/msvc71/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc71/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpssound.vcproj personal/kougaro/mk/msvc71/libpsutil.vcproj personal/kougaro/mk/msvc71/libwordnet.vcproj personal/kougaro/mk/msvc71/libxdelta3.vcproj personal/kougaro/mk/msvc71/libxpnet.vcproj personal/kougaro/mk/msvc71/plgdbmysql.vcproj personal/kougaro/mk/msvc71/wkspsminimal.sln personal/kougaro/mk/msvc71/wkspsminimalstatic.sln personal/kougaro/mk/msvc71/wkspsstatic.sln personal/kougaro/mk/msvc71/wkspstypical.sln personal/kougaro/mk/msvc8/appeedit.vcproj personal/kougaro/mk/msvc8/apppawseditor.vcproj personal/kougaro/mk/msvc8/apppsclient.vcproj personal/kougaro/mk/msvc8/apppsclient_static.vcproj personal/kougaro/mk/msvc8/apppslaunch.vcproj personal/kougaro/mk/msvc8/apppslaunch_static.vcproj personal/kougaro/mk/msvc8/apppsnpcclient.vcproj personal/kougaro/mk/msvc8/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc8/apppsserver.vcproj personal/kougaro/mk/msvc8/apppsserver_static.vcproj personal/kougaro/mk/msvc8/grpall_psminimal.vcproj personal/kougaro/mk/msvc8/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpall_psstatic.vcproj personal/kougaro/mk/msvc8/grpall_pstypical.vcproj personal/kougaro/mk/msvc8/grpapps_psminimal.vcproj personal/kougaro/mk/msvc8/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpapps_psstatic.vcproj personal/kougaro/mk/msvc8/grpapps_pstypical.vcproj personal/kougaro/mk/msvc8/grpclient_psminimal.vcproj personal/kougaro/mk/msvc8/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpclient_psstatic.vcproj personal/kougaro/mk/msvc8/grpclient_pstypical.vcproj personal/kougaro/mk/msvc8/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc8/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc8/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc8/grplibs_psminimal.vcproj personal/kougaro/mk/msvc8/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grplibs_psstatic.vcproj personal/kougaro/mk/msvc8/grplibs_pstypical.vcproj personal/kougaro/mk/msvc8/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc8/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc8/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc8/grpserver_psminimal.vcproj personal/kougaro/mk/msvc8/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpserver_psstatic.vcproj personal/kougaro/mk/msvc8/grpserver_pstypical.vcproj personal/kougaro/mk/msvc8/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc8/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc8/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc8/grptools_psminimal.vcproj personal/kougaro/mk/msvc8/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grptools_psstatic.vcproj personal/kougaro/mk/msvc8/grptools_pstypical.vcproj personal/kougaro/mk/msvc8/libbulkobjects.vcproj personal/kougaro/mk/msvc8/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc8/libeffects.vcproj personal/kougaro/mk/msvc8/libfparser.vcproj personal/kougaro/mk/msvc8/libgui.vcproj personal/kougaro/mk/msvc8/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc8/libpaws.vcproj personal/kougaro/mk/msvc8/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpsengine.vcproj personal/kougaro/mk/msvc8/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpsnet.vcproj personal/kougaro/mk/msvc8/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc8/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpsrpgrules.vcproj personal/kougaro/mk/msvc8/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc8/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpssound.vcproj personal/kougaro/mk/msvc8/libpsutil.vcproj personal/kougaro/mk/msvc8/libwordnet.vcproj personal/kougaro/mk/msvc8/libxdelta3.vcproj personal/kougaro/mk/msvc8/libxpnet.vcproj personal/kougaro/mk/msvc8/plgdbmysql.vcproj personal/kougaro/mk/msvc8/wkspsminimal.sln personal/kougaro/mk/msvc8/wkspsminimalstatic.sln personal/kougaro/mk/msvc8/wkspsstatic.sln personal/kougaro/mk/msvc8/wkspstypical.sln personal/kougaro/mk/msvc9/appeedit.vcproj personal/kougaro/mk/msvc9/apppawseditor.vcproj personal/kougaro/mk/msvc9/apppsclient.vcproj personal/kougaro/mk/msvc9/apppsclient_static.vcproj personal/kougaro/mk/msvc9/apppslaunch.vcproj personal/kougaro/mk/msvc9/apppslaunch_static.vcproj personal/kougaro/mk/msvc9/apppsnpcclient.vcproj personal/kougaro/mk/msvc9/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc9/apppsserver.vcproj personal/kougaro/mk/msvc9/apppsserver_static.vcproj personal/kougaro/mk/msvc9/grpall_psminimal.vcproj personal/kougaro/mk/msvc9/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpall_psstatic.vcproj personal/kougaro/mk/msvc9/grpall_pstypical.vcproj personal/kougaro/mk/msvc9/grpapps_psminimal.vcproj personal/kougaro/mk/msvc9/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpapps_psstatic.vcproj personal/kougaro/mk/msvc9/grpapps_pstypical.vcproj personal/kougaro/mk/msvc9/grpclient_psminimal.vcproj personal/kougaro/mk/msvc9/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpclient_psstatic.vcproj personal/kougaro/mk/msvc9/grpclient_pstypical.vcproj personal/kougaro/mk/msvc9/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc9/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc9/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc9/grplibs_psminimal.vcproj personal/kougaro/mk/msvc9/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grplibs_psstatic.vcproj personal/kougaro/mk/msvc9/grplibs_pstypical.vcproj personal/kougaro/mk/msvc9/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc9/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc9/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc9/grpserver_psminimal.vcproj personal/kougaro/mk/msvc9/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpserver_psstatic.vcproj personal/kougaro/mk/msvc9/grpserver_pstypical.vcproj personal/kougaro/mk/msvc9/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc9/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc9/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc9/grptools_psminimal.vcproj personal/kougaro/mk/msvc9/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grptools_psstatic.vcproj personal/kougaro/mk/msvc9/grptools_pstypical.vcproj personal/kougaro/mk/msvc9/libbulkobjects.vcproj personal/kougaro/mk/msvc9/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc9/libeffects.vcproj personal/kougaro/mk/msvc9/libfparser.vcproj personal/kougaro/mk/msvc9/libgui.vcproj personal/kougaro/mk/msvc9/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc9/libpaws.vcproj personal/kougaro/mk/msvc9/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpsengine.vcproj personal/kougaro/mk/msvc9/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpsnet.vcproj personal/kougaro/mk/msvc9/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc9/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpsrpgrules.vcproj personal/kougaro/mk/msvc9/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc9/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpssound.vcproj personal/kougaro/mk/msvc9/libpsutil.vcproj personal/kougaro/mk/msvc9/libwordnet.vcproj personal/kougaro/mk/msvc9/libxdelta3.vcproj personal/kougaro/mk/msvc9/libxpnet.vcproj personal/kougaro/mk/msvc9/plgdbmysql.vcproj personal/kougaro/mk/msvc9/wkspsminimal.sln personal/kougaro/mk/msvc9/wkspsminimalstatic.sln personal/kougaro/mk/msvc9/wkspsstatic.sln personal/kougaro/mk/msvc9/wkspstypical.sln personal/kougaro/mk/msvcgen/control.tlib personal/kougaro/mk/msvcgen/macros.tlib personal/kougaro/mk/msvcgen/project7.tlib personal/kougaro/mk/msvcgen/projectx7.tlib personal/kougaro/src/client/chatbubbles.cpp personal/kougaro/src/client/clientvitals.h personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/cmdusers.h personal/kougaro/src/client/cmdutil.cpp personal/kougaro/src/client/gui/chatwindow.cpp personal/kougaro/src/client/gui/pawsactivemagicwindow.cpp personal/kougaro/src/client/gui/pawsbuddy.cpp personal/kougaro/src/client/gui/pawschardescription.cpp personal/kougaro/src/client/gui/pawscharparents.cpp personal/kougaro/src/client/gui/pawsconfigkeys.cpp personal/kougaro/src/client/gui/pawsconfigwindow.cpp personal/kougaro/src/client/gui/pawsconfigwindow.h personal/kougaro/src/client/gui/pawsdetailwindow.cpp personal/kougaro/src/client/gui/pawsexchangewindow.h personal/kougaro/src/client/gui/pawsglyphwindow.cpp personal/kougaro/src/client/gui/pawsgmaction.cpp personal/kougaro/src/client/gui/pawsgmgui.cpp personal/kougaro/src/client/gui/pawsgmgui.h personal/kougaro/src/client/gui/pawsguildwindow.cpp personal/kougaro/src/client/gui/pawsignore.cpp personal/kougaro/src/client/gui/pawsinfowindow.cpp personal/kougaro/src/client/gui/pawslife.cpp personal/kougaro/src/client/gui/pawslootwindow.cpp personal/kougaro/src/client/gui/pawsmerchantwindow.cpp personal/kougaro/src/client/gui/pawsnpcdialog.cpp personal/kougaro/src/client/gui/pawsnpcdialog.h personal/kougaro/src/client/gui/pawspetitiongmwindow.cpp personal/kougaro/src/client/gui/pawspetitionwindow.cpp personal/kougaro/src/client/gui/pawsquestwindow.cpp personal/kougaro/src/client/gui/pawsskillwindow.cpp personal/kougaro/src/client/gui/pawswritingwindow.cpp personal/kougaro/src/client/modehandler.cpp personal/kougaro/src/client/pscamera.cpp personal/kougaro/src/client/pscelclient.cpp personal/kougaro/src/client/pscelclient.h personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/client/psengine.cpp personal/kougaro/src/client/psengine.h personal/kougaro/src/client/psoptions.cpp personal/kougaro/src/client/psoptions.h personal/kougaro/src/client/zonehandler.cpp personal/kougaro/src/common/effects/pseffectmanager.cpp personal/kougaro/src/common/effects/pseffectobjsimpmesh.cpp personal/kougaro/src/common/engine/loader.cpp personal/kougaro/src/common/engine/loader.h personal/kougaro/src/common/engine/psregion.cpp personal/kougaro/src/common/engine/psregion.h personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/net/netbase.h personal/kougaro/src/common/paws/pawsgenericview.cpp personal/kougaro/src/common/paws/pawslistbox.cpp personal/kougaro/src/common/paws/pawslistbox.h personal/kougaro/src/common/paws/pawsmanager.cpp personal/kougaro/src/common/paws/pawsmanager.h personal/kougaro/src/common/paws/pawsobjectview.cpp personal/kougaro/src/common/paws/pawsscript.cpp personal/kougaro/src/common/paws/pawsscript.h personal/kougaro/src/common/paws/pawstextbox.cpp personal/kougaro/src/common/paws/pawstextbox.h personal/kougaro/src/common/paws/pawswidget.cpp personal/kougaro/src/common/paws/pawswidget.h personal/kougaro/src/common/rpgrules/vitals.h personal/kougaro/src/common/util/Jamfile personal/kougaro/src/common/util/localization.cpp personal/kougaro/src/common/util/mathscript.cpp personal/kougaro/src/common/util/mathscript.h personal/kougaro/src/common/util/psconst.h personal/kougaro/src/common/util/pspath.cpp personal/kougaro/src/common/util/psstring.cpp personal/kougaro/src/common/util/psstring.h personal/kougaro/src/common/util/scriptvar.h personal/kougaro/src/common/util/texfactory.cpp personal/kougaro/src/eedit/eeditloadeffecttoolbox.cpp personal/kougaro/src/eedit/eeditshortcutstoolbox.cpp personal/kougaro/src/npcclient/gem.cpp personal/kougaro/src/npcclient/npcmesh.cpp personal/kougaro/src/npcclient/npcoperations.cpp personal/kougaro/src/npcclient/tribeneed.cpp personal/kougaro/src/npcclient/walkpoly.cpp personal/kougaro/src/pslaunch/download.cpp personal/kougaro/src/server/actionmanager.cpp personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/adminmanager.h personal/kougaro/src/server/bankmanager.cpp personal/kougaro/src/server/bulkobjects/dictionary.cpp personal/kougaro/src/server/bulkobjects/dictionary.h personal/kougaro/src/server/bulkobjects/psactionlocationinfo.cpp personal/kougaro/src/server/bulkobjects/psactionlocationinfo.h personal/kougaro/src/server/bulkobjects/pscharacter.cpp personal/kougaro/src/server/bulkobjects/pscharacter.h personal/kougaro/src/server/bulkobjects/pscharacterloader.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.h personal/kougaro/src/server/bulkobjects/psitem.cpp personal/kougaro/src/server/bulkobjects/psitem.h personal/kougaro/src/server/bulkobjects/psitemstats.cpp personal/kougaro/src/server/bulkobjects/psitemstats.h personal/kougaro/src/server/bulkobjects/psnpcloader.cpp personal/kougaro/src/server/bulkobjects/psquest.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.h personal/kougaro/src/server/bulkobjects/psspell.cpp personal/kougaro/src/server/bulkobjects/psspell.h personal/kougaro/src/server/bulkobjects/servervitals.cpp personal/kougaro/src/server/bulkobjects/servervitals.h personal/kougaro/src/server/cachemanager.cpp personal/kougaro/src/server/cachemanager.h personal/kougaro/src/server/client.cpp personal/kougaro/src/server/client.h personal/kougaro/src/server/combatmanager.cpp personal/kougaro/src/server/combatmanager.h personal/kougaro/src/server/command.cpp personal/kougaro/src/server/creationmanager.cpp personal/kougaro/src/server/database/mysql/action_locations.sql personal/kougaro/src/server/database/mysql/dal.cpp personal/kougaro/src/server/database/mysql/item_stats.sql personal/kougaro/src/server/database/mysql/math_scripts.sql personal/kougaro/src/server/database/mysql/progress_events.sql personal/kougaro/src/server/database/mysql/quest_scripts.sql personal/kougaro/src/server/database/mysql/quests.sql personal/kougaro/src/server/database/mysql/server_options.sql personal/kougaro/src/server/database/mysql/spells.sql personal/kougaro/src/server/database/mysql/upgrade_schema.sql personal/kougaro/src/server/entitymanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/gemmesh.cpp personal/kougaro/src/server/groupmanager.cpp personal/kougaro/src/server/minigamemanager.cpp personal/kougaro/src/server/npcmanager.cpp personal/kougaro/src/server/npcmanager.h personal/kougaro/src/server/progressionmanager.cpp personal/kougaro/src/server/progressionmanager.h personal/kougaro/src/server/psproxlist.cpp personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserverchar.cpp personal/kougaro/src/server/psserverchar.h personal/kougaro/src/server/psserverdr.cpp personal/kougaro/src/server/psserverdr.h personal/kougaro/src/server/questmanager.cpp personal/kougaro/src/server/slotmanager.cpp personal/kougaro/src/server/spawnmanager.cpp personal/kougaro/src/server/spawnmanager.h personal/kougaro/src/server/spellmanager.cpp personal/kougaro/src/server/spellmanager.h personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/weathermanager.cpp personal/kougaro/src/server/workmanager.cpp personal/kougaro/src/server/workmanager.h Removed Paths: ------------- personal/kougaro/src/client/clientcachemanager.cpp personal/kougaro/src/client/clientcachemanager.h personal/kougaro/src/common/rpgrules/vitals.cpp Modified: personal/kougaro/data/gui/chardescwindow.xml =================================================================== --- personal/kougaro/data/gui/chardescwindow.xml 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/data/gui/chardescwindow.xml 2009-03-16 00:47:38 UTC (rev 3221) @@ -1,15 +1,15 @@ <widget_description> - <widget name="DescriptionEdit" factory="pawsCharDescription" + <pawsCharDescription name="DescriptionEdit" visible="yes" savepositions="no" movable="yes" keepaspect="no" - resizable="yes" configurable="yes"> + resizable="yes" configurable="yes" style="New Standard GUI"> <frame x="100" y="100" width="320" height="270" border="yes" /> <minframe width="250" height="250" /> - <title resource="Blue Title" text="Modify description" align="left" close_button="yes" /> - <bgimage resource="Modify Description BG" alpha="128" /> + <title resource="Scaling Title Bar" text="Modify description" align="left" close_button="yes" /> + <!-- <bgimage resource="Modify Description BG" alpha="128" /> --> - <widget name="lbl" factory="pawsTextBox" > + <pawsTextBox name="lbl"> <frame x="34" y="8" width="200" height="20" border="no" /> <font name="/planeshift/data/ttf/scurlock.ttf" r="255" g="255" b="255" size="14" scalefont="no"/> <text string="Character description:" /> @@ -19,8 +19,9 @@ <attach point="PROPORTIONAL_TOP" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - </widget> - <widget name="lblb" factory="pawsTextBox" > + </pawsTextBox> + + <pawsTextBox name="lblb"> <frame x="35" y="9" width="200" height="20" border="no" /> <font name="/planeshift/data/ttf/scurlock.ttf" r="0" g="0" b="0" size="14" scalefont="no"/> <text string="Character description:" /> @@ -30,20 +31,20 @@ <attach point="PROPORTIONAL_TOP" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - </widget> + </pawsTextBox> - <widget name="Description" factory="pawsMultilineEditTextBox" > + <pawsMultilineEditTextBox name="Description"> <frame x="25" y="30" width="270" height="185" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" scalefont="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" scalefont="no" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> <attach point="PROPORTIONAL_TOP" /> <attach point="PROPORTIONAL_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - </widget> + </pawsMultilineEditTextBox> - <widget name="OK" factory="pawsButton" id="100"> + <pawsButton name="OK" id="100"> <frame x="5" y="238" width="70" height="30" /> <bgimage resource="Modify Save" /> <attachpoints> @@ -53,8 +54,9 @@ <attach point="ATTACH_BOTTOM" /> </attachpoints> <label text="OK" /> - </widget> - <widget name="Cancel" factory="pawsButton" id="101"> + </pawsButton> + + <pawsButton name="Cancel" id="101"> <frame x="80" y="238" width="70" height="30" /> <bgimage resource="Modify Cancel" /> <attachpoints> @@ -64,20 +66,22 @@ <attach point="ATTACH_BOTTOM" /> </attachpoints> <label text="Cancel" /> - </widget> - <widget name="Save" factory="pawsButton" id="102"> - <frame x="170" y="238" width="65" height="30" /> + </pawsButton> + + <pawsButton name="Save" id="102"> + <frame x="170" y="238" width="70" height="30" /> <bgimage resource="Modify Save" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> - <attach point="ATTACH_LEFT" /> + <attach point="PROPORTIONAL_LEFT" /> <attach point="PROPORTIONAL_TOP" /> <attach point="ATTACH_BOTTOM" /> </attachpoints> <label text="Save" /> - </widget> - <widget name="Load" factory="pawsButton" id="103"> - <frame x="240" y="238" width="75" height="30" /> + </pawsButton> + + <pawsButton name="Load" id="103"> + <frame x="245" y="238" width="70" height="30" /> <bgimage resource="Modify Cancel" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -86,7 +90,8 @@ <attach point="ATTACH_BOTTOM" /> </attachpoints> <label text="Load" /> - </widget> - </widget> + </pawsButton> + + </pawsCharDescription> </widget_description> Modified: personal/kougaro/data/gui/detailwindow.xml =================================================================== --- personal/kougaro/data/gui/detailwindow.xml 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/data/gui/detailwindow.xml 2009-03-16 00:47:38 UTC (rev 3221) @@ -15,7 +15,7 @@ </widget> <widget name="ShowDescr" factory="pawsButton" style="tabbuttonskills" id="999" > - <frame x="5" y="65" width="33" /> + <frame x="5" y="65" width="33" height="20" /> <label text="Desc" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -24,7 +24,7 @@ </widget> <widget name="ShowDescrOOC" factory="pawsButton" style="tabbuttonskills" id="1006" > - <frame x="35" y="65" width="33" /> + <frame x="35" y="65" width="33" height="20"/> <label text="OOC" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -33,7 +33,7 @@ </widget> <widget name="ShowCC" factory="pawsButton" style="tabbuttonskills" id="1007" > - <frame x="65" y="65" width="33" /> + <frame x="65" y="65" width="33" height="20"/> <label text="CC" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -42,7 +42,7 @@ </widget> <widget name="ShowStats" factory="pawsButton" style="tabbuttonskills" id="1000" > - <frame x="95" y="65" width="30" /> + <frame x="95" y="65" width="30" height="20"/> <label text="Stats" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -51,7 +51,7 @@ </widget> <widget name="ShowFaction" factory="pawsButton" style="tabbuttonskills" id="1005" > - <frame x="125" y="65" width="40" /> + <frame x="125" y="65" width="40" height="20"/> <label text="Faction" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -60,7 +60,7 @@ </widget> <widget name="ShowCombat" factory="pawsButton" style="tabbuttonskills" id="1001" > - <frame x="165" y="65" width="43" /> + <frame x="165" y="65" width="43" height="20"/> <label text="Combat" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -69,7 +69,7 @@ </widget> <widget name="ShowMagic" factory="pawsButton" style="tabbuttonskills" id="1002"> - <frame x="205" y="65" width="33" /> + <frame x="205" y="65" width="33" height="20"/> <label text="Magic" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -78,7 +78,7 @@ </widget> <widget name="ShowCraft" factory="pawsButton" style="tabbuttonskills" id="1003"> - <frame x="240" y="65" width="30" /> + <frame x="240" y="65" width="30" height="20"/> <label text="Jobs" /> <attachpoints> <attach point="PROPORTIONAL_RIGHT" /> @@ -87,7 +87,7 @@ </widget> <widget name="ShowMisc" factory="pawsButton" style="tabbuttonskills" id="1004"> - <frame x="280" y="65" width="40" /> + <frame x="280" y="65" width="40" height="20" /> <label text="Various" /> <attachpoints> <attach point="ATTACH_RIGHT" /> Modified: personal/kougaro/data/gui/gmguiwindow.xml =================================================================== --- personal/kougaro/data/gui/gmguiwindow.xml 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/data/gui/gmguiwindow.xml 2009-03-16 00:47:38 UTC (rev 3221) @@ -59,7 +59,7 @@ </widget> <widget name="RefreshPlayerList" factory="pawsButton" id="1298"> - <frame x="25" y="370" width="130" height="20" /> + <frame x="25" y="372" width="130" height="20" /> <label text="Refresh List" /> </widget> @@ -68,7 +68,7 @@ </widget> <widget name="SectorLbl" factory="pawsTextBox" style="label" > - <frame x="490" y="5" width="120" height="20"/> + <frame x="495" y="5" width="120" height="20"/> <text string="Sector:" /> </widget> <widget name="MoveTarget" factory="pawsTextBox" style="label" > @@ -107,70 +107,71 @@ </widget> <widget name="AidPet" factory="pawsButton" toggle="no" id="1210" > - <frame x="490" y="80" width="115" height="20" /> + <frame x="495" y="80" width="115" height="20" /> <label text="Teleport To Player" /> </widget> <widget name="KillWarn" factory="pawsTextBox" style="label" > - <frame x="490" y="105" width="115" height="20" /> + <frame x="495" y="105" width="115" height="20" /> <text string="!!!WARNING!!!" horizAdjust="CENTRE" vertAdjust="CENTRE" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="10" /> </widget> <widget name="Kill" factory="pawsButton" toggle="no" id="1233" > - <frame x="490" y="125" width="115" height="20" /> + <frame x="495" y="125" width="115" height="20" /> <label text="Kill Player" /> </widget> <widget name="Mute" factory="pawsButton" id="1231" > - <frame x="490" y="160" width="115" height="20" /> + <frame x="495" y="160" width="115" height="20" /> <label text="Mute Player" /> </widget> <widget name="Unmute" factory="pawsButton" id="1232" > - <frame x="490" y="185" width="115" height="20" /> + <frame x="495" y="185" width="115" height="20" /> <label text="Unmute Player" /> </widget> <widget name="ChangeName" factory="pawsButton" id="1234" > - <frame x="490" y="220" width="115" height="20" /> + <frame x="495" y="220" width="115" height="20" /> <label text="Change name" /> </widget> <widget name="ChangeNameRnd" factory="pawsButton" id="1235" > - <frame x="490" y="245" width="115" height="20" /> + <frame x="495" y="245" width="115" height="20" /> <label text="Random name" /> </widget> <widget name="Kick" factory="pawsButton" id="1230" > - <frame x="490" y="280" width="115" height="20" /> + <frame x="495" y="280" width="115" height="20" /> <label text="Kick Player" /> </widget> <widget name="BanMin" factory="pawsEditTextBox"> - <frame x="500" y="312" width="20" height="20" border="no"/> + <frame x="505" y="311" width="20" height="20" border="no"/> <text string="30" horizAdjust="CENTRE" /> </widget> <widget name="BanHrs" factory="pawsEditTextBox"> - <frame x="534" y="312" width="20" height="20" border="no"/> + <frame x="539" y="311" width="20" height="20" border="no"/> <text string="0" horizAdjust="CENTRE" /> </widget> <widget name="BanDays" factory="pawsEditTextBox"> - <frame x="568" y="312" width="20" height="20" border="no"/> + <frame x="573" y="311" width="20" height="20" border="no"/> <text string="0" horizAdjust="CENTRE" /> </widget> <widget name="BanMinlbl" factory="pawsTextBox" style="label"> - <frame x="490" y="314" width="20" height="20" /> + <frame x="495" y="314" width="20" height="20" /> <text string="M:" horizAdjust="CENTRE" /> </widget> <widget name="BanHrslbl" factory="pawsTextBox" style="label"> - <frame x="524" y="314" width="20" height="20" /> + <frame x="529" y="314" width="20" height="20" /> <text string="H:" horizAdjust="CENTRE" /> </widget> <widget name="BanDayslbl" factory="pawsTextBox" style="label"> - <frame x="558" y="314" width="20" height="20" /> + <frame x="563" y="314" width="20" height="20" /> <text string="D:" horizAdjust="CENTRE" /> </widget> <widget name="Ban" factory="pawsButton" id="1236" > - <frame x="490" y="335" width="115" height="20" /> + <frame x="495" y="335" width="115" height="20" /> <label text="Ban" /> </widget> @@ -356,6 +357,15 @@ <text string="disabled" /> </widget> + <widget name="attackable" factory="pawsTextBox" visible="no" tooltip="set attackable"> + <frame x="30" y="284" width="160" height="20" border="no" /> + <text string="Attackable" /> + </widget> + <widget name="toggleAttackable" factory="pawsCheckBox" id="1268" visible="no"> + <frame x="200" y ="284" width="100" height="20" border="no"/> + <text string="disabled" /> + </widget> + </widget> </widget> </widget> Modified: personal/kougaro/data/options/controls_def.xml =================================================================== --- personal/kougaro/data/options/controls_def.xml 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/data/options/controls_def.xml 2009-03-16 00:47:38 UTC (rev 3221) @@ -17,7 +17,7 @@ <bind action="Run" key="LShift" /> <bind action="ToggleRun" key="LCtrl" /> <bind action="AutoMove" key="r" /> - <bind action="MouseMove" key="LeftClick" /> + <bind action="MouseMove" key="" /> <bind action="Sneak" key="RShift" /> <bind action="Jump" key="Space" /> <bind action="Sit" key="z" /> Modified: personal/kougaro/data/shader/lighting/lighting_character.xml =================================================================== --- personal/kougaro/data/shader/lighting/lighting_character.xml 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/data/shader/lighting/lighting_character.xml 2009-03-16 00:47:38 UTC (rev 3221) @@ -22,6 +22,7 @@ <alias name="apply_alpha" file="/shader/snippets/surface/alpha-nochange.xml" /> <alias name="lighting" file="/shader/snippets/lighting/lighting-ppl.xml" /> <alias name="surface" file="/shader/snippets/surface/surface-overlay.xml" /> + <alias name="specular" file="/shader/snippets/surface/specular-default.xml" /> <technique priority="300" minlights="3"> <tag>per_pixel_lighting</tag> Modified: personal/kougaro/mk/autoconf/checkcommon.m4 =================================================================== --- personal/kougaro/mk/autoconf/checkcommon.m4 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/autoconf/checkcommon.m4 2009-03-16 00:47:38 UTC (rev 3221) @@ -54,6 +54,23 @@ #------------------------------------------------------------------------------ +# CS_CHECK_COMMON_TOOLS_RELAYTOOL([PATH], [EMITTER]) +# Checks for relaytool. Prepends PATH to the search path. +# The result of the check is recorded with CS_EMIT_BUILD_PROPERTY() via +# the optional EMITTER. If EMITTER is omitted, then +# CS_EMIT_BUILD_PROPERTY()'s default emitter is employed. +#------------------------------------------------------------------------------ +AC_DEFUN([CS_CHECK_COMMON_TOOLS_RELAYTOOL], + [AC_ARG_ENABLE([relaytool], [AC_HELP_STRING([--enable-relaytool], + [enable use of relaytool for some libraries (default YES)])]) + AS_IF([test -z "$enable_relaytool"], + [enable_relaytool=yes]) + AS_IF([test "$enable_relaytool" != "no"], + [CS_PATH_TOOL([RELAYTOOL], [relaytool], [], [$1]) + CS_EMIT_BUILD_PROPERTY([CMD.RELAYTOOL], [$RELAYTOOL], [], [], [$2])])]) + + +#------------------------------------------------------------------------------ # CS_CHECK_COMMON_TOOLS_BASIC([EMITTER]) # Checks for basic tools for building things. Results of the checks are # recorded with CS_EMIT_BUILD_PROPERTY() via the optional EMITTER. If Modified: personal/kougaro/mk/autoconf/crystal.m4 =================================================================== --- personal/kougaro/mk/autoconf/crystal.m4 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/autoconf/crystal.m4 2009-03-16 00:47:38 UTC (rev 3221) @@ -185,6 +185,9 @@ ["$cfg" --includedir $cs_liblist]) CRYSTAL_AVAILABLE_LIBS=`"$cfg" --available-libs` CRYSTAL_STATICDEPS=`"$cfg" --static-deps` + CRYSTAL_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --prefix]) + CRYSTAL_EXEC_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --exec-prefix]) + CRYSTAL_TOOLS_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --tools-prefix]) AS_IF([test -z "$CRYSTAL_LIBS"], [cs_sdk=no])])], [cs_sdk=no]) @@ -206,6 +209,9 @@ CRYSTAL_VERSION='' CRYSTAL_LIBS='' CRYSTAL_INCLUDE_DIR='' + CRYSTAL_PREFIX='' + CRYSTAL_EXEC_PREFIX='' + CRYSTAL_TOOLS_PREFIX='' $3]) ]) @@ -235,7 +241,10 @@ AC_SUBST([CRYSTAL_LIBS]) AC_SUBST([CRYSTAL_INCLUDE_DIR]) AC_SUBST([CRYSTAL_AVAILABLE_LIBS]) -AC_SUBST([CRYSTAL_STATICDEPS])]) +AC_SUBST([CRYSTAL_STATICDEPS]) +AC_SUBST([CRYSTAL_PREFIX]) +AC_SUBST([CRYSTAL_EXEC_PREFIX])]) +AC_SUBST([CRYSTAL_TOOLS_PREFIX])]) #------------------------------------------------------------------------------ @@ -261,6 +270,8 @@ _CS_PATH_CRYSTAL_EMIT([CRYSTAL.INCLUDE_DIR],[$CRYSTAL_INCLUDE_DIR],[$6]) _CS_PATH_CRYSTAL_EMIT([CRYSTAL.AVAILABLE_LIBS],[$CRYSTAL_AVAILABLE_LIBS],[$6]) _CS_PATH_CRYSTAL_EMIT([CRYSTAL.STATICDEPS],[$CRYSTAL_STATICDEPS],[$6]) +_CS_PATH_CRYSTAL_EMIT([CRYSTAL.EXEC_PREFIX],[$CRYSTAL_EXEC_PREFIX],[$6]) +_CS_PATH_CRYSTAL_EMIT([CRYSTAL.TOOLS_PREFIX],[$CRYSTAL_TOOLS_PREFIX],[$6]) ]) AC_DEFUN([_CS_PATH_CRYSTAL_EMIT], Modified: personal/kougaro/mk/jam/flags.jam =================================================================== --- personal/kougaro/mk/jam/flags.jam 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/jam/flags.jam 2009-03-16 00:47:38 UTC (rev 3221) @@ -135,7 +135,7 @@ Clean clean : $(>) ; } -## RelayLFlags lflags : relaylibs +## RelayLFlags lflags : relaylibs [: minimal-objects ] ## Get LFLAGS for relay-linking libraries. See RelayLibs for ## more information. rule RelayLFlags @@ -147,7 +147,13 @@ else { local relayparamslist = "--relay $(2)" ; - local lflags = $(1) ; + local lflags = $(1[1]) ; + # Concatenate arrays into single strings + local lf ; + for lf in $(1[2-]) + { + lflags = "$(lflags) $(lf)" ; + } local relayparam = $(relayparamslist[1]) ; local r ; for r in $(relayparamslist[2-]) @@ -160,9 +166,14 @@ { cflags = "$(cflags) $(c)" ; } + local minimalparam = "" ; + if "$(3)" != "" + { + minimalparam = "--minimal-list \"$(3)\"" ; + } local extlib result_lflags ; result_lflags += - "`CFLAGS=\"$(cflags)\" $(CMD.RELAYTOOL) --out-dir $(LOCATE_TARGET) $(relayparam) $(lflags)`" ; + "`CFLAGS=\"$(cflags)\" $(CMD.RELAYTOOL) --out-dir $(LOCATE_TARGET) $(minimalparam) $(relayparam) $(lflags)`" ; return $(result_lflags) ; } } @@ -208,11 +219,19 @@ local extlib ; for extlib in $(>) { + # Construct list of object files for target. + # Used by relaytool to compute a minimal set of symbols that need relaying. + local minimal_list = "" ; + local o ; + for o in $($(<)_OBJECTS) + { + minimal_list = "$(minimal_list) $(LOCATE_TARGET)/$(o:G=)" ; + } + ExtraObjects $(<) : [ RelayObjs $(<) : $(3) : $(2) ] ; CFlags $(<) : $($(extlib).CFLAGS) ; - LFlags $(<) : [ RelayLFlags $($(extlib).LFLAGS) : $(3) ] ; + LFlags $(<) : [ RelayLFlags $($(extlib).LFLAGS) : $(3) : $(minimal_list) ] : noexternal ; - $(<).EXTERNALLIBS += $(extlib) ; $(<).RELAYDEPS += $(extlib) ; $(<).RELAYLIBS.$(extlib) = $(3) ; } @@ -222,8 +241,13 @@ { echo "" > $(<) whatever=`echo "$(WHATEVER)" | tr '-' '_' | tr '.' '_' ` - echo "int lib${whatever}_is_present = 1;" >> $(<) - echo "int lib${whatever}_symbol_is_present (char* s) { return 1; }" >> $(<) + my_IFS=$IFS; IFS=" " + for w in ${whatever} + do + echo "int lib${w}_is_present = 1;" >> $(<) + echo "int lib${w}_symbol_is_present (char* s) { return 1; }" >> $(<) + done + IFS=$my_IFS } ## MergeLFlags flags1 : flags2 Modified: personal/kougaro/mk/jam/icons.jam =================================================================== --- personal/kougaro/mk/jam/icons.jam 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/jam/icons.jam 2009-03-16 00:47:38 UTC (rev 3221) @@ -1,3 +1,21 @@ +#============================================================================ +# Copyright (C)2006-2009 by Frank Richter +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published by +# the Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public +# License for more details. +# +# You should have received a copy of the GNU Library General Public License +# along with this library; if not, write to the Free Software Foundation, +# Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +#============================================================================ if $(CMD.RSVG) != "" { ## IconsFromSVG iconname @@ -15,9 +33,8 @@ { local icon = $(1) ; local iconfile = $(icon).svg ; - local svgscalabledir = [ ConcatDirs $(TOP) $(SUBDIR) icons-src scalable ] ; + local svgscalabledir = [ ConcatDirs $(SUBDIR) icons-src scalable ] ; local svgsource = $(iconfile:G=$(svgscalabledir)) ; - LOCATE on $(svgsource) = $(svgscalabledir) ; SEARCH on $(svgsource) = $(svgscalabledir) ; NotFile generateicons ; @@ -36,7 +53,7 @@ # ** - Cause icon files to be really large. Vista supports PNG compression # in icons and uses it for the 256x256 versions. Problem: resource # compilers don't support that yet. - for size in 16 22 32 48 + for size in 16 22 32 48 128 256 { local pngdir = [ ConcatDirs $(SUBDIR) icons $(size) ] ; local pngfile = $(icon:G=$(pngdir)).png ; @@ -155,7 +172,7 @@ if [ -e $ICONSSRC/\${ICONBASE}_8.png ] ; then $(CP) $ICONSSRC/\${ICONBASE}_8.png $(<) else - # Makes transparency binary and reduces colors to 256- + # Makes transparency binary and reduces colors to 256 $(CMD.CONVERT) $(>) \( +clone -fx a +matte -monochrome \) -compose CopyOpacity -composite -colors 256 -dither $(<) fi } Modified: personal/kougaro/mk/jam/msvcgen.jam =================================================================== --- personal/kougaro/mk/jam/msvcgen.jam 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/jam/msvcgen.jam 2009-03-16 00:47:38 UTC (rev 3221) @@ -849,7 +849,7 @@ MANIFEST_NAME on $(manifestrc) = $(manifest) ; GenerateWin32ManifestRc $(manifestrc) ; Depends $(manifestrc) : $(manifest) ; - if $(MSVC_VERSION) = 8 + if $(MSVC_VERSION) >= 8 { # VC8: Manifest appears in project along other files, a special build # tool cares about the embedding into a resource. (The resource goop Modified: personal/kougaro/mk/jam/static.jam =================================================================== --- personal/kougaro/mk/jam/static.jam 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/jam/static.jam 2009-03-16 00:47:38 UTC (rev 3221) @@ -268,6 +268,8 @@ lflags = [ MergeRemovingDups $(lflags) : [ RelayLFlags $(STATICPLUGIN.$(p).RELAYLFLAGS.$(relaydep)) : $(STATICPLUGIN.$(p).RELAYLIBS.$(relaydep)) ] ] ; + # @@@ If we can get the .a file name for the static plugin lib + # we could pass that for the minimal-objects relayobjs += [ RelayObjs $(lflags_target) : $(STATICPLUGIN.$(p).RELAYLIBS.$(relaydep)) : $(relaydep) ] ; } @@ -290,8 +292,23 @@ # Grab flags for p in $(plugins) { - lflags += [ Filter $($(p).LFLAGS) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ; + lflags += [ Filter $($(p).LFLAGS.EXTERNAL) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ; libs += $($(p).NEEDLIBS) ; + + local relaydeps = $($(p).RELAYDEPS) ; + for relaydep in $(relaydeps) + { + local libpath ; + libpath = [ ConcatDirs + [ on $($(STATICPLUGINS.LIBRARY)_TARGET) GetVar SEARCH ] + $($(STATICPLUGINS.LIBRARY)_TARGET) + ] ; + lflags = [ MergeRemovingDups $(lflags) : + [ RelayLFlags $($(relaydep).LFLAGS) : + $($(p).RELAYLIBS.$(relaydep)) : $(libpath) ] ] ; + relayobjs += [ RelayObjs $(target) : + $($(p).RELAYLIBS.$(relaydep)) : $(relaydep) ] ; + } } target_link_with = [ RemoveDupFlags $(libs) ] ; target_lflags = [ RemoveDups $(lflags) ] ; Modified: personal/kougaro/mk/jam/swig.jam =================================================================== --- personal/kougaro/mk/jam/swig.jam 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/jam/swig.jam 2009-03-16 00:47:38 UTC (rev 3221) @@ -69,7 +69,7 @@ #ifdef _MSC_VER\\ #include <io.h>\\ #include <stdarg.h>\\ - #ifndef DEBUG_PYTHON\\ + #if defined(_DEBUG) \\\&\\\& !defined(DEBUG_PYTHON)\\ #undef _DEBUG\\ #define RESTORE__DEBUG\\ #endif\\ Modified: personal/kougaro/mk/msvc7/appeedit.vcproj =================================================================== --- personal/kougaro/mk/msvc7/appeedit.vcproj 2009-03-15 14:47:34 UTC (rev 3220) +++ personal/kougaro/mk/msvc7/appeedit.vcproj 2009-03-16 00:47:38 UTC (rev 3221) @@ -7,11 +7,10 @@ SccProjectName="" SccLocalPath=""> <Platforms> - <Platform - Name="Win32"/> - </Platforms> + <Platform Name="Win32"/> + </Platforms> <Configurations> - <Configuration + <Configuration Name="Release (with static libs)|Win32" OutputDirectory="..\..\out\release7\build\appeedit\" IntermediateDirectory="..\..\out\release7\build\appeedit\" @@ -26,9 +25,8 @@ StringPooling="TRUE" EnableFunctionLevelLinking="TRUE" RuntimeLibrary="2" - DebugInformationFormat="3" BufferSecurityCheck="FALSE" - ProgramDataBaseFileName="..\..\out\release7\build\appeedit\eedit.pdb" + ProgramDataBaseFileName="..\..\out\release7\build\appeedit\Win32\eedit.pdb" PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32" OptimizeForProcessor="1" AdditionalOptions=" " @@ -38,9 +36,10 @@ ObjectFile="..\..\out\release7\build\appeedit\" WarningLevel="3" SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="false" TreatWChar_tAsBuiltInType="false" ForceConformanceInForLoopScope="true" + DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> @@ -52,7 +51,7 @@ GenerateDebugInformation="TRUE" IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD" OutputFile="..\..\eedit.exe" - ProgramDatabaseFile="..\..\out\release7\build\appeedit\eedit.pdb" + ProgramDatabaseFile="..\..\out\release7\build\appeedit\Win32\eedit.pdb" SubSystem="2" AdditionalOptions=" " AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" @@ -87,7 +86,7 @@ <Tool Name="VCWebDeploymentTool"/> </Configuration> - <Configuration + <Configuration Name="Release (with DLLs)|Win32" OutputDirectory="..\..\out\release7\build\appeedit\" IntermediateDirectory="..\..\out\release7\build\appeedit\" @@ -102,9 +101,8 @@ StringPooling="TRUE" EnableFunctionLevelLinking="TRUE" RuntimeLibrary="2" - DebugInformationFormat="3" BufferSecurityCheck="FALSE" - ProgramDataBaseFileName="..\..\out\release7\build\appeedit\eedit.pdb" + ProgramDataBaseFileName="..\..\out\release7\build\appeedit\Win32\eedit.pdb" PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" OptimizeForProcessor="1" AdditionalOptions=" " @@ -114,9 +112,10 @@ ObjectFile="..\..\out\release7\build\appeedit\" WarningLevel="3" SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="false" TreatWChar_tAsBuiltInType="false" ForceConformanceInForLoopScope="true" + DebugInformationFormat="3" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> @@ -128,7 +127,7 @@ GenerateDebugInformation="TRUE" IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD" OutputFile="..\..\eedit.exe" - ProgramDatabaseFile="..\..\out\release7\build\appeedit\eedit.pdb" + ProgramDatabaseFile="..\..\out\release7\build\appeedit\Win32\eedit.pdb" SubSystem="2" AdditionalOptions=" " AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" @@ -163,7 +162,7 @@ <Tool Name="VCWebDeploymentTool"/> </Configuration> - <Configuration + <Configuration Name="Debug (with static libs)|Win32" OutputDirectory="..\..\out\debug7\build\appeedit\" IntermediateDirectory="..\..\out\debug7\build\appeedit\" @@ -175,11 +174,10 @@ Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" - DebugInformationFormat="4" RuntimeTypeInfo="TRUE" RuntimeLibrary="3" - ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\eedit.pdb" + ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\Win32\eedit.pdb" PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32" OptimizeForProcessor="1" AdditionalOptions=" " @@ -189,9 +187,10 @@ ObjectFile="..\..\out\debug7\build\appeedit\" WarningLevel="3" SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="false" TreatWChar_tAsBuiltInType="false" ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> @@ -201,7 +200,7 @@ GenerateDebugInformation="TRUE" IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" OutputFile="..\..\eedit.exe" - ProgramDatabaseFile="..\..\out\debug7\build\appeedit\eedit.pdb" + ProgramDatabaseFile="..\..\out\debug7\build\appeedit\Win32\eedit.pdb" SubSystem="1" AdditionalOptions=" " AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" @@ -236,7 +235,7 @@ <Tool Name="VCWebDeploymentTool"/> </Configuration> - <Configuration + <Configuration Name="Debug (with DLLs)|Win32" OutputDirectory="..\..\out\debug7\build\appeedit\" IntermediateDirectory="..\..\out\debug7\build\appeedit\" @@ -248,11 +247,10 @@ Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" - DebugInformationFormat="4" RuntimeTypeInfo="TRUE" RuntimeLibrary="3" - ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\eedit.pdb" + ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\Win32\eedit.pdb" PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" OptimizeForProcessor="1" AdditionalOptions=" " @@ -262,9 +260,10 @@ ObjectFile="..\..\out\debug7\build\appeedit\" WarningLevel="3" SuppressStartupBanner="TRUE" - Detect64BitPortabilityProblems="TRUE" + Detect64BitPortabilityProblems="false" TreatWChar_tAsBuiltInType="false" ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" CompileAs="0"/> <Tool Name="VCCustomBuildTool"/> @@ -274,7 +273,7 @@ GenerateDebugInformation="TRUE" IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" OutputFile="..\..\eedit.exe" - ProgramDatabaseFile="..\..\out\debug7\build\appeedit\eedit.pdb" + ProgramDatabaseFile="..\..\out\debug7\build\appeedit\Win32\eedit.pdb" SubSystem="1" AdditionalOptions=" " AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" @@ -309,7 +308,7 @@ <Tool Name="VCWebDeploymentTool"/> </Configuration> - <Configuration + <Configuration Name="MemoryTracker (with static libs)|Win32" OutputDirectory="..\..\out\debug7\build\appeedit\" IntermediateDirectory="..\..\out\debug7\build\appeedit\" @@ -321,11 +320,10 @@ Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="TRUE" - DebugInformationFormat="4" RuntimeTypeInfo="TRUE" RuntimeLibrary="3" - ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\eedit.pdb" + ProgramDataBaseFileName="..\..\out\debug7\build\appeedit\Win32\eedit.pdb" PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS;WIN32" OptimizeForProcessor="1" AdditionalOptions=" " @@ -335,9 +333,10 @@ ObjectFile="..\..\out\debug7\build\appeedit\" WarningLevel="3" SuppressStartupBanner=... [truncated message content] |
From: <ko...@us...> - 2009-03-16 02:11:34
|
Revision: 3222 http://planeshift.svn.sourceforge.net/planeshift/?rev=3222&view=rev Author: kougaro Date: 2009-03-16 02:11:29 +0000 (Mon, 16 Mar 2009) Log Message: ----------- Fixed the previous merge Modified Paths: -------------- personal/kougaro/data/help.xml personal/kougaro/docs/compiling.html personal/kougaro/docs/history.txt personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/client.cpp personal/kougaro/src/server/client.h personal/kougaro/src/server/database/mysql/commonstrings.sql personal/kougaro/src/server/paladinjr.cpp personal/kougaro/src/server/usermanager.cpp Added Paths: ----------- personal/kougaro/data/ProgressionSchema.rng personal/kougaro/mk/msvc7/appccheck.vcproj personal/kougaro/mk/msvc71/appccheck.vcproj personal/kougaro/mk/msvc8/appccheck.vcproj personal/kougaro/mk/msvc9/appccheck.vcproj personal/kougaro/src/common/util/mathscript_unittest.cpp personal/kougaro/src/server/bulkobjects/activespell.cpp personal/kougaro/src/server/bulkobjects/activespell.h personal/kougaro/src/server/bulkobjects/buffable.h personal/kougaro/src/server/scripting.cpp personal/kougaro/src/server/scripting.h Property Changed: ---------------- personal/kougaro/ personal/kougaro/lang/1337/data/ personal/kougaro/lang/french/data/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972,2975-3050,3052-3116 + /personal/Kayden:2590-3147 /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2872-2972,2974-3050,3052-3220 Added: personal/kougaro/data/ProgressionSchema.rng =================================================================== --- personal/kougaro/data/ProgressionSchema.rng (rev 0) +++ personal/kougaro/data/ProgressionSchema.rng 2009-03-16 02:11:29 UTC (rev 3222) @@ -0,0 +1,342 @@ +<?xml version="1.0"?> +<!-- + ProgressionSchema.rng - a RelaxNG schema for PlaneShift Progression Scripts. + + Author: Kenny Graunke <ke...@wh...> + Copyright (C) 2009 Atomic Blue (in...@pl..., http://www.atomicblue.org) + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation (version 2 of the License) + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + --> +<grammar xmlns="http://relaxng.org/ns/structure/1.0"> + <start> + <element name="script"> + <ref name="ImperativeMode"/> + </element> + </start> + + <define name="ImperativeMode"> + <zeroOrMore> + <choice> + <!-- let-blocks --> + <element name="let"> + <attribute name="vars"/> + <ref name="ImperativeMode"/> + </element> + + <!-- conditionals --> + <element name="if"> + <attribute name="t"/> + <element name="then"> + <ref name="ImperativeMode"/> + </element> + <optional> + <element name="else"> + <ref name="ImperativeMode"/> + </element> + </optional> + </element> + <element name="apply"> + <attribute name="aim"/> + <attribute name="name"/> + <ref name="SpellType"/> + <attribute name="duration"/> + <ref name="ApplyMode"/> + </element> + <element name="apply-linked"> + <attribute name="name"/> + <attribute name="duration"/> + <interleave> + <element name="buff"> <!-- beneficiary, but that's rather wordy --> + <attribute name="aim"/> + <ref name="ApplyMode"/> + </element> + <element name="debuff"> <!-- victim --> + <attribute name="aim"/> + <ref name="ApplyMode"/> + </element> + </interleave> + </element> + <element name="cancel"> + <attribute name="aim"/> + <attribute name="type"> + <choice> + <value>all</value> + <value>ordered</value> + <value>random</value> + </choice> + </attribute> + <oneOrMore> + <element name="script"> + <attribute name="name"/> + <ref name="SpellType"/> + </element> + </oneOrMore> + </element> + + <!-- imperative operations --> + + <element name="msg"> + <attribute name="aim"/> + <attribute name="text"/> + </element> + <element name="fx"> + <optional> + <attribute name="source"/> + </optional> + <attribute name="target"/> + <attribute name="name"/> + <optional> + <attribute name="type"> + <choice> + <value>attached</value> + <value>unattached</value> + </choice> + </attribute> + </optional> + </element> + + <element name="teleport"> <ref name="teleport"/> </element> + + <element name="create-familiar"> + <empty/> <!-- someday: type element? --> + </element> + + <element name="key"> + <!-- TBH this is bad, we can't determine if keyID is necessary. --> + <!-- should probably change these operations... --> + <attribute name="aim"/> + <attribute name="funct"> + <choice> + <value>make</value> + <value>modify</value> + </choice> + </attribute> + <attribute name="lockid"/> + <attribute name="stat"/> + <attribute name="location"> + <choice> + <value>inventory</value> + <value>ground</value> + </choice> + </attribute> + </element> + + <element name="action"> + <attribute name="aim"/> + <attribute name="sector"/> + <attribute name="stat"/> + </element> + + <element name="item"> + <attribute name="aim"/> + <attribute name="name"/> + <attribute name="count"/> + <attribute name="location"> + <choice> + <value>wallet</value> + <value>inventory</value> + <value>ground</value> + </choice> + </attribute> + </element> + + <element name="createfamiliar"> + <attribute name="aim"/> + </element> + + <!-- TODO: summon --> + <element name="fog"> + <optional> + <attribute name="r"/> + <attribute name="g"/> + <attribute name="b"/> + </optional> + </element> + <element name="rain"> + <ref name="weatherbase"/> + <attribute name="density"/> + </element> + <element name="snow"> + <ref name="weatherbase"/> + <attribute name="density"/> + </element> + <element name="lightning"> + <ref name="weatherbase"/> + </element> + <element name="weather"> <!-- automatic weather --> + <attribute name="enable"> <ref name="boolean"/> </attribute> + <attribute name="sector"/> + </element> + + <!-- vitals --> + <element name="hp"> <ref name="imperative2"/> </element> + <element name="mana"> <ref name="imperative2"/> </element> + <element name="pstamina"> <ref name="imperative2"/> </element> + <element name="mstamina"> <ref name="imperative2"/> </element> + + <!-- stats --> + <element name="agi"> <ref name="imperative2"/> </element> + <element name="end"> <ref name="imperative2"/> </element> + <element name="str"> <ref name="imperative2"/> </element> + <element name="cha"> <ref name="imperative2"/> </element> + <element name="int"> <ref name="imperative2"/> </element> + <element name="wil"> <ref name="imperative2"/> </element> + + <!-- other --> + <element name="exp"> <ref name="imperative2"/> </element> + + <element name="skill"> <ref name="imperative3"/> </element> + <element name="faction"> <ref name="imperative3"/> </element> + <element name="animal-affinity"> <ref name="imperative3"/> </element> + + </choice> + </zeroOrMore> + </define> + + <define name="ApplyMode"> + <oneOrMore> + <choice> + <!-- buffables --> + <element name="hp-rate"> <ref name="applied1"/> </element> + <element name="mana-rate"> <ref name="applied1"/> </element> + <element name="pstamina-rate"> <ref name="applied1"/> </element> + <element name="mstamina-rate"> <ref name="applied1"/> </element> + + <element name="hp-max"> <ref name="applied1"/> </element> + <element name="mana-max"> <ref name="applied1"/> </element> + <element name="pstamina-max"> <ref name="applied1"/> </element> + <element name="mstamina-max"> <ref name="applied1"/> </element> + + <element name="atk"> <ref name="applied1"/> </element> + <element name="def"> <ref name="applied1"/> </element> + + <element name="agi"> <ref name="applied1"/> </element> + <element name="end"> <ref name="applied1"/> </element> + <element name="str"> <ref name="applied1"/> </element> + <element name="cha"> <ref name="applied1"/> </element> + <element name="int"> <ref name="applied1"/> </element> + <element name="wil"> <ref name="applied1"/> </element> + + <element name="skill"> <ref name="applied2"/> </element> + <element name="faction"> <ref name="applied2"/> </element> + <element name="animal-affinity"> <ref name="applied2"/> </element> + + <!-- overridables --> + <element name="mesh"> <ref name="applied1"/> </element> + <element name="pos"> <ref name="teleport"/> </element> + + <!-- other --> + <element name="msg"> + <attribute name="text"/> + <attribute name="undo"/> + </element> + + <element name="fx"> + <optional> + <choice> + <attribute name="source"/> + <group> + <attribute name="x"/> + <attribute name="y"/> + <attribute name="z"/> + </group> + </choice> + </optional> + <attribute name="name"/> + </element> + + <element name="on"> + <choice> + <attribute name="type"> + <choice> + <value>attack</value> + <value>defense</value> + <value>nearlydead</value> + </choice> + </attribute> + <attribute name="distance"/> <!-- how do we handle enter/exit pairing again? --> + <!-- attributes for naming input parameters? --> + </choice> + <ref name="ImperativeMode"/> + </element> + + </choice> + </oneOrMore> + </define> + + <define name="imperative2"> + <attribute name="aim"/> + <attribute name="value"/> + </define> + + <define name="imperative3"> + <attribute name="aim"/> + <attribute name="name"/> + <attribute name="value"/> + </define> + + <define name="applied1"> + <attribute name="value"/> + </define> + + <define name="applied2"> + <attribute name="name"/> + <attribute name="value"/> + </define> + + <define name="SpellType"> + <attribute name="type"> + <choice> + <value>buff</value> + <value>debuff</value> + <value>item</value> + </choice> + </attribute> + </define> + + <define name="teleport"> + <choice> + <attribute name="location"/> + <group> + <attribute name="map"/> + <optional> + <attribute name="x"/> + <attribute name="y"/> + <attribute name="z"/> + </optional> + <optional> + <attribute name="instance"/> + </optional> + </group> + </choice> + </define> + + <define name="weatherbase"> + <attribute name="type"> + <choice> + <value>rain</value> + <value>snow</value> + </choice> + </attribute> + <attribute name="sector"/> + <attribute name="duration"/> + <attribute name="fade"/> + <attribute name="enable"> <ref name="boolean"/> </attribute> + </define> + + <define name="boolean"> + <choice> + <value>true</value> + <value>false</value> + </choice> + </define> +</grammar> Property changes on: personal/kougaro/data/ProgressionSchema.rng ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Modified: personal/kougaro/data/help.xml =================================================================== --- personal/kougaro/data/help.xml 2009-03-16 00:47:38 UTC (rev 3221) +++ personal/kougaro/data/help.xml 2009-03-16 02:11:29 UTC (rev 3222) @@ -39,6 +39,9 @@ <topic name="/mypet">/mypet action Have your pet perform an action seen by those in its vicinity (within 10 meters). This is a great roleplaying tool when you want your pet to do something not directly supported by the game. You can also use "/mypet 's property" to describe your pet, similar to the /my command.</topic> + <topic name="/npcmenu">/npcmenu + +Shows a menu to talk to npcs where available.</topic> <topic name="/report">/report player Makes the server log everything the indicated player says for 5 minutes. @@ -56,9 +59,6 @@ <topic name="/tellnpc">/tellnpc message Talk to the currently targeted npc.</topic> - <topic name="/npcmenu">/npcmenu - -Shows a menu to talk to npcs where available.</topic> </branch> <branch name="User Commands"> Commands to control various player actions. Many of these are also available via windows and context menus. Modified: personal/kougaro/docs/compiling.html =================================================================== --- personal/kougaro/docs/compiling.html 2009-03-16 00:47:38 UTC (rev 3221) +++ personal/kougaro/docs/compiling.html 2009-03-16 02:11:29 UTC (rev 3222) @@ -43,7 +43,7 @@ // Source versions are listed here and automatically updated in the body. // Standard revisions (CSrev) are the ones that are compatible with Laanx. // An additional CS revision (CSrev_HEAD) may be specified for the latest version of PS. - var CSrev = "31648"; // CS_SOURCE_REV + var CSrev = "32140"; // CS_SOURCE_REV var CAL3Drev = "507"; // CAL3D_SOURCE_REV var CSrev_HEAD = "HEAD"; // CS_SOURCE_REV_HEAD var CAL3Drev_HEAD = "507"; // CAL3D_SOURCE_REV_HEAD Modified: personal/kougaro/docs/history.txt =================================================================== --- personal/kougaro/docs/history.txt 2009-03-16 00:47:38 UTC (rev 3221) +++ personal/kougaro/docs/history.txt 2009-03-16 02:11:29 UTC (rev 3222) @@ -1,4 +1,83 @@ -*** 2009-02-24 by Stefano Angeleri +*** 2009-03-1 by Stefano Angeleri +- Fixed PS#2798 - NPC items lose quality by setting all equipped items + back to max quality on respawn. + +*** 2009-03-14 by Kenny Graunke +- Fixes to the progression script schema: + - Switched to <zeroOrMore> for imperative operations to support the + "Nothing special" character creation options, which are <script></script>. + - Made <else> optional. +- Made the type attribute optional on imperative <fx> (defaults to attached). +- Improved more error messages when scripts fail to load. +- Added spell table structure conversion to upgrade_schema.sql. + +*** 2009-03-13 by Tristan Cragnolini +- Changed the virtual functions in gemObject, implemented in the derived + classes, to get a pointer to the derived classes. They now are wrapper + for dynamic_cast to the derived classes. + +*** 2009-03-12 by Keith Fulton +- Implemented the riddle prompt functionality from the quest popup menus. + Use: Menu: ?=Question Reminder to script this functionality. + Talk to the Merchant to get this puzzle quest and try it. "blue" is the correct + answer to the riddle. It is quest script 210 if you want to see the example. +- Other warning fixes and data type fixes. + +*** 2009-03-12 by Kenny Graunke +- Added MathScript accessors for HP, Mana, and Stamina. +- Fixed "Run script ..." in quests, which wasn't providing the script with the + necessary actors. Now it defines "NPC" and "Target" (the player). + +*** 2009-03-12 by Stefano Angeleri +- Added attackable flag for gm. Players will be able to attack him like a mob + but without kill steal protection. It's also the only way to use effectively + givekillexp +- various improvements in gm gui +- fixed bugs in petition management +- Removed double spaces in /inspect +- Updates to the compiling guide +- Fixed tab width in the chardescription window by caarrie + +*** 2009-03-10 by Kenny Graunke +- Converted Buffables to use csArray instead of csList to improve their + efficiency (memory usage and cache behavior). + +*** 2009-03-09 by Tristan Cragnolini +- Fixed PS#613 - You always receive group loot when you're in a guildhouse. + Patch by Vornne +- Fixed PS#2799 - Server crash when uploading character, patch by Lanarel +- Improved the parsing in /rotate, taking into account first axis + parameter being 0 +- Corrected a loss of target when using /slide or /rotate on items + +*** 2009-03-08 by Kenny Graunke +- Fixed a crash when killing an NPC with the /death command. +- Fixed an underflow bug with skills and stats. + +*** 2009-03-06 by Kenny Graunke +- Rewrote MathScript, ProgressionScript, and the magic system. + +*** 2009-03-06 by Tristan Cragnolini +- Fixed PS#2795 - guarding range ignores instance + +*** 2009-03-01 by Stefano Angeleri +- Committed a patch by peeg fixing some little issues in the chardescription + editing window + +*** 2009-03-01 by Stefano Angeleri +- Changed behaviour of the onlinetime prerequisite operator + now you don't have to pass the type but works like factions so just + pass max or min and if you need both and two onlinetime operators +- fixed some comments and cleaned up some code +- added Require guild [private/public/], Require not guild [private/public/], + Require active magic [magicname], Require not active magic [magicname], + Require known spell [spellname], Require not known spell [spellname], + Require race [Racename as per db], Require not race [racename as per db], + Require gender [male/female/neutral], Require not gender [male/female/neutral], + Require married, Require not married to the quest script syntax allowing + so more dynamic quests without doing many duplicates. + +*** 2009-02-24 by Stefano Angeleri - Updated gm gui to the new paws specifications - Fixed PS#2785 - [pawscrollbar] Keeps scrolling undefinitely even when not clicking. pawsscrollbar onbuttonrelease() was forgot with the Property changes on: personal/kougaro/lang/1337/data ___________________________________________________________________ Added: svn:mergeinfo + /trunk/lang/1337/data:2872,2974,3117-3220 Property changes on: personal/kougaro/lang/french/data ___________________________________________________________________ Added: svn:mergeinfo + /trunk/lang/french/data:2872,2974,3117-3220 Added: personal/kougaro/mk/msvc7/appccheck.vcproj =================================================================== --- personal/kougaro/mk/msvc7/appccheck.vcproj (rev 0) +++ personal/kougaro/mk/msvc7/appccheck.vcproj 2009-03-16 02:11:29 UTC (rev 3222) @@ -0,0 +1,775 @@ +<?xml version="1.0" encoding = "Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.00" + Name="appccheck" + ProjectGUID="{5B4A2B5C-518A-C9D6-D6C0-91E11627AB32}" + SccProjectName="" + SccLocalPath=""> + <Platforms> + <Platform Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Release (with static libs)|Win32" + OutputDirectory="..\..\out\release7\build\appccheck\" + IntermediateDirectory="..\..\out\release7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + StringPooling="TRUE" + EnableFunctionLevelLinking="TRUE" + RuntimeLibrary="2" + BufferSecurityCheck="FALSE" + ProgramDataBaseFileName="..\..\out\release7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\release7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\release7\build\appccheck\" + ObjectFile="..\..\out\release7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\release7\build\appccheck\Win32\ccheck.pdb" + SubSystem="2" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\release7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\release7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\release7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Release (with DLLs)|Win32" + OutputDirectory="..\..\out\release7\build\appccheck\" + IntermediateDirectory="..\..\out\release7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + StringPooling="TRUE" + EnableFunctionLevelLinking="TRUE" + RuntimeLibrary="2" + BufferSecurityCheck="FALSE" + ProgramDataBaseFileName="..\..\out\release7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\release7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\release7\build\appccheck\" + ObjectFile="..\..\out\release7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\release7\build\appccheck\Win32\ccheck.pdb" + SubSystem="2" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\release7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\release7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\release7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Debug (with static libs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Debug (with DLLs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="MemoryTracker (with static libs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS;WIN32" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="MemoryTracker (with DLLs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_MEMORY_TRACKER;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="RefTracker (with static libs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_REF_TRACKER;_WINDOWS;WIN32" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_REF_TRACKER;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_REF_TRACKER;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="RefTracker (with DLLs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_REF_TRACKER;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace_d.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_REF_TRACKER;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;CS_REF_TRACKER;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="DebugPSReleaseCSCEL (with static libs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="DebugPSReleaseCSCEL (with DLLs)|Win32" + OutputDirectory="..\..\out\debug7\build\appccheck\" + IntermediateDirectory="..\..\out\debug7\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + MinimalRebuild="TRUE" + RuntimeTypeInfo="TRUE" + RuntimeLibrary="3" + + ProgramDataBaseFileName="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\debug7\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\debug7\build\appccheck\" + ObjectFile="..\..\out\debug7\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="4" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\debug7\build\appccheck\Win32\ccheck.pdb" + SubSystem="1" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\debug7\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\debug7\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\debug7\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=7" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + </Configurations> + <Files> + <Filter + Name="Source Files" + Filter=""> + <File + RelativePath="..\..\src\tools\ccheck\ccheck.cpp"> + </File> + </Filter> + <Filter + Name="Header Files" + Filter=""> + <File + RelativePath="..\..\src\tools\ccheck\ccheck.h"> + </File> + </Filter> + <Filter + Name="Resource Files" + Filter=""> + <File + RelativePath="..\..\mk\msvc\appccheck.rc"> + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Property changes on: personal/kougaro/mk/msvc7/appccheck.vcproj ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:eol-style + native Added: personal/kougaro/mk/msvc71/appccheck.vcproj =================================================================== --- personal/kougaro/mk/msvc71/appccheck.vcproj (rev 0) +++ personal/kougaro/mk/msvc71/appccheck.vcproj 2009-03-16 02:11:29 UTC (rev 3222) @@ -0,0 +1,775 @@ +<?xml version="1.0" encoding = "Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="appccheck" + ProjectGUID="{5B4A2B5C-518A-C9D6-D6C0-91E11627AB32}" + SccProjectName="" + SccLocalPath=""> + <Platforms> + <Platform Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Release (with static libs)|Win32" + OutputDirectory="..\..\out\release71\build\appccheck\" + IntermediateDirectory="..\..\out\release71\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + StringPooling="TRUE" + EnableFunctionLevelLinking="TRUE" + RuntimeLibrary="2" + BufferSecurityCheck="FALSE" + ProgramDataBaseFileName="..\..\out\release71\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\release71\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\release71\build\appccheck\" + ObjectFile="..\..\out\release71\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\release71\build\appccheck\Win32\ccheck.pdb" + SubSystem="2" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace.lib ws2_32.lib zlib.lib" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs;$(CRYSTAL)\libs\csutil\win32\libs" + TargetMachine="1"/> + <Tool + Name="VCLibrarianTool" + SuppressStartupBanner="TRUE"/> + <Tool + Name="VCMIDLTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS" + MkTypLibCompatible="TRUE" + SuppressStartupBanner="TRUE" + TargetEnvironment="1" + TypeLibraryName="..\..\out\release71\build\appccheck\appccheck.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="md ..\..\out\release71\bin 2> nul
copy /y "$(TargetPath)" ..\..\out\release71\bin\
" + /> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;PROJECTGEN_VERSION=71" + AdditionalIncludeDirectories=".;..\..\src\tools\ccheck;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + </Configuration> + <Configuration + Name="Release (with DLLs)|Win32" + OutputDirectory="..\..\out\release71\build\appccheck\" + IntermediateDirectory="..\..\out\release71\build\appccheck\" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + StringPooling="TRUE" + EnableFunctionLevelLinking="TRUE" + RuntimeLibrary="2" + BufferSecurityCheck="FALSE" + ProgramDataBaseFileName="..\..\out\release71\build\appccheck\Win32\ccheck.pdb" + PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;CS_SUPPORTS_MMX;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS" + OptimizeForProcessor="1" + AdditionalOptions=" " + AdditionalIncludeDirectories=".;..\..;..\..\include;..\..\src\client;..\..\src\server;..\..\src\common;..\..\src\tools\wordnet;..\..\include\msvc;..\..\..\CS\include;$(CRYSTAL)\include;$(CRYSTAL)\include\csutil;$(CRYSTAL)\include\csutil\win32" + PrecompiledHeaderFile="..\..\out\release71\build\appccheck\appccheck.pch" + AssemblerListingLocation="..\..\out\release71\build\appccheck\" + ObjectFile="..\..\out\release71\build\appccheck\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="false" + TreatWChar_tAsBuiltInType="false" + ForceConformanceInForLoopScope="true" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + GenerateDebugInformation="TRUE" + IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD" + OutputFile="..\..\ccheck.exe" + ProgramDatabaseFile="..\..\out\release71\build\appccheck\Win32\ccheck.pdb" + SubSystem="2" + AdditionalOptions=" " + AdditionalDependencies="libcrystalspace.lib ws2... [truncated message content] |
From: <ko...@us...> - 2009-03-17 04:16:00
|
Revision: 3226 http://planeshift.svn.sourceforge.net/planeshift/?rev=3226&view=rev Author: kougaro Date: 2009-03-17 04:15:40 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Implemented /unmount Modified Paths: -------------- personal/kougaro/data/gui/interact.xml personal/kougaro/src/client/charapp.cpp personal/kougaro/src/client/charapp.h personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/psserverdr.cpp personal/kougaro/src/server/usermanager.cpp Modified: personal/kougaro/data/gui/interact.xml =================================================================== --- personal/kougaro/data/gui/interact.xml 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/data/gui/interact.xml 2009-03-17 04:15:40 UTC (rev 3226) @@ -137,7 +137,7 @@ <bgimage resource="ButtonCombine" /> </widget> - <widget name="ButtonUnmount" factory="pawsButton" id="2700" tooltip="Mount"> + <widget name="ButtonUnmount" factory="pawsButton" id="2700" tooltip="Unmount"> <frame x="128" y="128" width="64" height="64" /> <bgimage resource="ButtonBanking" /> </widget> Modified: personal/kougaro/src/client/charapp.cpp =================================================================== --- personal/kougaro/src/client/charapp.cpp 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/client/charapp.cpp 2009-03-17 04:15:40 UTC (rev 3226) @@ -338,6 +338,32 @@ } +void psCharAppearance::RemoveRider(GEMClientActor* rider) +{ + csRef<iSpriteCal3DSocket> socket = state->FindSocket("back"); + if ( !socket ) + { + Error1("\"back\" socket not found."); + return; + } + + csRef<iMeshWrapper> meshWrap = rider->pcmesh; + + csVector3 rpos = rider->GetPosition(); + float rrot = rider->GetRotation(); + + meshWrap->QuerySceneNode()->SetParent(0); + meshWrap->GetMovable()->SetSector(baseMesh->GetMovable()->GetSectors()->Get(0)); + + const char* rsec = ""; + if(rider->GetSector()) + rsec = rider->GetSector()->QueryObject()->GetName(); + rider->Move(rpos, rrot, rsec); + + socket->SetMeshWrapper(NULL); + usedSlots.Delete("back"); +} + void psCharAppearance::ApplyEquipment(csString& equipment) { if ( equipment.Length() == 0 ) @@ -838,7 +864,7 @@ } else { - meshWrap->QuerySceneNode ()->SetParent (0); + meshWrap->QuerySceneNode()->SetParent (0); socket->SetMeshWrapper( NULL ); engine->RemoveObject( meshWrap ); } Modified: personal/kougaro/src/client/charapp.h =================================================================== --- personal/kougaro/src/client/charapp.h 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/client/charapp.h 2009-03-17 04:15:40 UTC (rev 3226) @@ -113,6 +113,11 @@ */ void ApplyRider(GEMClientActor* rider); + /** Remove the rider's mesh of the back of the actor + * @param riderID The character's ID to put on the back of the mount + */ + void RemoveRider(GEMClientActor* rider); + /** Equip an item onto the model. * @param slotname The socket we want to place the item. * @param mesh The name of the 3D mesh to attach in above socket. Modified: personal/kougaro/src/client/psclientchar.cpp =================================================================== --- personal/kougaro/src/client/psclientchar.cpp 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/client/psclientchar.cpp 2009-03-17 04:15:40 UTC (rev 3226) @@ -505,46 +505,34 @@ psMountingMessage msg(me); GEMClientActor* mount = (GEMClientActor*)cel->FindObject(msg.mount); - - unsigned int riderID = msg.rider; - GEMClientActor* rider = (GEMClientActor*)cel->FindObject(riderID); - if (!mount) { Error2("Couldn't find mount with EID: %u", msg.mount); return; } - // Update the actor and the camera - // Note : maybe this could be done in a better way? - int currentMode = psengine->GetPSCamera()->GetCameraMode(); - psengine->GetPSCamera()->InitializeView(mount); - mount->charApp->ApplyRider(rider); - psengine->GetPSCamera()->SetCameraMode(currentMode); + GEMClientActor* rider = (GEMClientActor*)cel->FindObject(msg.rider); + if (!rider) + { + Error2("Couldn't find rider with EID: %u", msg.rider); + return; + } - // Update any doll views registered for changes - csArray<iPAWSSubscriber*> dolls = PawsManager::GetSingleton().ListSubscribers("sigActorUpdate"); - for (size_t i=0; i<dolls.GetSize(); i++) + //Update the player + if(msg.mounting) + mount->charApp->ApplyRider(rider); + else { - if (dolls[i] == NULL) - continue; - pawsObjectView* doll = dynamic_cast<pawsObjectView*>(dolls[i]); + mount->charApp->RemoveRider(rider); + } - if (doll == NULL) - continue; - if (doll->GetID() == msg.mount) // This is a doll of the updated object - { - iMeshWrapper* dollObject = doll->GetObject(); - if (dollObject == NULL) - { - Error2("Cannot update registered doll view with ID %d because it has no object", doll->GetID()); - continue; - } - psCharAppearance* p = doll->GetCharApp(); - p->Clone(mount->charApp); - p->SetMesh(dollObject); - p->ApplyRider(rider); - } + // Update our camera, if we are the one mounting + // Note : maybe this could be done in a better way? + if(rider == cel->GetMainPlayer()) + { + int currentMode = psengine->GetPSCamera()->GetCameraMode(); + psengine->GetPSCamera()->InitializeView(msg.mounting ? mount : rider); + psengine->GetPSCamera()->SetCameraMode(currentMode); } } Modified: personal/kougaro/src/common/net/messages.cpp =================================================================== --- personal/kougaro/src/common/net/messages.cpp 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/common/net/messages.cpp 2009-03-17 04:15:40 UTC (rev 3226) @@ -2519,15 +2519,17 @@ psMountingMessage::psMountingMessage( uint32_t clientNum, EID mountid, - EID riderid ) + EID riderid, + bool mounting ) { - msg.AttachNew(new MsgEntry( sizeof(uint32_t)*2 +1)); + msg.AttachNew(new MsgEntry( sizeof(uint32_t)*2 + sizeof(bool) +1)); msg->SetType(MSGTYPE_MOUNTING); msg->clientnum = clientNum; msg->Add(mountid.Unbox()); msg->Add(riderid.Unbox()); + msg->Add(mounting); // Sets valid flag based on message overrun state valid=!(msg->overrun); @@ -2540,6 +2542,7 @@ mount = message->GetUInt32(); rider = message->GetUInt32(); + mounting = message->GetBool(); // Sets valid flag based on message overrun state valid=!(message->overrun); @@ -2551,6 +2554,7 @@ msgtext.AppendFmt(" Mount: %d",mount); msgtext.AppendFmt(" Rider: %d",rider); + msgtext.AppendFmt(" Operation : ", (mounting ? "mounting" : "dismounting")); return msgtext; } Modified: personal/kougaro/src/common/net/messages.h =================================================================== --- personal/kougaro/src/common/net/messages.h 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/common/net/messages.h 2009-03-17 04:15:40 UTC (rev 3226) @@ -1825,7 +1825,8 @@ */ psMountingMessage( uint32_t clientNum, EID mountid, - EID riderid); + EID riderid, + bool mounting ); /// Crack this message off the network. @@ -1844,6 +1845,7 @@ uint8_t type; unsigned int mount; unsigned int rider; + bool mounting; }; //-------------------------------------------------------------------------- Modified: personal/kougaro/src/server/gem.cpp =================================================================== --- personal/kougaro/src/server/gem.cpp 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/server/gem.cpp 2009-03-17 04:15:40 UTC (rev 3226) @@ -3806,7 +3806,10 @@ if (psChar->GetOwnerID() == actor->GetCharacterData()->GetPID()) { options |= psGUIInteractMessage::VIEWSTATS; - options |= psGUIInteractMessage::MOUNT; + if(actor->GetActorPtr() && actor->GetActorPtr()->GetMount()) + options |= psGUIInteractMessage::UNMOUNT; + else + options |= psGUIInteractMessage::MOUNT; // If we are in a peaceful mode we can possibly do some trading. if (actor->GetMode() == PSCHARACTER_MODE_PEACE) Modified: personal/kougaro/src/server/gem.h =================================================================== --- personal/kougaro/src/server/gem.h 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/server/gem.h 2009-03-17 04:15:40 UTC (rev 3226) @@ -634,6 +634,8 @@ FactionSet *factions; PID pid; ///< Player ID (also known as character ID or PID) csRef<PlayerGroup> group; + + gemActor *mount; csVector3 top, bottom, offset; csVector3 last_production_pos; @@ -724,6 +726,9 @@ void SetTextureParts(const char *parts); void SetEquipment(const char *equip); + + gemActor* GetMount() { return mount; } + void SetMount(gemActor *newMount) { this->mount = newMount; } void SetMode(PSCHARACTER_MODE mode, uint32_t extraData = 0) { psChar->SetMode(mode, GetClientID(), extraData); } PSCHARACTER_MODE GetMode() { return psChar->GetMode(); } Modified: personal/kougaro/src/server/psserverdr.cpp =================================================================== --- personal/kougaro/src/server/psserverdr.cpp 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/server/psserverdr.cpp 2009-03-17 04:15:40 UTC (rev 3226) @@ -211,6 +211,7 @@ // Go ahead and update the server version if (!actor->SetDRData(drmsg)) // out of date message if returns false return; + // if this message is OK, update the riders' DR data // Check for Movement Tutorial Required. // Usually we don't want to check but DR msgs are so frequent, Modified: personal/kougaro/src/server/usermanager.cpp =================================================================== --- personal/kougaro/src/server/usermanager.cpp 2009-03-17 04:08:54 UTC (rev 3225) +++ personal/kougaro/src/server/usermanager.cpp 2009-03-17 04:15:40 UTC (rev 3226) @@ -143,7 +143,7 @@ userCommandHash.Put("/loot", &UserManager::HandleLoot); userCommandHash.Put("/marriage", &UserManager::ReportPosition); userCommandHash.Put("/motd", &UserManager::GiveMOTD); - userCommandHash.Put("/mount", &UserManager::HandleMount); + userCommandHash.Put("/mount", &UserManager::HandleMount); userCommandHash.Put("/npcmenu", &UserManager::ShowNpcMenu); userCommandHash.Put("/pickup", &UserManager::HandlePickup); userCommandHash.Put("/pos", &UserManager::ReportPosition); @@ -158,7 +158,7 @@ userCommandHash.Put("/stoptrading", &UserManager::StopTrading); userCommandHash.Put("/tip", &UserManager::GiveTip); userCommandHash.Put("/train", &UserManager::HandleTraining); - userCommandHash.Put("/unmount", &UserManager::HandleUnmount); + userCommandHash.Put("/unmount", &UserManager::HandleUnmount); userCommandHash.Put("/unstick", &UserManager::HandleUnstick); userCommandHash.Put("/who", &UserManager::Who); userCommandHash.Put("/yield", &UserManager::HandleYield); @@ -1854,9 +1854,13 @@ // check if already mounted // For now, player can only mount if the mount is its pet or its familiar + // If player can mount other players, should add some check to prevent circular mounting + + // maybe also add a range check + // If accepted, do whatever we need server side, and send a message back to the client - gemObject* object= NULL; + gemObject* mount= NULL; GEMSupervisor *gem = GEMSupervisor::GetSingletonPtr(); csString eid_str = msg.target.Slice(4); @@ -1865,27 +1869,23 @@ if (!targetEID.IsValid()) return; - object = gem->FindObject(targetEID); + mount = gem->FindObject(targetEID); // can only mount actors - if (object && object->GetActorPtr()) + if (mount && mount->GetActorPtr()) { // Once you are on a mount, you can't move, your mount moves client->GetActor()->SetAllowedToMove(false); - client->SetFrozen(true); + client->GetActor()->SetMount(mount->GetActorPtr()); - psMountingMessage mountmsg(client->GetClientNum(), targetEID, client->GetActor()->GetEID()); + psMountingMessage mountmsg(client->GetClientNum(), targetEID, client->GetActor()->GetEID(), true); CS_ASSERT( mountmsg.valid ); - mountmsg.SendMessage(); - - /* psserver->GetEventManager()->Multicast( mountmsg.msg, client->GetActor()->GetMulticastClients(), 0, // Multicast to all without exception PROX_LIST_ANY_RANGE ); -*/ psserver->SendSystemOK(client->GetClientNum(), "You are mounting %s", msg.target.GetData()); @@ -1901,6 +1901,18 @@ void UserManager::HandleUnmount(psUserCmdMessage& msg, Client *client) { + client->GetActor()->SetAllowedToMove(true); + + psMountingMessage mountmsg(client->GetClientNum(), client->GetActor()->GetMount()->GetEID(), client->GetActor()->GetEID(), false); + CS_ASSERT( mountmsg.valid ); + + client->GetActor()->SetMount(NULL); + + psserver->GetEventManager()->Multicast( mountmsg.msg, + client->GetActor()->GetMulticastClients(), + 0, // Multicast to all without exception + PROX_LIST_ANY_RANGE ); + psserver->SendSystemOK(client->GetClientNum(), "In the future, that will take you off your mount!"); return; } @@ -1961,8 +1973,8 @@ { if(guardItem->GetGuardingCharacterID() == client->GetPID() || client->GetSecurityLevel() > 22) { - psserver->SendSystemError(client->GetClientNum(), - "Item not found %s", object->GetName()); + guardItem->SetGuardingCharacterID(0); + psserver->SendSystemError(client->GetClientNum(), "You have unguarded %s", object->GetName()); } else psserver->SendSystemError(client->GetClientNum(), "You can't unguard %s", object->GetName()); @@ -1970,7 +1982,7 @@ } else psserver->SendSystemError(client->GetClientNum(), - "Item not found %s", object->GetName()); + "Item not found %s", object->GetName()); } void UserManager::HandleRotate(psUserCmdMessage& msg, Client *client) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2009-04-04 00:08:01
|
Revision: 3391 http://planeshift.svn.sourceforge.net/planeshift/?rev=3391&view=rev Author: kougaro Date: 2009-04-04 00:07:52 +0000 (Sat, 04 Apr 2009) Log Message: ----------- Merged r3221-3390 from trunk Modified Paths: -------------- personal/kougaro/data/ProgressionSchema.rng personal/kougaro/data/gui/configentityinter.xml personal/kougaro/data/gui/configentitylabels.xml personal/kougaro/data/gui/configkeys.xml personal/kougaro/data/gui/configmouse.xml personal/kougaro/data/gui/configsound.xml personal/kougaro/data/gui/configwindow.xml personal/kougaro/data/gui/interact.xml personal/kougaro/data/gui/loadwindow.xml personal/kougaro/data/gui/petitiongm.xml personal/kougaro/data/gui/questnotebook.xml personal/kougaro/data/gui/styles.xml personal/kougaro/docs/compiling.html personal/kougaro/docs/history.txt personal/kougaro/src/client/charapp.cpp personal/kougaro/src/client/charapp.h personal/kougaro/src/client/chatbubbles.cpp personal/kougaro/src/client/cmdguilds.cpp personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/gui/pawscharcreatemain.cpp personal/kougaro/src/client/gui/pawscharcreatemain.h personal/kougaro/src/client/gui/pawscharpick.cpp personal/kougaro/src/client/gui/pawscharpick.h personal/kougaro/src/client/gui/pawsconfigwindow.cpp personal/kougaro/src/client/gui/pawsgmspawn.cpp personal/kougaro/src/client/gui/pawsgmspawn.h personal/kougaro/src/client/gui/pawsinteractwindow.cpp personal/kougaro/src/client/modehandler.cpp personal/kougaro/src/client/pscamera.cpp personal/kougaro/src/client/pscelclient.cpp personal/kougaro/src/client/pscelclient.h personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/client/psclientchar.h personal/kougaro/src/client/psengine.cpp personal/kougaro/src/client/psengine.h personal/kougaro/src/client/shadowmanager.cpp personal/kougaro/src/client/sound/pssoundmngr.cpp personal/kougaro/src/client/sound/pssoundmngr.h personal/kougaro/src/client/weather.cpp personal/kougaro/src/client/zonehandler.cpp personal/kougaro/src/common/effects/pseffectlight.cpp personal/kougaro/src/common/effects/pseffectlight.h personal/kougaro/src/common/effects/pseffectmanager.cpp personal/kougaro/src/common/effects/pseffectmanager.h personal/kougaro/src/common/engine/linmove.cpp personal/kougaro/src/common/engine/loader.cpp personal/kougaro/src/common/engine/loader.h personal/kougaro/src/common/engine/psregion.cpp personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/net/netbase.cpp personal/kougaro/src/common/net/netbase.h personal/kougaro/src/common/net/netpacket.cpp personal/kougaro/src/common/net/netpacket.h personal/kougaro/src/common/net/npcmessages.cpp personal/kougaro/src/common/net/npcmessages.h personal/kougaro/src/common/net/serverpinger.cpp personal/kougaro/src/common/paws/pawsobjectview.cpp personal/kougaro/src/common/paws/pawsscript.cpp personal/kougaro/src/common/paws/pawstextbox.cpp personal/kougaro/src/common/paws/pawswidget.cpp personal/kougaro/src/common/rpgrules/factions.cpp personal/kougaro/src/common/rpgrules/factions.h personal/kougaro/src/common/util/location.cpp personal/kougaro/src/common/util/mathscript.cpp personal/kougaro/src/common/util/mathscript.h personal/kougaro/src/common/util/mathscript_unittest.cpp personal/kougaro/src/common/util/pscssetup.cpp personal/kougaro/src/npcclient/gem.cpp personal/kougaro/src/npcclient/networkmgr.cpp personal/kougaro/src/npcclient/npc.cpp personal/kougaro/src/npcclient/npc.h personal/kougaro/src/npcclient/npcbehave.cpp personal/kougaro/src/npcclient/npcbehave.h personal/kougaro/src/npcclient/npcbehave_unittest.cpp personal/kougaro/src/npcclient/npcclient.cpp personal/kougaro/src/npcclient/npcclient.h personal/kougaro/src/npcclient/npcoperations.cpp personal/kougaro/src/npcclient/perceptions.cpp personal/kougaro/src/npcclient/perceptions.h personal/kougaro/src/npcclient/walkpoly.cpp personal/kougaro/src/pslaunch/pawslauncherwindow.cpp personal/kougaro/src/pslaunch/pslaunch.cpp personal/kougaro/src/pslaunch/updaterengine.cpp personal/kougaro/src/server/actionmanager.cpp personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/adminmanager.h personal/kougaro/src/server/authentserver.cpp personal/kougaro/src/server/bulkobjects/buffable.h personal/kougaro/src/server/bulkobjects/dictionary.cpp personal/kougaro/src/server/bulkobjects/dictionary.h personal/kougaro/src/server/bulkobjects/psactionlocationinfo.cpp personal/kougaro/src/server/bulkobjects/pscharacter.cpp personal/kougaro/src/server/bulkobjects/pscharacter.h personal/kougaro/src/server/bulkobjects/pscharinventory.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.h personal/kougaro/src/server/bulkobjects/psglyph.cpp personal/kougaro/src/server/bulkobjects/psitem.cpp personal/kougaro/src/server/bulkobjects/psitem.h personal/kougaro/src/server/bulkobjects/psitemstats.cpp personal/kougaro/src/server/bulkobjects/psitemstats.h personal/kougaro/src/server/bulkobjects/psnpcdialog.cpp personal/kougaro/src/server/bulkobjects/psnpcdialog.h personal/kougaro/src/server/bulkobjects/psquest.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/bulkobjects/psspell.cpp personal/kougaro/src/server/bulkobjects/psspell.h personal/kougaro/src/server/cachemanager.cpp personal/kougaro/src/server/cachemanager.h personal/kougaro/src/server/chatmanager.cpp personal/kougaro/src/server/chatmanager.h personal/kougaro/src/server/client.cpp personal/kougaro/src/server/client.h personal/kougaro/src/server/clients.cpp personal/kougaro/src/server/clients.h personal/kougaro/src/server/command.cpp personal/kougaro/src/server/creationmanager.cpp personal/kougaro/src/server/database/mysql/character_relationships.sql personal/kougaro/src/server/database/mysql/characters.sql personal/kougaro/src/server/database/mysql/commonstrings.sql personal/kougaro/src/server/database/mysql/item_categories.sql personal/kougaro/src/server/database/mysql/item_stats.sql personal/kougaro/src/server/database/mysql/loot_modifiers.sql personal/kougaro/src/server/database/mysql/npc_kas.sql personal/kougaro/src/server/database/mysql/npc_responses.sql personal/kougaro/src/server/database/mysql/npc_triggers.sql personal/kougaro/src/server/database/mysql/progress_events.sql personal/kougaro/src/server/database/mysql/quest_scripts.sql personal/kougaro/src/server/database/mysql/race_info.sql personal/kougaro/src/server/database/mysql/race_spawns.sql personal/kougaro/src/server/database/mysql/server_options.sql personal/kougaro/src/server/database/mysql/spells.sql personal/kougaro/src/server/database/mysql/upgrade_schema.sql personal/kougaro/src/server/entitymanager.cpp personal/kougaro/src/server/entitymanager.h personal/kougaro/src/server/exchangemanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/netmanager.cpp personal/kougaro/src/server/netmanager.h personal/kougaro/src/server/npcmanager.cpp personal/kougaro/src/server/npcmanager.h personal/kougaro/src/server/psproxlist.cpp personal/kougaro/src/server/psproxlist.h personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserver.h personal/kougaro/src/server/psserverchar.cpp personal/kougaro/src/server/psserverdr.cpp personal/kougaro/src/server/questmanager.cpp personal/kougaro/src/server/questmanager.h personal/kougaro/src/server/scripting.cpp personal/kougaro/src/server/slotmanager.cpp personal/kougaro/src/server/spawnmanager.cpp personal/kougaro/src/server/spawnmanager.h personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/workmanager.cpp personal/kougaro/src/server/workmanager.h Added Paths: ----------- personal/kougaro/data/voice/sammich/ personal/kougaro/data/voice/sammich/1-yup.spx personal/kougaro/data/voice/sammich/10-youasked.spx personal/kougaro/data/voice/sammich/10thatsbetter.spx personal/kougaro/data/voice/sammich/11-lemmecount.spx personal/kougaro/data/voice/sammich/11iamsogladyou.spx personal/kougaro/data/voice/sammich/12verygood.spx personal/kougaro/data/voice/sammich/13observecarefully.spx personal/kougaro/data/voice/sammich/14ihavenopatience.spx personal/kougaro/data/voice/sammich/15absolutelycorrect-1.spx personal/kougaro/data/voice/sammich/15absolutelycorrect-2.spx personal/kougaro/data/voice/sammich/16yeingrate.spx personal/kougaro/data/voice/sammich/1Sothelowly-1.spx personal/kougaro/data/voice/sammich/1Sothelowly-2.spx personal/kougaro/data/voice/sammich/2-grubbymitts.spx personal/kougaro/data/voice/sammich/2Reginaldlooksdown-1.spx personal/kougaro/data/voice/sammich/2Reginaldlooksdown-2.spx personal/kougaro/data/voice/sammich/3-crawdads.spx personal/kougaro/data/voice/sammich/3ohgoodgracious.spx personal/kougaro/data/voice/sammich/4-notaste.spx personal/kougaro/data/voice/sammich/4Iwillpayanyprice.spx personal/kougaro/data/voice/sammich/5-toobad.spx personal/kougaro/data/voice/sammich/5waitjustasandwich.spx personal/kougaro/data/voice/sammich/6-whatyoulike.spx personal/kougaro/data/voice/sammich/6wondrousandeven.spx personal/kougaro/data/voice/sammich/7-tastysammich.spx personal/kougaro/data/voice/sammich/7ohplease.spx personal/kougaro/data/voice/sammich/8-dwarvesfond.spx personal/kougaro/data/voice/sammich/8alasihavenochildren-1.spx personal/kougaro/data/voice/sammich/8alasihavenochildren-2.spx personal/kougaro/data/voice/sammich/9-yeahso.spx personal/kougaro/data/voice/sammich/9ahem.spx personal/kougaro/tools/pscript-validator Removed Paths: ------------- personal/kougaro/data/voice/sammich/1-yup.spx personal/kougaro/data/voice/sammich/10-youasked.spx personal/kougaro/data/voice/sammich/10thatsbetter.spx personal/kougaro/data/voice/sammich/11-lemmecount.spx personal/kougaro/data/voice/sammich/11iamsogladyou.spx personal/kougaro/data/voice/sammich/12verygood.spx personal/kougaro/data/voice/sammich/13observecarefully.spx personal/kougaro/data/voice/sammich/14ihavenopatience.spx personal/kougaro/data/voice/sammich/15absolutelycorrect-1.spx personal/kougaro/data/voice/sammich/15absolutelycorrect-2.spx personal/kougaro/data/voice/sammich/16yeingrate.spx personal/kougaro/data/voice/sammich/1Sothelowly-1.spx personal/kougaro/data/voice/sammich/1Sothelowly-2.spx personal/kougaro/data/voice/sammich/2-grubbymitts.spx personal/kougaro/data/voice/sammich/2Reginaldlooksdown-1.spx personal/kougaro/data/voice/sammich/2Reginaldlooksdown-2.spx personal/kougaro/data/voice/sammich/3-crawdads.spx personal/kougaro/data/voice/sammich/3ohgoodgracious.spx personal/kougaro/data/voice/sammich/4-notaste.spx personal/kougaro/data/voice/sammich/4Iwillpayanyprice.spx personal/kougaro/data/voice/sammich/5-toobad.spx personal/kougaro/data/voice/sammich/5waitjustasandwich.spx personal/kougaro/data/voice/sammich/6-whatyoulike.spx personal/kougaro/data/voice/sammich/6wondrousandeven.spx personal/kougaro/data/voice/sammich/7-tastysammich.spx personal/kougaro/data/voice/sammich/7ohplease.spx personal/kougaro/data/voice/sammich/8-dwarvesfond.spx personal/kougaro/data/voice/sammich/8alasihavenochildren-1.spx personal/kougaro/data/voice/sammich/8alasihavenochildren-2.spx personal/kougaro/data/voice/sammich/9-yeahso.spx personal/kougaro/data/voice/sammich/9ahem.spx Property Changed: ---------------- personal/kougaro/ personal/kougaro/lang/1337/data/ personal/kougaro/lang/french/data/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Kayden:2590-3147 /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2872-2972,2974-3050,3052-3220 + /personal/Kayden:2590-3147 /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2872-2972,2974-3050,3052-3390 Modified: personal/kougaro/data/ProgressionSchema.rng =================================================================== --- personal/kougaro/data/ProgressionSchema.rng 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/ProgressionSchema.rng 2009-04-04 00:07:52 UTC (rev 3391) @@ -75,7 +75,7 @@ </choice> </attribute> <oneOrMore> - <element name="script"> + <element name="spell"> <attribute name="name"/> <ref name="SpellType"/> </element> @@ -87,7 +87,9 @@ <element name="msg"> <attribute name="aim"/> <attribute name="text"/> + <ref name="msgtype"/> </element> + <element name="fx"> <optional> <attribute name="source"/> @@ -104,12 +106,19 @@ </optional> </element> - <element name="teleport"> <ref name="teleport"/> </element> + <element name="teleport"> + <attribute name="aim"/> + <ref name="teleport"/> + </element> <element name="create-familiar"> <empty/> <!-- someday: type element? --> </element> + <element name="destroy"> + <attribute name="aim"/> + </element> + <element name="key"> <!-- TBH this is bad, we can't determine if keyID is necessary. --> <!-- should probably change these operations... --> @@ -238,6 +247,7 @@ <element name="msg"> <attribute name="text"/> <attribute name="undo"/> + <ref name="msgtype"/> </element> <element name="fx"> @@ -254,6 +264,8 @@ <attribute name="name"/> </element> + <element name="can-summon-familiar"/> + <element name="on"> <choice> <attribute name="type"> @@ -339,4 +351,17 @@ <value>false</value> </choice> </define> + + <define name="msgtype"> + <optional> + <attribute name="type"> + <choice> + <value>info</value> + <value>ok</value> + <value>result</value> + <value>error</value> + </choice> + </attribute> + </optional> + </define> </grammar> Modified: personal/kougaro/data/gui/configentityinter.xml =================================================================== --- personal/kougaro/data/gui/configentityinter.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/configentityinter.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -2,13 +2,15 @@ <widget name="ConfigEntityInter" factory="pawsConfigEntityInteract" visible="no" savepositions="no" movable="no" - resizable="no"> - <frame x="225" y="10" width="400" height="300" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + resizable="no" style="New Standard GUI"> + + <frame x="225" y="10" width="400" height="300" border="yes" /> + <widget name="items_label" factory="pawsTextBox"> <text string="" horizAdjust="LEFT" /> <frame x="20" y="20" width="100" height="25" border="no" /> </widget> + <widget name="items" factory="pawsComboBox" > <listbox rows="5" height="20" text="Day" /> <frame x="150" y="20" width="200" height="25" border="no" /> @@ -18,6 +20,7 @@ <text string="" horizAdjust="LEFT" /> <frame x="20" y="55" width="100" height="25" border="no" /> </widget> + <widget name="players" factory="pawsComboBox"> <listbox rows="3" height="20" text="Day" alpha="100"/> <frame x="150" y="55" width="200" height="25" border="no" /> @@ -27,6 +30,7 @@ <text string="" horizAdjust="LEFT" /> <frame x="20" y="90" width="100" height="25" border="no" /> </widget> + <widget name="merchants" factory="pawsComboBox"> <listbox rows="4" height="20" text="Day" alpha="100"/> <frame x="150" y="90" width="200" height="25" border="no" /> @@ -36,6 +40,7 @@ <text string="" horizAdjust="LEFT" /> <frame x="20" y="125" width="100" height="25" border="no" /> </widget> + <widget name="aliveNPCs" factory="pawsComboBox"> <listbox rows="4" height="20" text="Day" alpha="100"/> <frame x="150" y="125" width="200" height="25" border="no" /> @@ -45,6 +50,7 @@ <text string="" horizAdjust="LEFT" /> <frame x="20" y="160" width="100" height="25" border="no" /> </widget> + <widget name="deadNPCs" factory="pawsComboBox"> <listbox rows="2" height="20" text="Day" alpha="100"/> <frame x="150" y="160" width="200" height="25" border="no" /> @@ -54,13 +60,12 @@ <text string="" horizAdjust="LEFT" /> <frame x="20" y="190" width="100" height="25" border="no" /> </widget> + <widget name="petNPCs" factory="pawsComboBox"> <listbox rows="1" height="20" text="Day" alpha="100"/> <frame x="150" y="190" width="200" height="25" border="no" /> </widget> - - </widget> </widget_description> Modified: personal/kougaro/data/gui/configentitylabels.xml =================================================================== --- personal/kougaro/data/gui/configentitylabels.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/configentitylabels.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -3,8 +3,7 @@ <widget name="ConfigEntityLabels" factory="pawsConfigEntityLabels" visible="no" savepositions="no" movable="no" resizable="no"> - <frame x="225" y="10" width="420" height="300" border="yes" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <frame x="225" y="10" width="420" height="300" border="yes" style="New Standard GUI" /> <widget name="visibilityCreatures" factory="pawsRadioButtonGroup"> <frame x="10" y="10" width="190" height="120" border="no" /> Modified: personal/kougaro/data/gui/configkeys.xml =================================================================== --- personal/kougaro/data/gui/configkeys.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/configkeys.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -1,10 +1,10 @@ <widget_description> -<widget name="ConfigKeysTree" factory="pawsTreeNode" - visible="yes" savepositions="no" movable="no" resizable="no" > - - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - <bgimage resource="Scaling Widget Background" /> + <widget name="ConfigKeysTree" factory="pawsTree" + visible="yes" savepositions="no" movable="no" resizable="no" style="New Standard GUI"> + + <frame x="10" y="100" width="680" height="346" border="yes" /> + <widget factory="pawsSeqTreeNode"> <widget factory="pawsWidgetTreeNode" name="Movement"> <nodewidget> @@ -147,7 +147,6 @@ <widget factory="pawsSeqTreeNode" name="Shortcut 40"/> </widget> </widget> + </widget> -</widget> - </widget_description> Modified: personal/kougaro/data/gui/configmouse.xml =================================================================== --- personal/kougaro/data/gui/configmouse.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/configmouse.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -4,6 +4,7 @@ visible="yes" savepositions="no" movable="yes" resizable="no"> <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <widget factory="pawsSeqTreeNode"> <widget factory="pawsWidgetTreeNode"> <nodewidget> Modified: personal/kougaro/data/gui/configsound.xml =================================================================== --- personal/kougaro/data/gui/configsound.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/configsound.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -1,7 +1,8 @@ <widget_description> -<widget name="ConfigPvPTree" factory="pawsConfigPvP" - visible="no" savepositions="no" movable="no" resizable="no" >\ - <frame x="225" y="10" width="400" height="300" border="no" /> +<widget name="ConfigSound" factory="pawsConfigSound" + visible="no" savepositions="no" movable="no" resizable="no" style="New Standard GUI"> + + <frame x="10" y="10" width="400" height="300" border="no" /> <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> <widget name="music" factory="pawsCheckBox"> Modified: personal/kougaro/data/gui/configwindow.xml =================================================================== --- personal/kougaro/data/gui/configwindow.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/configwindow.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -13,7 +13,7 @@ <frame x="10" y="10" width="200" height="300" border="no" /> - <widget factory="pawsSimpleTreeNode"> + <widget factory="pawsSimpleTreeNode" name="PanelParent"> <frame x="225" y="10" width="400" height="300" border="yes" /> <widget factory="pawsSimpleTreeNode" label="Controls"> @@ -87,6 +87,16 @@ </pawsSimpleTree> + <pawsWidget name="PanelParent"> + <frame x="220" y="5" width="440" height="310" border="no" /> + <attachpoints> + <attach point="ATTACH_RIGHT" /> + <attach point="ATTACH_TOP" /> + <attach point="ATTACH_LEFT" /> + <attach point="ATTACH_BOTTOM" /> + </attachpoints> + </pawsWidget> + <pawsButton name="OKButton" id="-10" toggle="no"> <frame x="10" y="320" width="80" height="20" border="no"/> <label text="Save"/> @@ -99,4 +109,4 @@ </pawsConfigWindow> -</widget_description> \ No newline at end of file +</widget_description> Modified: personal/kougaro/data/gui/interact.xml =================================================================== --- personal/kougaro/data/gui/interact.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/interact.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -66,78 +66,82 @@ <bgimage resource="ButtonCombine" /> </widget> - <widget name="ButtonExchange" factory="pawsButton" id="1300" tooltip="Exchange"> + <widget name="ButtonConstruct" factory="pawsButton" id="1300" tooltip="Construct"> + <frame x="0" y="64" width="64" height="64" /> + <bgimage resource="ButtonConstruct" /> + </widget> + + <widget name="ButtonExchange" factory="pawsButton" id="1400" tooltip="Exchange"> <frame x="0" y="64" width="64" height="64" /> <bgimage resource="ButtonGive" /> </widget> - <widget name="ButtonTrain" factory="pawsButton" id="1400" tooltip="Train"> + <widget name="ButtonTrain" factory="pawsButton" id="1500" tooltip="Train"> <frame x="128" y="0" width="64" height="64" /> <bgimage resource="ButtonTrain" /> </widget> - <widget name="ButtonNPCTalk" factory="pawsButton" id="1500" tooltip="Talk"> + <widget name="ButtonNPCTalk" factory="pawsButton" id="1600" tooltip="Talk"> <frame x="128" y="64" width="64" height="64" /> <bgimage resource="ButtonSpeak" /> </widget> - <widget name="ButtonViewStats" factory="pawsButton" id="1600" tooltip="View Stats"> + <widget name="ButtonViewStats" factory="pawsButton" id="1700" tooltip="View Stats"> <frame x="64" y="64" width="64" height="64" /> <bgimage resource="ButtonLook" /> </widget> - <widget name="ButtonDismiss" factory="pawsButton" id="1700" tooltip="Dismiss"> + <widget name="ButtonDismiss" factory="pawsButton" id="1800" tooltip="Dismiss"> <frame x="64" y="0" width="64" height="64" /> <bgimage resource="ButtonPetDismiss" /> </widget> - <widget name="ButtonMarriage" factory="pawsButton" id="1800" tooltip="Marry"> + <widget name="ButtonMarriage" factory="pawsButton" id="1900" tooltip="Marry"> <frame x="128" y="64" width="64" height="64" /> <bgimage resource="ButtonMarriage" /> </widget> - <widget name="ButtonDivorce" factory="pawsButton" id="1900" tooltip="Divorce"> + <widget name="ButtonDivorce" factory="pawsButton" id="2000" tooltip="Divorce"> <frame x="128" y="64" width="64" height="64" /> <bgimage resource="ButtonDivorce" /> </widget> - <widget name="ButtonPlayGame" factory="pawsButton" id="2000" tooltip="Play/Solve"> + <widget name="ButtonPlayGame" factory="pawsButton" id="2100" tooltip="Play/Solve"> <frame x="0" y="64" width="64" height="64" /> <bgimage resource="ButtonPush" /> </widget> - <widget name="ButtonEnter" factory="pawsButton" id="2100" tooltip="Enter"> + <widget name="ButtonEnter" factory="pawsButton" id="2200" tooltip="Enter"> <frame x="0" y="64" width="64" height="64" /> <bgimage resource="ButtonOpen" /> </widget> - <widget name="ButtonLock" factory="pawsButton" id="2200" tooltip="Lock"> + <widget name="ButtonLock" factory="pawsButton" id="2300" tooltip="Lock"> <frame x="0" y="0" width="64" height="64" /> <bgimage resource="ButtonOpen" /> </widget> - <widget name="ButtonEnterLocked" factory="pawsButton" id="2300" tooltip="Enter"> + <widget name="ButtonEnterLocked" factory="pawsButton" id="2400" tooltip="Enter"> <frame x="0" y="64" width="64" height="64" /> <bgimage resource="ButtonOpen" /> </widget> - <widget name="ButtonBank" factory="pawsButton" id="2400" tooltip="Start Personal Banking"> + <widget name="ButtonBank" factory="pawsButton" id="2500" tooltip="Start Personal Banking"> <frame x="0" y="128" width="64" height="64" /> <bgimage resource="ButtonBanking" /> </widget> - - <widget name="ButtonIntroduce" factory="pawsButton" id="2500" tooltip="Introduce yourself"> + <widget name="ButtonIntroduce" factory="pawsButton" id="2600" tooltip="Introduce yourself"> <frame x="128" y="128" width="64" height="64" /> <bgimage resource="ButtonIntroduce" /> </widget> - <widget name="ButtonMount" factory="pawsButton" id="2600" tooltip="Mount"> + <widget name="ButtonMount" factory="pawsButton" id="2700" tooltip="Mount"> <frame x="128" y="128" width="64" height="64" /> <bgimage resource="ButtonCombine" /> </widget> - <widget name="ButtonUnmount" factory="pawsButton" id="2700" tooltip="Unmount"> + <widget name="ButtonUnmount" factory="pawsButton" id="2800" tooltip="Unmount"> <frame x="128" y="128" width="64" height="64" /> <bgimage resource="ButtonBanking" /> </widget> Modified: personal/kougaro/data/gui/loadwindow.xml =================================================================== --- personal/kougaro/data/gui/loadwindow.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/loadwindow.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -1,7 +1,7 @@ <widget_description> <widget name="LoadWindow" factory="pawsLoadWindow" - visible="yes" movable="no" resizable="no" resizetoscreen="yes" > + visible="yes" movable="no" resizable="no" resizetoscreen="yes" alwaysontop="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> <font name="/planeshift/data/ttf/cupandtalon.ttf" r="180" g="180" b="180" size="12" shadow="yes" resizetoscreen="yes" /> <bgimage resource="Loading Background" /> Modified: personal/kougaro/data/gui/petitiongm.xml =================================================================== --- personal/kougaro/data/gui/petitiongm.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/petitiongm.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -1,15 +1,15 @@ <widget_description> - <widget name="PetitionGMWindow" factory="pawsPetitionGMWindow" + <pawsPetitionGMWindow name="PetitionGMWindow" visible="no" savepositions="yes" movable="yes" - resizable="no" style="New Standard GUI"> + resizable="yes" keepaspect="no" style="New Standard GUI"> <frame x="0" y="100" width="600" height="350" border="yes" /> <title resource="Scaling Title Bar" text="Manage Petitions" align="left" close_button="yes" /> <widget name="PetitionList" factory="pawsListBox"> <frame x="25" y="12" width="545" height="160" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" scalefont="no" /> <columns height="20" headings="yes"> <column width="25" > <pawsTextBox name="Lvl" /> @@ -20,13 +20,13 @@ <column width="80" > <pawsTextBox name="Player" /> </column> - <column width="40" > + <column width="50" > <pawsTextBox name="Online" /> </column> <column width="75" > <pawsTextBox name="Status" /> </column> - <column width="105" > + <column width="120" > <pawsTextBox name="Created Date" /> </column> <column width="200"> @@ -36,57 +36,63 @@ <attachpoints> <attach point="ATTACH_RIGHT" /> - <attach point="ATTACH_TOP" /> + <attach point="PROPORTIONAL_TOP" /> <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> </widget> - <widget name="PetitionTextLabel" factory="pawsTextBox" style="New Standard Prompt"> + <pawsTextBox name="PetitionTextLabel" style="New Standard Prompt"> <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" /> <frame x="40" y="180" width="150" height="20" border="no"/> <text string="Petition text:" /> - </widget> + </pawsTextBox> - <widget name="PetitionText" factory="pawsMessageTextBox" style="Fancy Standard MsgText"> + <pawsMessageTextBox name="PetitionText" style="Fancy Standard MsgText"> <frame x="25" y="200" width="545" height="105" /> - </widget> + <attachpoints> + <attach point="ATTACH_RIGHT" /> + <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_LEFT" /> + <attach point="PROPORTIONAL_BOTTOM" /> + </attachpoints> + </pawsMessageTextBox> - <widget name="Admin Petition" factory="pawsButton" id="8" > + <pawsButton name="Admin Petition" id="8" > <frame x="20" y="324" width="75" height="22" /> <label text="Admin" /> - </widget> + </pawsButton> - <widget name="Assign Button" factory="pawsButton" id="2" > + <pawsButton name="Assign Button" id="2" > <frame x="100" y="324" width="75" height="22" /> <label text="Claim" /> - </widget> + </pawsButton> - <widget name="Unassign Button" factory="pawsButton" id="3" > + <pawsButton name="Unassign Button" id="3" > <frame x="180" y="324" width="75" height="22" /> <label text="Unclaim" /> - </widget> + </pawsButton> - <widget name="Escalate Button" factory="pawsButton" id="4" > + <pawsButton name="Escalate Button" id="4" > <frame x="260" y="324" width="75" height="22" /> <label text="Escalate" /> - </widget> + </pawsButton> - <widget name="Descalate Button" factory="pawsButton" id="5" > + <pawsButton name="Descalate Button" id="5" > <frame x="340" y="324" width="75" height="22" /> <label text="Descalate" /> - </widget> + </pawsButton> - <widget name="Close Button" factory="pawsButton" id="6" > + <pawsButton name="Close Button" id="6" > <frame x="420" y="324" width="75" height="22" /> <label text="Close" /> - </widget> + </pawsButton> - <widget name="Cancel Button" factory="pawsButton" id="7" > + <pawsButton name="Cancel Button" id="7" > <frame x="500" y="324" width="75" height="22" /> <label text="Delete" /> - </widget> + </pawsButton> - </widget> + </pawsPetitionGMWindow> </widget_description> Modified: personal/kougaro/data/gui/questnotebook.xml =================================================================== --- personal/kougaro/data/gui/questnotebook.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/questnotebook.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -1,6 +1,6 @@ <widget_description> - <pawsQuestListWindow name="QuestNotebook" style="topwindow" visible="no" style="New Standard GUI"> + <pawsQuestListWindow name="QuestNotebook" style="topwindow" visible="no" savepositions="yes" movable="yes" style="New Standard GUI"> <frame x="100" y="100" width="550" height="400" border="yes" /> <title resource="Scaling Title Bar" text="Quest & Events Notebook" align="left" close_button="yes"/> Modified: personal/kougaro/data/gui/styles.xml =================================================================== --- personal/kougaro/data/gui/styles.xml 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/data/gui/styles.xml 2009-04-04 00:07:52 UTC (rev 3391) @@ -133,6 +133,10 @@ </attachpoints> </style> + <style name="New Standard Checkbox" inherit="Standard Font" > + <checkbox off="Checkbox Unchecked" on="Checkbox Checked" greyoff="Checkbox Unchecked" greyon="CheckBox Checked Grayed" size="16" /> + </style> + <style name="New Standard TextBox" inherit="Standard Font" > </style> @@ -204,5 +208,6 @@ <defaultstyle widget="pawsListBox" style="New Standard ListBox"/> <defaultstyle widget="pawsSimpleTree" style="New Left Side Tree"/> <defaultstyle widget="pawsMultilineEditTextBox" style="New Standard MLE"/> + <defaultstyle widget="pawsCheckBox" style="New Standard Checkbox"/> </style> </styles> Deleted: personal/kougaro/data/voice/sammich/1-yup.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/1-yup.spx (from rev 3390, trunk/data/voice/sammich/1-yup.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/10-youasked.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/10-youasked.spx (from rev 3390, trunk/data/voice/sammich/10-youasked.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/10thatsbetter.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/10thatsbetter.spx (from rev 3390, trunk/data/voice/sammich/10thatsbetter.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/11-lemmecount.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/11-lemmecount.spx (from rev 3390, trunk/data/voice/sammich/11-lemmecount.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/11iamsogladyou.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/11iamsogladyou.spx (from rev 3390, trunk/data/voice/sammich/11iamsogladyou.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/12verygood.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/12verygood.spx (from rev 3390, trunk/data/voice/sammich/12verygood.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/13observecarefully.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/13observecarefully.spx (from rev 3390, trunk/data/voice/sammich/13observecarefully.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/14ihavenopatience.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/14ihavenopatience.spx (from rev 3390, trunk/data/voice/sammich/14ihavenopatience.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/15absolutelycorrect-1.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/15absolutelycorrect-1.spx (from rev 3390, trunk/data/voice/sammich/15absolutelycorrect-1.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/15absolutelycorrect-2.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/15absolutelycorrect-2.spx (from rev 3390, trunk/data/voice/sammich/15absolutelycorrect-2.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/16yeingrate.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/16yeingrate.spx (from rev 3390, trunk/data/voice/sammich/16yeingrate.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/1Sothelowly-1.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/1Sothelowly-1.spx (from rev 3390, trunk/data/voice/sammich/1Sothelowly-1.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/1Sothelowly-2.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/1Sothelowly-2.spx (from rev 3390, trunk/data/voice/sammich/1Sothelowly-2.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/2-grubbymitts.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/2-grubbymitts.spx (from rev 3390, trunk/data/voice/sammich/2-grubbymitts.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/2Reginaldlooksdown-1.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/2Reginaldlooksdown-1.spx (from rev 3390, trunk/data/voice/sammich/2Reginaldlooksdown-1.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/2Reginaldlooksdown-2.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/2Reginaldlooksdown-2.spx (from rev 3390, trunk/data/voice/sammich/2Reginaldlooksdown-2.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/3-crawdads.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/3-crawdads.spx (from rev 3390, trunk/data/voice/sammich/3-crawdads.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/3ohgoodgracious.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/3ohgoodgracious.spx (from rev 3390, trunk/data/voice/sammich/3ohgoodgracious.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/4-notaste.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/4-notaste.spx (from rev 3390, trunk/data/voice/sammich/4-notaste.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/4Iwillpayanyprice.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/4Iwillpayanyprice.spx (from rev 3390, trunk/data/voice/sammich/4Iwillpayanyprice.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/5-toobad.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/5-toobad.spx (from rev 3390, trunk/data/voice/sammich/5-toobad.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/5waitjustasandwich.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/5waitjustasandwich.spx (from rev 3390, trunk/data/voice/sammich/5waitjustasandwich.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/6-whatyoulike.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/6-whatyoulike.spx (from rev 3390, trunk/data/voice/sammich/6-whatyoulike.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/6wondrousandeven.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/6wondrousandeven.spx (from rev 3390, trunk/data/voice/sammich/6wondrousandeven.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/7-tastysammich.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/7-tastysammich.spx (from rev 3390, trunk/data/voice/sammich/7-tastysammich.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/7ohplease.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/7ohplease.spx (from rev 3390, trunk/data/voice/sammich/7ohplease.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/8-dwarvesfond.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/8-dwarvesfond.spx (from rev 3390, trunk/data/voice/sammich/8-dwarvesfond.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/8alasihavenochildren-1.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/8alasihavenochildren-1.spx (from rev 3390, trunk/data/voice/sammich/8alasihavenochildren-1.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/8alasihavenochildren-2.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/8alasihavenochildren-2.spx (from rev 3390, trunk/data/voice/sammich/8alasihavenochildren-2.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/9-yeahso.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/9-yeahso.spx (from rev 3390, trunk/data/voice/sammich/9-yeahso.spx) =================================================================== (Binary files differ) Deleted: personal/kougaro/data/voice/sammich/9ahem.spx =================================================================== (Binary files differ) Copied: personal/kougaro/data/voice/sammich/9ahem.spx (from rev 3390, trunk/data/voice/sammich/9ahem.spx) =================================================================== (Binary files differ) Modified: personal/kougaro/docs/compiling.html =================================================================== --- personal/kougaro/docs/compiling.html 2009-04-03 10:10:44 UTC (rev 3390) +++ personal/kougaro/docs/compiling.html 2009-04-04 00:07:52 UTC (rev 3391) @@ -52,8 +52,8 @@ var csWinLibsVersionStab = "1.3_004"; // cs win32 libs version. var csWinLibsVersion = "1.3_004"; // cs win32 libs version. //Update date and author, to be changed everytime and updates occurred - var UpdateDate = "22 Jan 2009"; //Date when the update occurred - var UpdateAuthor = "Alec Rusanda (Allaann)"; //Author of the update + var UpdateDate = "20 March 2009"; //Date when the update occurred + var UpdateAuthor = "Caarrie"; //Author of the update --> </script> @@ -97,6 +97,7 @@ .Linux-Debian { display: none; } .Linux-Gentoo { display: none; } .Linux-Slackware { display: none; } +.Linux-OpenSUSE { display: none; } .Linux-Ubuntu { display: none; } .FreeBSD { display: none; } .Windows { display: none; } @@ -312,6 +313,7 @@ <option value="Linux-Debian">Debian Linux</option> <option value="Linux-Gentoo">Gentoo Linux</option> <option value="Linux-Slackware">Slackware Linux</option> + <option value="Linux-OpenSUSE">OpenSUSE Linux</option> <option value="Linux-Ubuntu">Ubuntu Linux</option> <option value="FreeBSD">FreeBSD</option> <option value="Windows">Windows</option> @@ -637,6 +639,13 @@ <p>Due to the number of dependencies needed, if you wish to read the homepage listing, or dependency description please select Linux's generic dropdown selection.</p> <strong> BOTH of these above commands are assuming you do not need a server, if you do please follow directions in the <a href="#mysql">mysql</a> section for installing other required packages before moving on to building to save you time.</strong> </div> +<div class="Linux-OpenSUSE"> + <p>Note: This section is incomplete and untested.</p> + <p>Due to the number of dependencies needed, if you wish to read the homepage listing, or dependency description please select Linux's generic dropdown selection.</p> +<p>libtool may need to be installed via</p> +<p><i class="command">yast install libtool</i></p> +<strong> BOTH of these above commands are assuming you do not need a server, if you do please follow directions in the <a href="#mysql">mysql</a> section for installing other required packages before moving on to building to save you time.</strong> +</div> <div class="Linux-Ubuntu"> <p>The instructions here are tested using Ubuntu Hardy Heron and Intrepid Ibex.<br> Since Hardy Heron is installed by default with minimal packages, many required packages for this project are not available. <br> @@ -719,6 +728,9 @@ <div class="Linux-Slackware"> <i class="command">tar -zxvf Cg-2.1_October2008_x86*.tgz</i> </div> + <div class="Linux-OpenSUSE"> + <i class="command">tar -zxvf Cg-2.1_October2008_x86*.tgz</i> + </div> <div class="Linux-Ubuntu"> If you are on Hardy or Intrepid you can @@ -1300,6 +1312,21 @@ $HOME/development/cal3d$ make<br> $HOME/development/cal3d$ make install </div></p></div> + <div class="linux-OpenSUSE" > + Using a text editor open configure.in and remove the line + <p><div class="commandBox"> + AM_USE_UNITTESTCPP</div></p> + <p>Or you can use the following sed command</p> + <p> <div class="commandBox" > + mv configure.in configure-old.in<br /> + sed 's/AM_USE_UNITTESTCPP/# AM_USE_UNITTESTCPP/' configure-old.in > configure.in</div></p> + <p> Then you can build cal3d </p> + <p><div class="commandBox"> + $HOME/development/cal3d$ autoreconf --install --force<br> + $HOME/development/cal3d$ ./configure --prefix=$HOME/development/cal3d<br> + $HOME/development/cal3d$ make<br> + $HOME/development/cal3d$ make install + </div></p></div> <div class="linux-Ubuntu" > Using a text editor open configure.in and remove the line <p><div class="commandBox"> @@ -1328,9 +1355,9 @@ To do this, use the prefix line that was used for Cal3d above.</p></div> <div class="Linux-Generic" > <div class="User"><div class="commandBox"> - $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><i class="command"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1338,9 +1365,9 @@ </div></div> <div class="Linux-Debian" > <div class="User"><div class="commandBox"> - $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><i class="command"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1348,9 +1375,9 @@ </div></div> <div class="Linux-Gentoo" > <div class="User"><div class="commandBox"> - $HOME/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><div class="commandBox"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</div></div><br> <div class="Static"><i class="command"> @@ -1358,19 +1385,29 @@ </div></div> <div class="Linux-Slackware" > <div class="User"><div class="commandBox"> - $HOME/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><i class="command"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> $HOME/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i><br> </div></div> + <div class="Linux-OpenSUSE" > + <div class="User"><div class="commandBox"> + $HOME/development/cs$./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + <div class="Developer"><div class="commandBox"> + $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + <div class="Normal"><i class="command"> + $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> + <div class="Static"><i class="command"> + $HOME/development/cs$ jam -aq libs staticplugins cs-config walktest_static</i><br> + </div></div> <div class="Linux-Ubuntu"> <div class="User"><div class="commandBox"> - $HOME/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><i class="command"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"><i class="command"> @@ -1378,9 +1415,9 @@ </div></div> <div class="FreeBSD" > <div class="User"><div class="commandBox"> - $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$ ./configure --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$ ./configure --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><i class="command"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> @@ -1498,9 +1535,9 @@ <p>Now we can build it and use the configure line to tell it where we installed the cal3d libraries. To do this, use the prefix line that was used for Cal3d above.</p> <div class="User"><div class="commandBox"> - $HOME/development/cs$./configure --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div> + $HOME/development/cs$./configure --disable-universal-binary --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div> <div class="Developer"><div class="commandBox"> - $HOME/development/cs$./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --with-cal3d=$HOME/development/cal3d</div></div><br> + $HOME/development/cs$./configure --disable-universal-binary --enable-debug --without-java --without-perl --without-python --without-3ds --with-cal3d=$HOME/development/cal3d</div></div><br> <div class="Normal"><i class="command"> $HOME/development/cs$ jam -aq libs plugins cs-config walktest</i></div><br> <div class="Static"> there is no Mac static build guide at this time</div> @@ -1546,9 +1583,9 @@ Configure to debug mode and jam. (if you wish to build in optimized mode, just run configure without any arguments) <p><div class="commandBox"><div class="User"> - ./configure --without-java --without-perl --without-python --without-lib3ds --enable-shared=no</div> + ./configure --without-java --without-perl --without-python --without-3ds --enable-shared=no</div> <div class="Developer"> - ./configure --enable-debug --without-java --without-perl --without-python --without-lib3ds --e... [truncated message content] |
From: <ko...@us...> - 2009-05-03 06:10:15
|
Revision: 3607 http://planeshift.svn.sourceforge.net/planeshift/?rev=3607&view=rev Author: kougaro Date: 2009-05-03 06:10:09 +0000 (Sun, 03 May 2009) Log Message: ----------- Merged r3390:3606 Modified Paths: -------------- personal/kougaro/Jamfile.in personal/kougaro/data/ProgressionSchema.rng personal/kougaro/data/effects/misc/admin_location.eff personal/kougaro/data/effects/misc/admin_path_point.eff personal/kougaro/data/effects/misc/admin_waypoint.eff personal/kougaro/data/effects/misc/marker.eff personal/kougaro/data/effects/misc/shadow.eff personal/kougaro/data/effects/misc/target.eff personal/kougaro/data/gui/chat.xml personal/kougaro/data/gui/pslaunch.xml personal/kougaro/data/options/camera_def.xml personal/kougaro/data/options/chat_def.xml personal/kougaro/data/options/controls_def.xml personal/kougaro/data/races/descriptions.xml personal/kougaro/data/races/quickpaths.xml personal/kougaro/data/renderlayers/lighting_basic.xml personal/kougaro/data/shader/lighting/lighting_basic.xml personal/kougaro/data/shader/lighting/lighting_character.xml personal/kougaro/data/zoneinfo.xml personal/kougaro/docs/compiling.html personal/kougaro/docs/history.txt personal/kougaro/docs/todo.txt personal/kougaro/mk/jam/crystalspace_staticplugins_msvc7.jam personal/kougaro/mk/jam/crystalspace_staticplugins_msvc71.jam personal/kougaro/mk/jam/crystalspace_staticplugins_msvc8.jam personal/kougaro/mk/jam/crystalspace_staticplugins_msvc9.jam personal/kougaro/mk/msvc7/appccheck.vcproj personal/kougaro/mk/msvc7/appeedit.vcproj personal/kougaro/mk/msvc7/apppawseditor.vcproj personal/kougaro/mk/msvc7/apppsclient.vcproj personal/kougaro/mk/msvc7/apppsclient_static.vcproj personal/kougaro/mk/msvc7/apppslaunch.vcproj personal/kougaro/mk/msvc7/apppslaunch_static.vcproj personal/kougaro/mk/msvc7/apppsnpcclient.vcproj personal/kougaro/mk/msvc7/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc7/apppsserver.vcproj personal/kougaro/mk/msvc7/apppsserver_static.vcproj personal/kougaro/mk/msvc7/grpall_psminimal.vcproj personal/kougaro/mk/msvc7/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpall_psstatic.vcproj personal/kougaro/mk/msvc7/grpall_pstypical.vcproj personal/kougaro/mk/msvc7/grpapps_psminimal.vcproj personal/kougaro/mk/msvc7/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpapps_psstatic.vcproj personal/kougaro/mk/msvc7/grpapps_pstypical.vcproj personal/kougaro/mk/msvc7/grpclient_psminimal.vcproj personal/kougaro/mk/msvc7/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpclient_psstatic.vcproj personal/kougaro/mk/msvc7/grpclient_pstypical.vcproj personal/kougaro/mk/msvc7/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc7/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc7/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc7/grplibs_psminimal.vcproj personal/kougaro/mk/msvc7/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grplibs_psstatic.vcproj personal/kougaro/mk/msvc7/grplibs_pstypical.vcproj personal/kougaro/mk/msvc7/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc7/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc7/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc7/grpserver_psminimal.vcproj personal/kougaro/mk/msvc7/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpserver_psstatic.vcproj personal/kougaro/mk/msvc7/grpserver_pstypical.vcproj personal/kougaro/mk/msvc7/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc7/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc7/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc7/grptools_psminimal.vcproj personal/kougaro/mk/msvc7/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc7/grptools_psstatic.vcproj personal/kougaro/mk/msvc7/grptools_pstypical.vcproj personal/kougaro/mk/msvc7/libbulkobjects.vcproj personal/kougaro/mk/msvc7/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc7/libeffects.vcproj personal/kougaro/mk/msvc7/libfparser.vcproj personal/kougaro/mk/msvc7/libgui.vcproj personal/kougaro/mk/msvc7/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc7/libpaws.vcproj personal/kougaro/mk/msvc7/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpsengine.vcproj personal/kougaro/mk/msvc7/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpsnet.vcproj personal/kougaro/mk/msvc7/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc7/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc7/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc7/libpssound.vcproj personal/kougaro/mk/msvc7/libpsutil.vcproj personal/kougaro/mk/msvc7/libwordnet.vcproj personal/kougaro/mk/msvc7/libxdelta3.vcproj personal/kougaro/mk/msvc7/libxpnet.vcproj personal/kougaro/mk/msvc7/plgdbmysql.vcproj personal/kougaro/mk/msvc7/wkspsminimal.sln personal/kougaro/mk/msvc7/wkspsminimalstatic.sln personal/kougaro/mk/msvc7/wkspsstatic.sln personal/kougaro/mk/msvc7/wkspstypical.sln personal/kougaro/mk/msvc71/appccheck.vcproj personal/kougaro/mk/msvc71/appeedit.vcproj personal/kougaro/mk/msvc71/apppawseditor.vcproj personal/kougaro/mk/msvc71/apppsclient.vcproj personal/kougaro/mk/msvc71/apppsclient_static.vcproj personal/kougaro/mk/msvc71/apppslaunch.vcproj personal/kougaro/mk/msvc71/apppslaunch_static.vcproj personal/kougaro/mk/msvc71/apppsnpcclient.vcproj personal/kougaro/mk/msvc71/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc71/apppsserver.vcproj personal/kougaro/mk/msvc71/apppsserver_static.vcproj personal/kougaro/mk/msvc71/grpall_psminimal.vcproj personal/kougaro/mk/msvc71/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpall_psstatic.vcproj personal/kougaro/mk/msvc71/grpall_pstypical.vcproj personal/kougaro/mk/msvc71/grpapps_psminimal.vcproj personal/kougaro/mk/msvc71/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpapps_psstatic.vcproj personal/kougaro/mk/msvc71/grpapps_pstypical.vcproj personal/kougaro/mk/msvc71/grpclient_psminimal.vcproj personal/kougaro/mk/msvc71/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpclient_psstatic.vcproj personal/kougaro/mk/msvc71/grpclient_pstypical.vcproj personal/kougaro/mk/msvc71/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc71/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc71/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc71/grplibs_psminimal.vcproj personal/kougaro/mk/msvc71/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grplibs_psstatic.vcproj personal/kougaro/mk/msvc71/grplibs_pstypical.vcproj personal/kougaro/mk/msvc71/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc71/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc71/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc71/grpserver_psminimal.vcproj personal/kougaro/mk/msvc71/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpserver_psstatic.vcproj personal/kougaro/mk/msvc71/grpserver_pstypical.vcproj personal/kougaro/mk/msvc71/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc71/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc71/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc71/grptools_psminimal.vcproj personal/kougaro/mk/msvc71/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc71/grptools_psstatic.vcproj personal/kougaro/mk/msvc71/grptools_pstypical.vcproj personal/kougaro/mk/msvc71/libbulkobjects.vcproj personal/kougaro/mk/msvc71/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc71/libeffects.vcproj personal/kougaro/mk/msvc71/libfparser.vcproj personal/kougaro/mk/msvc71/libgui.vcproj personal/kougaro/mk/msvc71/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc71/libpaws.vcproj personal/kougaro/mk/msvc71/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpsengine.vcproj personal/kougaro/mk/msvc71/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpsnet.vcproj personal/kougaro/mk/msvc71/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc71/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc71/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc71/libpssound.vcproj personal/kougaro/mk/msvc71/libpsutil.vcproj personal/kougaro/mk/msvc71/libwordnet.vcproj personal/kougaro/mk/msvc71/libxdelta3.vcproj personal/kougaro/mk/msvc71/libxpnet.vcproj personal/kougaro/mk/msvc71/plgdbmysql.vcproj personal/kougaro/mk/msvc71/wkspsminimal.sln personal/kougaro/mk/msvc71/wkspsminimalstatic.sln personal/kougaro/mk/msvc71/wkspsstatic.sln personal/kougaro/mk/msvc71/wkspstypical.sln personal/kougaro/mk/msvc8/appccheck.vcproj personal/kougaro/mk/msvc8/appeedit.vcproj personal/kougaro/mk/msvc8/apppawseditor.vcproj personal/kougaro/mk/msvc8/apppsclient.vcproj personal/kougaro/mk/msvc8/apppsclient_static.vcproj personal/kougaro/mk/msvc8/apppslaunch.vcproj personal/kougaro/mk/msvc8/apppslaunch_static.vcproj personal/kougaro/mk/msvc8/apppsnpcclient.vcproj personal/kougaro/mk/msvc8/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc8/apppsserver.vcproj personal/kougaro/mk/msvc8/apppsserver_static.vcproj personal/kougaro/mk/msvc8/grpall_psminimal.vcproj personal/kougaro/mk/msvc8/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpall_psstatic.vcproj personal/kougaro/mk/msvc8/grpall_pstypical.vcproj personal/kougaro/mk/msvc8/grpapps_psminimal.vcproj personal/kougaro/mk/msvc8/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpapps_psstatic.vcproj personal/kougaro/mk/msvc8/grpapps_pstypical.vcproj personal/kougaro/mk/msvc8/grpclient_psminimal.vcproj personal/kougaro/mk/msvc8/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpclient_psstatic.vcproj personal/kougaro/mk/msvc8/grpclient_pstypical.vcproj personal/kougaro/mk/msvc8/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc8/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc8/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc8/grplibs_psminimal.vcproj personal/kougaro/mk/msvc8/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grplibs_psstatic.vcproj personal/kougaro/mk/msvc8/grplibs_pstypical.vcproj personal/kougaro/mk/msvc8/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc8/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc8/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc8/grpserver_psminimal.vcproj personal/kougaro/mk/msvc8/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpserver_psstatic.vcproj personal/kougaro/mk/msvc8/grpserver_pstypical.vcproj personal/kougaro/mk/msvc8/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc8/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc8/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc8/grptools_psminimal.vcproj personal/kougaro/mk/msvc8/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc8/grptools_psstatic.vcproj personal/kougaro/mk/msvc8/grptools_pstypical.vcproj personal/kougaro/mk/msvc8/libbulkobjects.vcproj personal/kougaro/mk/msvc8/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc8/libeffects.vcproj personal/kougaro/mk/msvc8/libfparser.vcproj personal/kougaro/mk/msvc8/libgui.vcproj personal/kougaro/mk/msvc8/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc8/libpaws.vcproj personal/kougaro/mk/msvc8/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpsengine.vcproj personal/kougaro/mk/msvc8/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpsnet.vcproj personal/kougaro/mk/msvc8/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc8/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc8/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc8/libpssound.vcproj personal/kougaro/mk/msvc8/libpsutil.vcproj personal/kougaro/mk/msvc8/libwordnet.vcproj personal/kougaro/mk/msvc8/libxdelta3.vcproj personal/kougaro/mk/msvc8/libxpnet.vcproj personal/kougaro/mk/msvc8/plgdbmysql.vcproj personal/kougaro/mk/msvc8/wkspsminimal.sln personal/kougaro/mk/msvc8/wkspsminimalstatic.sln personal/kougaro/mk/msvc8/wkspsstatic.sln personal/kougaro/mk/msvc8/wkspstypical.sln personal/kougaro/mk/msvc9/appccheck.vcproj personal/kougaro/mk/msvc9/appeedit.vcproj personal/kougaro/mk/msvc9/apppawseditor.vcproj personal/kougaro/mk/msvc9/apppsclient.vcproj personal/kougaro/mk/msvc9/apppsclient_static.vcproj personal/kougaro/mk/msvc9/apppslaunch.vcproj personal/kougaro/mk/msvc9/apppslaunch_static.vcproj personal/kougaro/mk/msvc9/apppsnpcclient.vcproj personal/kougaro/mk/msvc9/apppsnpcclient_static.vcproj personal/kougaro/mk/msvc9/apppsserver.vcproj personal/kougaro/mk/msvc9/apppsserver_static.vcproj personal/kougaro/mk/msvc9/grpall_psminimal.vcproj personal/kougaro/mk/msvc9/grpall_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpall_psstatic.vcproj personal/kougaro/mk/msvc9/grpall_pstypical.vcproj personal/kougaro/mk/msvc9/grpapps_psminimal.vcproj personal/kougaro/mk/msvc9/grpapps_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpapps_psstatic.vcproj personal/kougaro/mk/msvc9/grpapps_pstypical.vcproj personal/kougaro/mk/msvc9/grpclient_psminimal.vcproj personal/kougaro/mk/msvc9/grpclient_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpclient_psstatic.vcproj personal/kougaro/mk/msvc9/grpclient_pstypical.vcproj personal/kougaro/mk/msvc9/grpclient_static_psminimal.vcproj personal/kougaro/mk/msvc9/grpclient_static_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpclient_static_psstatic.vcproj personal/kougaro/mk/msvc9/grpclient_static_pstypical.vcproj personal/kougaro/mk/msvc9/grplibs_psminimal.vcproj personal/kougaro/mk/msvc9/grplibs_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grplibs_psstatic.vcproj personal/kougaro/mk/msvc9/grplibs_pstypical.vcproj personal/kougaro/mk/msvc9/grpplugins_psminimal.vcproj personal/kougaro/mk/msvc9/grpplugins_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpplugins_psstatic.vcproj personal/kougaro/mk/msvc9/grpplugins_pstypical.vcproj personal/kougaro/mk/msvc9/grpserver_psminimal.vcproj personal/kougaro/mk/msvc9/grpserver_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpserver_psstatic.vcproj personal/kougaro/mk/msvc9/grpserver_pstypical.vcproj personal/kougaro/mk/msvc9/grpserver_static_psminimal.vcproj personal/kougaro/mk/msvc9/grpserver_static_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grpserver_static_psstatic.vcproj personal/kougaro/mk/msvc9/grpserver_static_pstypical.vcproj personal/kougaro/mk/msvc9/grptools_psminimal.vcproj personal/kougaro/mk/msvc9/grptools_psminimalstatic.vcproj personal/kougaro/mk/msvc9/grptools_psstatic.vcproj personal/kougaro/mk/msvc9/grptools_pstypical.vcproj personal/kougaro/mk/msvc9/libbulkobjects.vcproj personal/kougaro/mk/msvc9/libdbmysqlstatic.vcproj personal/kougaro/mk/msvc9/libeffects.vcproj personal/kougaro/mk/msvc9/libfparser.vcproj personal/kougaro/mk/msvc9/libgui.vcproj personal/kougaro/mk/msvc9/liblibpsnpcclient.vcproj personal/kougaro/mk/msvc9/libpaws.vcproj personal/kougaro/mk/msvc9/libpsclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpsengine.vcproj personal/kougaro/mk/msvc9/libpslaunch_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpsnet.vcproj personal/kougaro/mk/msvc9/libpsnpcclient_static_plugins.vcproj personal/kougaro/mk/msvc9/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpsserver_static_plugins.vcproj personal/kougaro/mk/msvc9/libpsserver_static_plugins_CRYSTAL.vcproj personal/kougaro/mk/msvc9/libpssound.vcproj personal/kougaro/mk/msvc9/libpsutil.vcproj personal/kougaro/mk/msvc9/libwordnet.vcproj personal/kougaro/mk/msvc9/libxdelta3.vcproj personal/kougaro/mk/msvc9/libxpnet.vcproj personal/kougaro/mk/msvc9/plgdbmysql.vcproj personal/kougaro/mk/msvc9/wkspsminimal.sln personal/kougaro/mk/msvc9/wkspsminimalstatic.sln personal/kougaro/mk/msvc9/wkspsstatic.sln personal/kougaro/mk/msvc9/wkspstypical.sln personal/kougaro/mk/msvcgen/custom2.cslib personal/kougaro/psclient.cfg personal/kougaro/pslaunch.cfg personal/kougaro/src/client/actionhandler.cpp personal/kougaro/src/client/authentclient.cpp personal/kougaro/src/client/charapp.cpp personal/kougaro/src/client/chatbubbles.cpp personal/kougaro/src/client/chatbubbles.h personal/kougaro/src/client/clientvitals.cpp personal/kougaro/src/client/cmdadmin.cpp personal/kougaro/src/client/cmdadmin.h personal/kougaro/src/client/cmdgroups.cpp personal/kougaro/src/client/cmdgroups.h personal/kougaro/src/client/cmdguilds.cpp personal/kougaro/src/client/cmdguilds.h personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/cmdusers.h personal/kougaro/src/client/cmdutil.cpp personal/kougaro/src/client/cmdutil.h personal/kougaro/src/client/gui/chatwindow.cpp personal/kougaro/src/client/gui/chatwindow.h personal/kougaro/src/client/gui/inventorywindow.cpp personal/kougaro/src/client/gui/inventorywindow.h personal/kougaro/src/client/gui/pawsactionlocationwindow.cpp personal/kougaro/src/client/gui/pawsactivemagicwindow.cpp personal/kougaro/src/client/gui/pawsbankwindow.cpp personal/kougaro/src/client/gui/pawsbookreadingwindow.cpp personal/kougaro/src/client/gui/pawsbuddy.cpp personal/kougaro/src/client/gui/pawscharcreatemain.cpp personal/kougaro/src/client/gui/pawschardescription.cpp personal/kougaro/src/client/gui/pawscharpick.cpp personal/kougaro/src/client/gui/pawscharpick.h personal/kougaro/src/client/gui/pawsconfigchattabs.cpp personal/kougaro/src/client/gui/pawsconfigchattabs.h personal/kougaro/src/client/gui/pawscontainerdescwindow.cpp personal/kougaro/src/client/gui/pawscontrolwindow.cpp personal/kougaro/src/client/gui/pawscraft.cpp personal/kougaro/src/client/gui/pawsdetailwindow.cpp personal/kougaro/src/client/gui/pawsexchangewindow.cpp personal/kougaro/src/client/gui/pawsgameboard.cpp personal/kougaro/src/client/gui/pawsglyphwindow.cpp personal/kougaro/src/client/gui/pawsgmaction.cpp personal/kougaro/src/client/gui/pawsgmgui.cpp personal/kougaro/src/client/gui/pawsgmspawn.cpp personal/kougaro/src/client/gui/pawsgroupwindow.cpp personal/kougaro/src/client/gui/pawsguildwindow.cpp personal/kougaro/src/client/gui/pawsilluminationwindow.cpp personal/kougaro/src/client/gui/pawsinfowindow.cpp personal/kougaro/src/client/gui/pawsinfowindow.h personal/kougaro/src/client/gui/pawsinteractwindow.cpp personal/kougaro/src/client/gui/pawsinventorydollview.cpp personal/kougaro/src/client/gui/pawsitemdescriptionwindow.cpp personal/kougaro/src/client/gui/pawsloading.cpp personal/kougaro/src/client/gui/pawsloginwindow.cpp personal/kougaro/src/client/gui/pawslootwindow.cpp personal/kougaro/src/client/gui/pawsmerchantwindow.cpp personal/kougaro/src/client/gui/pawsnpcdialog.cpp personal/kougaro/src/client/gui/pawspetitiongmwindow.cpp personal/kougaro/src/client/gui/pawspetitionwindow.cpp personal/kougaro/src/client/gui/pawspetstatwindow.cpp personal/kougaro/src/client/gui/pawsquestrewardwindow.cpp personal/kougaro/src/client/gui/pawsquestwindow.cpp personal/kougaro/src/client/gui/pawsskillwindow.cpp personal/kougaro/src/client/gui/pawsslot.cpp personal/kougaro/src/client/gui/pawssmallinventory.cpp personal/kougaro/src/client/gui/pawsspellbookwindow.cpp personal/kougaro/src/client/gui/pawsspellcancelwindow.cpp personal/kougaro/src/client/gui/pawstutorialwindow.cpp personal/kougaro/src/client/gui/pawswritingwindow.cpp personal/kougaro/src/client/gui/psmainwidget.h personal/kougaro/src/client/guihandler.cpp personal/kougaro/src/client/modehandler.cpp personal/kougaro/src/client/pscamera.cpp personal/kougaro/src/client/pscelclient.cpp personal/kougaro/src/client/pscharcontrol.cpp personal/kougaro/src/client/psclientchar.cpp personal/kougaro/src/client/psclientdr.cpp personal/kougaro/src/client/psengine.cpp personal/kougaro/src/client/psengine.h personal/kougaro/src/client/psinventorycache.h personal/kougaro/src/client/psmovement.cpp personal/kougaro/src/client/psnetmanager.cpp personal/kougaro/src/client/psnetmanager.h personal/kougaro/src/client/questionclient.cpp personal/kougaro/src/client/sound/pssoundmngr.cpp personal/kougaro/src/client/zonehandler.cpp personal/kougaro/src/common/effects/pseffectmanager.cpp personal/kougaro/src/common/effects/pseffectmanager.h personal/kougaro/src/common/effects/pseffectobjquad.cpp personal/kougaro/src/common/engine/loader.cpp personal/kougaro/src/common/engine/loader.h personal/kougaro/src/common/engine/psregion.cpp personal/kougaro/src/common/engine/psregion.h personal/kougaro/src/common/net/clientmsghandler.cpp personal/kougaro/src/common/net/clientmsghandler.h personal/kougaro/src/common/net/cmdbase.cpp personal/kougaro/src/common/net/cmdbase.h personal/kougaro/src/common/net/cmdhandler.cpp personal/kougaro/src/common/net/connection.h personal/kougaro/src/common/net/message.h personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/net/msghandler.cpp personal/kougaro/src/common/net/msghandler.h personal/kougaro/src/common/net/netbase.cpp personal/kougaro/src/common/net/netpacket.h personal/kougaro/src/common/net/npcmessages.cpp personal/kougaro/src/common/net/subscriber.h personal/kougaro/src/common/paws/pawscombo.cpp personal/kougaro/src/common/paws/pawslistbox.cpp personal/kougaro/src/common/paws/pawsmainwidget.h personal/kougaro/src/common/paws/pawsmanager.cpp personal/kougaro/src/common/paws/pawsmanager.h personal/kougaro/src/common/paws/pawsobjectview.cpp personal/kougaro/src/common/paws/pawsobjectview.h personal/kougaro/src/common/paws/pawsselector.cpp personal/kougaro/src/common/paws/pawstabwindow.cpp personal/kougaro/src/common/paws/pawstabwindow.h personal/kougaro/src/common/paws/pawstextbox.cpp personal/kougaro/src/common/paws/pawswidget.cpp personal/kougaro/src/common/rpgrules/Jamfile personal/kougaro/src/common/rpgrules/psmoney.cpp personal/kougaro/src/common/rpgrules/psmoney.h personal/kougaro/src/common/rpgrules/test/Jamfile personal/kougaro/src/common/rpgrules/test/testrpgrules.cpp personal/kougaro/src/common/rpgrules/test/testrpgrules.h personal/kougaro/src/common/util/eventmanager.cpp personal/kougaro/src/common/util/eventmanager.h personal/kougaro/src/common/util/location.cpp personal/kougaro/src/common/util/mathscript.cpp personal/kougaro/src/common/util/mathscript.h personal/kougaro/src/common/util/mathscript_unittest.cpp personal/kougaro/src/common/util/pspath.h personal/kougaro/src/npcclient/command.cpp personal/kougaro/src/npcclient/networkmgr.cpp personal/kougaro/src/npcclient/npc.cpp personal/kougaro/src/npcclient/npcbehave.cpp personal/kougaro/src/npcclient/npcclient.cpp personal/kougaro/src/npcclient/perceptions.cpp personal/kougaro/src/pslaunch/download.cpp personal/kougaro/src/pslaunch/pawslauncherwindow.cpp personal/kougaro/src/pslaunch/pslaunch.cpp personal/kougaro/src/pslaunch/updater.cpp personal/kougaro/src/pslaunch/updaterconfig.cpp personal/kougaro/src/pslaunch/updaterconfig.h personal/kougaro/src/pslaunch/updaterengine.cpp personal/kougaro/src/pslaunch/updaterengine.h personal/kougaro/src/server/Jamfile personal/kougaro/src/server/actionmanager.h personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/adminmanager.h personal/kougaro/src/server/advicemanager.cpp personal/kougaro/src/server/bulkobjects/activespell.h personal/kougaro/src/server/bulkobjects/dictionary.cpp personal/kougaro/src/server/bulkobjects/dictionary.h personal/kougaro/src/server/bulkobjects/pscharacter.cpp personal/kougaro/src/server/bulkobjects/pscharacter.h personal/kougaro/src/server/bulkobjects/pscharacterloader.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.h personal/kougaro/src/server/bulkobjects/psitem.cpp personal/kougaro/src/server/bulkobjects/psitemstats.cpp personal/kougaro/src/server/bulkobjects/psnpcdialog.cpp personal/kougaro/src/server/bulkobjects/psquest.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.h personal/kougaro/src/server/cachemanager.cpp personal/kougaro/src/server/cachemanager.h personal/kougaro/src/server/chatmanager.cpp personal/kougaro/src/server/chatmanager.h personal/kougaro/src/server/client.cpp personal/kougaro/src/server/client.h personal/kougaro/src/server/combatmanager.cpp personal/kougaro/src/server/creationmanager.cpp personal/kougaro/src/server/database/mysql/characters.sql personal/kougaro/src/server/database/mysql/command_access.sql personal/kougaro/src/server/database/mysql/commonstrings.sql personal/kougaro/src/server/database/mysql/create_indexes.sql personal/kougaro/src/server/database/mysql/math_scripts.sql personal/kougaro/src/server/database/mysql/quest_scripts.sql personal/kougaro/src/server/database/mysql/quests.sql personal/kougaro/src/server/database/mysql/race_info.sql personal/kougaro/src/server/database/mysql/race_spawns.sql personal/kougaro/src/server/database/mysql/trade_processes.sql personal/kougaro/src/server/database/mysql/upgrade_schema.sql personal/kougaro/src/server/entitymanager.cpp personal/kougaro/src/server/entitymanager.h personal/kougaro/src/server/exchangemanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/gem.h personal/kougaro/src/server/groupmanager.cpp personal/kougaro/src/server/guildmanager.cpp personal/kougaro/src/server/msgmanager.cpp personal/kougaro/src/server/msgmanager.h personal/kougaro/src/server/netmanager.cpp personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserver.h personal/kougaro/src/server/psserverdr.cpp personal/kougaro/src/server/questmanager.cpp personal/kougaro/src/server/scripting.cpp personal/kougaro/src/server/slotmanager.cpp personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/workmanager.cpp personal/kougaro/src/server/workmanager.h personal/kougaro/src/tools/ccheck/Jamfile personal/kougaro/src/tools/fparser/fparser.cpp personal/kougaro/src/tools/fparser/fparser.h personal/kougaro/src/tools/fparser/fparser.txt personal/kougaro/src/tools/fparser/fpconfig.h personal/kougaro/src/tools/fparser/fpoptimizer.cpp personal/kougaro/src/tools/fparser/fptypes.h personal/kougaro/src/tools/xdelta3/xdelta3-decode.h personal/kougaro/src/tools/xdelta3/xdelta3-hash.h personal/kougaro/src/tools/xdelta3/xdelta3-list.h personal/kougaro/src/tools/xdelta3/xdelta3.c personal/kougaro/src/tools/xdelta3/xdelta3.h Added Paths: ----------- personal/kougaro/data/renderlayers/lighting_simple.xml personal/kougaro/data/shader/lighting/lighting_simple.xml personal/kougaro/data/tests/ personal/kougaro/data/tests/rpgrules.xml personal/kougaro/mk/msvc/apptestrpgrules.manifest personal/kougaro/mk/msvc/apptestrpgrules.rc personal/kougaro/mk/msvc7/apptestrpgrules.vcproj personal/kougaro/mk/msvc7/libpsrpgrules.vcproj personal/kougaro/mk/msvc71/libpsrpgrules.vcproj personal/kougaro/mk/msvc8/libpsrpgrules.vcproj personal/kougaro/mk/msvc9/apptestrpgrules.vcproj personal/kougaro/mk/msvc9/libpsrpgrules.vcproj personal/kougaro/src/common/rpgrules/test/ personal/kougaro/src/tools/fparser/fparser.html personal/kougaro/src/tools/fparser/style.css Removed Paths: ------------- personal/kougaro/data/tests/rpgrules.xml personal/kougaro/mk/msvc7/libpsrpgrules.vcproj personal/kougaro/mk/msvc71/libpsrpgrules.vcproj personal/kougaro/mk/msvc8/libpsrpgrules.vcproj personal/kougaro/mk/msvc9/libpsrpgrules.vcproj Property Changed: ---------------- personal/kougaro/ personal/kougaro/lang/1337/data/ personal/kougaro/lang/french/data/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Kayden:2590-3147 /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2872-2972,2974-3050,3052-3390 + /personal/Kayden:2590-3147 /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2872-2972,2974-3050,3052-3606 Modified: personal/kougaro/Jamfile.in =================================================================== --- personal/kougaro/Jamfile.in 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/Jamfile.in 2009-05-03 06:10:09 UTC (rev 3607) @@ -140,13 +140,14 @@ # Write a description of each compile group for 'jam help' Description server : "Server components" ; Description client : "Client components" ; +Description tests : "Tests" ; Description tools : "Tools" ; Description client_static : "Static client components" ; Description server_static : "Static server components" ; # Register the compile groups. To add a project to a compile group, add the line CompileGroups project : compilegroup ; in the projects Jamfile. -RegisterCompileGroups server client tools client_static server_static ; +RegisterCompileGroups server client tests tools client_static server_static ; # List the first layer of subdirectories containing the jamfiles for the projects you wish to compile. This is order sensistive. # Library targets must be seen by Jam before Application and Plugin targets. Modified: personal/kougaro/data/ProgressionSchema.rng =================================================================== --- personal/kougaro/data/ProgressionSchema.rng 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/ProgressionSchema.rng 2009-05-03 06:10:09 UTC (rev 3607) @@ -319,7 +319,7 @@ <choice> <attribute name="location"/> <group> - <attribute name="map"/> + <attribute name="sector"/> <optional> <attribute name="x"/> <attribute name="y"/> Modified: personal/kougaro/data/effects/misc/admin_location.eff =================================================================== --- personal/kougaro/data/effects/misc/admin_location.eff 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/effects/misc/admin_location.eff 2009-05-03 06:10:09 UTC (rev 3607) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <library> - <library>/planeshift/weapons/wand03a.meshfact</library> + <library path="/planeshift/weapons/" file="wand03a.meshfact"/> <addon plugin="PSEffects"> <effect name="admin_location"> <anchor type="basic" name="pos"> Modified: personal/kougaro/data/effects/misc/admin_path_point.eff =================================================================== --- personal/kougaro/data/effects/misc/admin_path_point.eff 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/effects/misc/admin_path_point.eff 2009-05-03 06:10:09 UTC (rev 3607) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" ?> <library> - <library>/planeshift/weapons/wand01a.meshfact</library> + <library path="/planeshift/weapons/" file="wand01a.meshfact"/> <addon plugin="PSEffects"> <effect name="admin_path_point"> <anchor type="basic" name="pos"> Modified: personal/kougaro/data/effects/misc/admin_waypoint.eff =================================================================== --- personal/kougaro/data/effects/misc/admin_waypoint.eff 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/effects/misc/admin_waypoint.eff 2009-05-03 06:10:09 UTC (rev 3607) @@ -1 +1,16 @@ -<?xml version="1.0" encoding="utf-8" ?> <library> <library>/planeshift/weapons/wand02a.meshfact</library> <addon plugin="PSEffects"> <effect name="admin_waypoint"> <anchor type="basic" name="pos"> <dir>none</dir> </anchor> <obj type="mesh" name="weapons#wand02a" fact="weapons#wand02a"> <attach>pos</attach> <death>none</death> <mixmode>mult2</mixmode> </obj> </effect> </addon> </library> \ No newline at end of file +<?xml version="1.0" encoding="utf-8" ?> +<library> + <library path="/planeshift/weapons/" file="wand02a.meshfact"/> + <addon plugin="PSEffects"> + <effect name="admin_waypoint"> + <anchor type="basic" name="pos"> + <dir>none</dir> + </anchor> + <obj type="mesh" name="weapons#wand02a" fact="weapons#wand02a"> + <attach>pos</attach> + <death>none</death> + <mixmode>mult2</mixmode> + </obj> + </effect> + </addon> + </library> \ No newline at end of file Modified: personal/kougaro/data/effects/misc/marker.eff =================================================================== --- personal/kougaro/data/effects/misc/marker.eff 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/effects/misc/marker.eff 2009-05-03 06:10:09 UTC (rev 3607) @@ -7,7 +7,7 @@ </shaders> <textures> <texture name="marker"> - <file>/this/art/effects/marker01.dds</file> + <file>/this/art/effects/marker02.dds</file> </texture> </textures> <materials> Modified: personal/kougaro/data/effects/misc/shadow.eff =================================================================== --- personal/kougaro/data/effects/misc/shadow.eff 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/effects/misc/shadow.eff 2009-05-03 06:10:09 UTC (rev 3607) @@ -2,7 +2,7 @@ <library> <shaders> <shader> - <file>/shader/lighting/fullbright.xml</file> + <file>/shader/lighting/lighting_basic.xml</file> </shader> </shaders> <textures> @@ -13,8 +13,8 @@ <materials> <material name="shadow"> <texture>shadow</texture> - <shader type="base">lighting_fullbright</shader> - <shader type="diffuse">lighting_fullbright</shader> + <shader type="base">lighting_basic</shader> + <shader type="diffuse">lighting_basic</shader> <shader type="depthwrite">*null</shader> </material> </materials> Modified: personal/kougaro/data/effects/misc/target.eff =================================================================== --- personal/kougaro/data/effects/misc/target.eff 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/effects/misc/target.eff 2009-05-03 06:10:09 UTC (rev 3607) @@ -7,7 +7,7 @@ </shaders> <textures> <texture name="marker"> - <file>/this/art/effects/marker01.dds</file> + <file>/this/art/effects/marker02.dds</file> </texture> </textures> <materials> @@ -32,7 +32,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="-90" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -48,7 +48,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="180" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -64,7 +64,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="0" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -80,7 +80,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="90" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="360" z="0" /> @@ -96,7 +96,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="270" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> @@ -112,7 +112,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="180" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> @@ -128,7 +128,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="0" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> @@ -144,7 +144,7 @@ <action name="scale" value="0.8" /> <action name="rotate" x="0" y="0" z="0" /> <action name="spin" y="90" /> - <action name="colour" r="0" g="200" b="40" /> + <action name="colour" r="200" g="0" b="40" /> </keyFrame> <keyFrame time="2500"> <action name="rotate" x="0" y="-360" z="0" /> Modified: personal/kougaro/data/gui/chat.xml =================================================================== --- personal/kougaro/data/gui/chat.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/gui/chat.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -13,95 +13,50 @@ </attachpoints> </widget> - <widget name="Chat Tabs" factory="pawsTabWindow"> + <!--childborders> + <colour r="0" g="0" b="0" /> + <colour r="32" g="32" b="32" /> + <colour r="180" g="180" b="180" /> + <colour r="180" g="180" b="180" /> + <colour r="220" g="220" b="220" /> + </childborders--> + <widget name="MainText" factory="pawsMessageTextBox" visible="yes" id="1100"> <defaultstyle widget="pawsButton" style="New Standard Tab"/> + <subscriptions overwrite = "false"> + <subscribe data="CHAT_SYSTEM" /> + <subscribe data="CHAT_SERVER_INFO" /> + <subscribe data="CHAT_SAY" /> + <subscribe data="CHAT_TELL" /> + <subscribe data="CHAT_GROUP" /> + <subscribe data="CHAT_GUILD" /> + <subscribe data="CHAT_AUCTION" /> + <subscribe data="CHAT_SHOUT" /> + <subscribe data="CHAT_TELLSELF" /> + <subscribe data="CHAT_REPORT" /> + <subscribe data="CHAT_ADVISOR" /> + <subscribe data="CHAT_ADVICE" /> + <subscribe data="CHAT_ADVICE_LIST" /> + <subscribe data="CHAT_SERVER_TELL" /> + <subscribe data="CHAT_GM" /> + <subscribe data="CHAT_SERVER_INFO" /> + <subscribe data="CHAT_NPC" /> + <subscribe data="CHAT_NPCINTERNAL" /> + <subscribe data="CHAT_SYSTEM_BASE" /> + <subscribe data="CHAT_PET_ACTION" /> + <subscribe data="CHAT_NPC_ME" /> + <subscribe data="CHAT_NPC_MY" /> + <subscribe data="CHAT_NPC_NARRATE" /> + </subscriptions> + <frame x="6" y="2" width="320" height="95" border="no" /> - <frame x="6" y="2" width="320" height="95" border="no" /> <attachpoints> <attach point="ATTACH_RIGHT" /> <attach point="ATTACH_TOP" /> <attach point="ATTACH_LEFT" /> <attach point="ATTACH_BOTTOM" /> </attachpoints> - <!--childborders> - <colour r="0" g="0" b="0" /> - <colour r="32" g="32" b="32" /> - <colour r="180" g="180" b="180" /> - <colour r="180" g="180" b="180" /> - <colour r="220" g="220" b="220" /> - </childborders--> - - <widget name="Main Button" factory="pawsButton" id="1000" shadows="yes"> - <label text="Main" /> - <frame x="0" y="5" width="25" height="16" border="no" /> + </widget> - - <widget name="NPC Button" factory="pawsButton" id="1002" shadows="yes"> - <label text="NPC" /> - <frame x="25" y="5" width="30" height="16" border="no" /> - </widget> - - <widget name="Tell Button" factory="pawsButton" id="1003" shadows="yes"> - <label text="Tells" /> - <frame x="56" y="5" width="30" height="16" border="no" /> - </widget> - - <widget name="Guild Button" factory="pawsButton" id="1004" shadows="yes"> - <label text="Guild" /> - <frame x="87" y="5" width="35" height="16" border="no" /> - </widget> - - <widget name="Group Button" factory="pawsButton" id="1005" shadows="yes"> - <label text="Group" /> - <frame x="123" y="5" width="35" height="16" border="no" /> - </widget> - - <widget name="Auction Button" factory="pawsButton" id="1006" shadows="yes"> - <label text="Auction" /> - <frame x="159" y="5" width="40" height="16" border="no" /> - </widget> - - <widget name="System Button" factory="pawsButton" id="1001"> - <label text="System" /> - <frame x="200" y="5" width="45" height="16" border="no" /> - </widget> - <widget name="Help Button" factory="pawsButton" id="1007"> - <label text="Help" /> - <frame x="285" y="5" width="30" height="16" border="no" /> - </widget> - - <widget name="MainText" factory="pawsMessageTextBox" visible="no" id="1100"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="SystemText" factory="pawsMessageTextBox" visible="no" id="1101"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="NpcText" factory="pawsMessageTextBox" visible="no" id="1102"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="TellText" factory="pawsMessageTextBox" visible="no" id="1103"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="GuildText" factory="pawsMessageTextBox" visible="no" id="1104"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="GroupText" factory="pawsMessageTextBox" visible="no" id="1105"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="AuctionText" factory="pawsMessageTextBox" visible="no" id="1106"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - - <widget name="HelpText" factory="pawsMessageTextBox" visible="no" id="1107"> - <frame x="0" y="20" width="320" height="80" border="no" /> - </widget> - </widget> </widget> </widget_description> Modified: personal/kougaro/data/gui/pslaunch.xml =================================================================== --- personal/kougaro/data/gui/pslaunch.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/gui/pslaunch.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -187,7 +187,7 @@ <widget name="GraphicsPreset" factory="pawsComboBox" id="1392" alwaysontop="true"> <frame x="100" y="0" width="90" height="20" border="no" /> - <listbox rows="4" height="25" useScrollBar="false" /> + <listbox rows="5" height="25" useScrollBar="false" /> </widget> <widget name="AspectRatioText" factory="pawsTextBox" id="1393"> @@ -257,7 +257,7 @@ <!-- Graphics Widget --> <widget name="SettingsGraphics" factory="pawsWidget" id="1310" visible="no" alwaysontop="true"> - <frame x="90" y="200" width="670" height="290" /> + <frame x="90" y="200" width="670" height="330" /> <widget name="ScreenDepthText" factory="pawsTextBox" id="13101"> <frame x="0" y="3" width="90" height="20"/> @@ -286,7 +286,7 @@ <widget name="AnisotropicFiltering" factory="pawsComboBox" id="13106" alwaysontop="true"> <frame x="120" y="40" width="70" height="20" border="no" /> - <listbox rows="3" height="25" useScrollBar="false" /> + <listbox rows="5" height="25" useScrollBar="false" /> </widget> <widget name="TextureQualityText" factory="pawsTextBox" id="13107"> @@ -304,40 +304,62 @@ <text string="Shaders: "/> </widget> - <widget name="Shaders" factory="pawsComboBox" id="131010" alwaysontop="true"> + <widget name="Shaders" factory="pawsComboBox" id="13110" alwaysontop="true"> <frame x="120" y="80" width="70" height="20" border="no" /> - <listbox rows="2" height="25" useScrollBar="false" /> + <listbox rows="4" height="25" useScrollBar="false" /> </widget> - <widget name="EnableGrass" factory="pawsCheckBox" id="131011"> + <widget name="EnableShadows" factory="pawsCheckBox" id="13111"> <frame x="0" y="103" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Enable Grass:" position="left"/> + <text string="Enable Shadows:" position="left"/> </widget> - <widget name="VBO" factory="pawsCheckBox" id="131012"> + <widget name="EnableBloom" factory="pawsCheckBox" id="13112"> <frame x="0" y="123" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Enable VBO:" position="left"/> + <text string="Enable Bloom:" position="left"/> </widget> - <widget name="LoadAllMaps" factory="pawsCheckBox" id="131013"> + <widget name="EnableHDR" factory="pawsCheckBox" id="13113"> <frame x="0" y="143" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Load All Maps:" position="left"/> + <text string="Enable HDR:" position="left"/> </widget> - - <widget name="KeepMapsLoaded" factory="pawsCheckBox" id="13114"> + + <widget name="EnableGrass" factory="pawsCheckBox" id="13114"> <frame x="0" y="163" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Keep Maps Loaded:" position="left"/> + <text string="Enable Grass:" position="left"/> </widget> - <widget name="ThreadedWorldLoading" factory="pawsCheckBox" id="13115"> + <widget name="VBO" factory="pawsCheckBox" id="13115"> <frame x="0" y="183" width="130" height="15"/> <checkbox on="radioon" off="radiooff" size="12"/> - <text string="Threaded World Loading:" position="left"/> + <text string="Enable VBO:" position="left"/> </widget> + + <widget name="LoadAllMaps" factory="pawsCheckBox" id="13116"> + <frame x="0" y="203" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Load All Maps:" position="left"/> + </widget> + + <widget name="KeepMapsLoaded" factory="pawsCheckBox" id="13117"> + <frame x="0" y="223" width="130" height="15"/> + <checkbox on="radioon" off="radiooff" size="12"/> + <text string="Keep Maps Loaded:" position="left"/> + </widget> + + <widget name="ThreadedLoadingText" factory="pawsTextBox" id="13118"> + <frame x="0" y="243" width="210" height="20"/> + <text string="Threaded Loading:"/> + </widget> + + <widget name="ThreadedLoading" factory="pawsComboBox" id="13119"> + <frame x="120" y="240" width="70" height="20" border="no"/> + <listbox rows="3" height="25" useScrollBar="false" /> + </widget> </widget> </widget> Modified: personal/kougaro/data/options/camera_def.xml =================================================================== --- personal/kougaro/data/options/camera_def.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/options/camera_def.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -1,7 +1,6 @@ <General> <camsetting name="StartingCameraMode" value="1" /> <camsetting name="UseCollisionDetection" value="on" /> - <camsetting name="UseNPCCam" value="off" /> <camsetting name="TransitionThreshold" value="1" /> </General> <CameraTransition> Modified: personal/kougaro/data/options/chat_def.xml =================================================================== --- personal/kougaro/data/options/chat_def.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/options/chat_def.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -2,42 +2,10 @@ <chatoptions> <selecttabstyle value="2" /> <echoscreeninsystem value="1" /> - <mainbrackets value="1" /> - <yourcolormix value="1" /> <loose value="0" /> <logAllChat value="1" /> <logSystemChat value="0" /> </chatoptions> - <maintabincludes> - <npc value="no" /> - <tell value="no" /> - <guild value="no" /> - <group value="no" /> - <auction value="no" /> - <system value="no" /> - <systembase value="yes" /> - <help value="no" /> - </maintabincludes> - <flashingoptions> - <main value="yes" /> - <npc value="yes" /> - <tell value="yes" /> - <guild value="yes" /> - <group value="yes" /> - <auction value="yes" /> - <system value="yes" /> - <help value="yes" /> - </flashingoptions> - <flashingoncharoptions> - <main value="yes" /> - <npc value="yes" /> - <tell value="yes" /> - <guild value="yes" /> - <group value="yes" /> - <auction value="yes" /> - <system value="yes" /> - <help value="yes" /> - </flashingoncharoptions> <chatcolors> <systemtext r="0" g="255" b="0" /> @@ -45,7 +13,6 @@ <playernametext r="157" g="187" b="255" /> <chattext r="255" g="255" b="255" /> <telltext r="255" g="255" b="0" /> - <npctext r="255" g="0" b="255" /> <shouttext r="255" g="0" b="255" /> <guildtext r="200" g="200" b="200" /> <yourtext r="255" g="255" b="255" /> Modified: personal/kougaro/data/options/controls_def.xml =================================================================== --- personal/kougaro/data/options/controls_def.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/options/controls_def.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -35,7 +35,6 @@ <bind action="Communications" key="" /> <bind action="Help" key="F1" /> <bind action="Inventory" key="i" /> - <bind action="Bag" key="v" /> <bind action="Options" key="o" /> <bind action="Quit" key="Alt+q" /> <bind action="Spell book" key="c" /> Modified: personal/kougaro/data/races/descriptions.xml =================================================================== --- personal/kougaro/data/races/descriptions.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/races/descriptions.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -53,7 +53,7 @@ <race name="Ylian" description= -"THE FEMALE 3D MODEL FOR THIS RACE IS NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE FEMALE MODEL OF THE YNNWN RACE. Physical Traits: Their robust and well-proportioned body gives them the opportunity to excel in all arts. They can have hair from black to white, eyes with wonderful colours and skin from pale to dark brown. Abilities and fields of interest: Humans are a practical and disciplined race with fighters, sorcerers, merchants and politicians. They tend to learn a little of everything without choosing a preferred profession. +"THE FEMALE 3D MODEL FOR THIS RACE IS NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE FEMALE MODEL OF THE YNNWN RACE.Physical Traits: Their robust and well-proportioned body gives them the opportunity to excel in all arts. They can have hair from black to white, eyes with wonderful colours and skin from pale to dark brown. Abilities and fields of interest: Humans are a practical and disciplined race with fighters, sorcerers, merchants and politicians. They tend to learn a little of everything without choosing a preferred profession. Psychology: The Ylians were the first men who saw the Blue Sun. They were proud of this peculiarity and, in the early days of the civilization, they invented the name Ylians to distinguish them from the other humans that arrived later. In spite of this, they are the most inclined to mix with other races, and have friendly relations with anyone. Thanks to this ability they often cover political roles. Rules: Nothing Special for now." basetexture="1.png" @@ -85,7 +85,7 @@ <race name="Nolthrir" description= -"THE MALE 3D MODEL FOR THIS RACE IS NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MALE MODEL OF THE DERMORIAN RACE. Physical Traits: The most ancient race of Elves is the Nolthrirs, which first became part of the society as seaweed fishers and farmers, an activity it is believed they perfected before leaving the Surface. After many centuries, the great amount of time spent working underwater and the unique altering properties of the Crystal have made the Nolthrirs an amphibious race, with webbed fingers and both gilled and pulmonary respiration. Nolthrirs appear as slim elves, with skin and hair coloured from azure to green, and icy eyes coloured from light azure to light green. They tend to be beardless but both sexes have very long hair. They live mainly on the two submerged levels. +"THE 3D MODELS FOR THIS RACE ARE NOT YET AVAILABLE IN GAME. YOU CAN CONTINUE ANYWAY USING THE MALE MODEL OF THE DERMORIAN RACE AND FEMALE MODEL OF THE YNNWN RACE. Physical Traits: The most ancient race of Elves is the Nolthrirs, which first became part of the society as seaweed fishers and farmers, an activity it is believed they perfected before leaving the Surface. After many centuries, the great amount of time spent working underwater and the unique altering properties of the Crystal have made the Nolthrirs an amphibious race, with webbed fingers and both gilled and pulmonary respiration. Nolthrirs appear as slim elves, with skin and hair coloured from azure to green, and icy eyes coloured from light azure to light green. They tend to be beardless but both sexes have very long hair. They live mainly on the two submerged levels. Abilities and fields of interest: Almost all elves have familiarity with some form of magic, mainly elemental magic. Nolthirs have a particular disadvantage on using fire related spells, but on the other hand they master water spells. Psychology: The serenity of the underwater life with its soft rumours and dimmed lights is reflected in Nolthrir's way of life. Rules: Nothing Special for now." Modified: personal/kougaro/data/races/quickpaths.xml =================================================================== --- personal/kougaro/data/races/quickpaths.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/races/quickpaths.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -42,7 +42,7 @@ <path name="Warlock" info="The warlock is a combatant mage. His task is to win battles and wars with metal and magic. Most warlocks try to follow both the way of fighting and the way of glyphs, but only a few of them achieve this goal." parents="Your parents were both peasants, but they had great hope in you." life="Your youth was spent learning and practicing. Curious about everything, you learned all you could."> <StatBonus name="Strength" value="0.15" /> <StatBonus name="Endurance" value="0.15" /> - <StatBonus name="Agility" value="0.2020" /> + <StatBonus name="Agility" value="0.20" /> <StatBonus name="Intelligence" value="0.20" /> <StatBonus name="Will" value="0.15" /> <StatBonus name="Charisma" value="0.15" /> Modified: personal/kougaro/data/renderlayers/lighting_basic.xml =================================================================== --- personal/kougaro/data/renderlayers/lighting_basic.xml 2009-05-02 20:40:48 UTC (rev 3606) +++ personal/kougaro/data/renderlayers/lighting_basic.xml 2009-05-03 06:10:09 UTC (rev 3607) @@ -1,6 +1,6 @@ <layerconfig> <layer> - <defaultshader name="fullbright" file="/shader/lighting/lighting_basic.xml" /> + <defaultshade... [truncated message content] |