From: <mr...@us...> - 2009-05-04 09:54:40
|
Revision: 3616 http://planeshift.svn.sourceforge.net/planeshift/?rev=3616&view=rev Author: mr_dave Date: 2009-05-04 09:54:29 +0000 (Mon, 04 May 2009) Log Message: ----------- Trunk merge r3422-3614 Modified Paths: -------------- personal/Acissej/Jamfile.in personal/Acissej/data/ProgressionSchema.rng personal/Acissej/data/effects/misc/admin_location.eff personal/Acissej/data/effects/misc/admin_path_point.eff personal/Acissej/data/effects/misc/admin_waypoint.eff personal/Acissej/data/effects/misc/shadow.eff personal/Acissej/data/gui/chat.xml personal/Acissej/data/gui/pslaunch.xml personal/Acissej/data/options/chat_def.xml personal/Acissej/data/races/quickpaths.xml personal/Acissej/data/renderlayers/lighting_basic.xml personal/Acissej/data/shader/lighting/lighting_basic.xml personal/Acissej/data/shader/lighting/lighting_character.xml personal/Acissej/docs/compiling.html personal/Acissej/docs/history.txt personal/Acissej/docs/todo.txt personal/Acissej/mk/jam/crystalspace_staticplugins_msvc7.jam personal/Acissej/mk/jam/crystalspace_staticplugins_msvc71.jam personal/Acissej/mk/jam/crystalspace_staticplugins_msvc8.jam personal/Acissej/mk/jam/crystalspace_staticplugins_msvc9.jam personal/Acissej/mk/msvc7/appccheck.vcproj personal/Acissej/mk/msvc7/appeedit.vcproj personal/Acissej/mk/msvc7/apppawseditor.vcproj personal/Acissej/mk/msvc7/apppsclient.vcproj personal/Acissej/mk/msvc7/apppsclient_static.vcproj personal/Acissej/mk/msvc7/apppslaunch.vcproj personal/Acissej/mk/msvc7/apppslaunch_static.vcproj personal/Acissej/mk/msvc7/apppsnpcclient.vcproj personal/Acissej/mk/msvc7/apppsnpcclient_static.vcproj personal/Acissej/mk/msvc7/apppsserver.vcproj personal/Acissej/mk/msvc7/apppsserver_static.vcproj personal/Acissej/mk/msvc7/grpall_psminimal.vcproj personal/Acissej/mk/msvc7/grpall_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpall_psstatic.vcproj personal/Acissej/mk/msvc7/grpall_pstypical.vcproj personal/Acissej/mk/msvc7/grpapps_psminimal.vcproj personal/Acissej/mk/msvc7/grpapps_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpapps_psstatic.vcproj personal/Acissej/mk/msvc7/grpapps_pstypical.vcproj personal/Acissej/mk/msvc7/grpclient_psminimal.vcproj personal/Acissej/mk/msvc7/grpclient_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpclient_psstatic.vcproj personal/Acissej/mk/msvc7/grpclient_pstypical.vcproj personal/Acissej/mk/msvc7/grpclient_static_psminimal.vcproj personal/Acissej/mk/msvc7/grpclient_static_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpclient_static_psstatic.vcproj personal/Acissej/mk/msvc7/grpclient_static_pstypical.vcproj personal/Acissej/mk/msvc7/grplibs_psminimal.vcproj personal/Acissej/mk/msvc7/grplibs_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grplibs_psstatic.vcproj personal/Acissej/mk/msvc7/grplibs_pstypical.vcproj personal/Acissej/mk/msvc7/grpplugins_psminimal.vcproj personal/Acissej/mk/msvc7/grpplugins_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpplugins_psstatic.vcproj personal/Acissej/mk/msvc7/grpplugins_pstypical.vcproj personal/Acissej/mk/msvc7/grpserver_psminimal.vcproj personal/Acissej/mk/msvc7/grpserver_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpserver_psstatic.vcproj personal/Acissej/mk/msvc7/grpserver_pstypical.vcproj personal/Acissej/mk/msvc7/grpserver_static_psminimal.vcproj personal/Acissej/mk/msvc7/grpserver_static_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grpserver_static_psstatic.vcproj personal/Acissej/mk/msvc7/grpserver_static_pstypical.vcproj personal/Acissej/mk/msvc7/grptools_psminimal.vcproj personal/Acissej/mk/msvc7/grptools_psminimalstatic.vcproj personal/Acissej/mk/msvc7/grptools_psstatic.vcproj personal/Acissej/mk/msvc7/grptools_pstypical.vcproj personal/Acissej/mk/msvc7/libbulkobjects.vcproj personal/Acissej/mk/msvc7/libdbmysqlstatic.vcproj personal/Acissej/mk/msvc7/libeffects.vcproj personal/Acissej/mk/msvc7/libfparser.vcproj personal/Acissej/mk/msvc7/libgui.vcproj personal/Acissej/mk/msvc7/liblibpsnpcclient.vcproj personal/Acissej/mk/msvc7/libpaws.vcproj personal/Acissej/mk/msvc7/libpsclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc7/libpsengine.vcproj personal/Acissej/mk/msvc7/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc7/libpsnet.vcproj personal/Acissej/mk/msvc7/libpsnpcclient_static_plugins.vcproj personal/Acissej/mk/msvc7/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc7/libpsserver_static_plugins.vcproj personal/Acissej/mk/msvc7/libpsserver_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc7/libpssound.vcproj personal/Acissej/mk/msvc7/libpsutil.vcproj personal/Acissej/mk/msvc7/libwordnet.vcproj personal/Acissej/mk/msvc7/libxdelta3.vcproj personal/Acissej/mk/msvc7/libxpnet.vcproj personal/Acissej/mk/msvc7/plgdbmysql.vcproj personal/Acissej/mk/msvc7/wkspsminimal.sln personal/Acissej/mk/msvc7/wkspsminimalstatic.sln personal/Acissej/mk/msvc7/wkspsstatic.sln personal/Acissej/mk/msvc7/wkspstypical.sln personal/Acissej/mk/msvc71/appccheck.vcproj personal/Acissej/mk/msvc71/appeedit.vcproj personal/Acissej/mk/msvc71/apppawseditor.vcproj personal/Acissej/mk/msvc71/apppsclient.vcproj personal/Acissej/mk/msvc71/apppsclient_static.vcproj personal/Acissej/mk/msvc71/apppslaunch.vcproj personal/Acissej/mk/msvc71/apppslaunch_static.vcproj personal/Acissej/mk/msvc71/apppsnpcclient.vcproj personal/Acissej/mk/msvc71/apppsnpcclient_static.vcproj personal/Acissej/mk/msvc71/apppsserver.vcproj personal/Acissej/mk/msvc71/apppsserver_static.vcproj personal/Acissej/mk/msvc71/grpall_psminimal.vcproj personal/Acissej/mk/msvc71/grpall_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpall_psstatic.vcproj personal/Acissej/mk/msvc71/grpall_pstypical.vcproj personal/Acissej/mk/msvc71/grpapps_psminimal.vcproj personal/Acissej/mk/msvc71/grpapps_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpapps_psstatic.vcproj personal/Acissej/mk/msvc71/grpapps_pstypical.vcproj personal/Acissej/mk/msvc71/grpclient_psminimal.vcproj personal/Acissej/mk/msvc71/grpclient_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpclient_psstatic.vcproj personal/Acissej/mk/msvc71/grpclient_pstypical.vcproj personal/Acissej/mk/msvc71/grpclient_static_psminimal.vcproj personal/Acissej/mk/msvc71/grpclient_static_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpclient_static_psstatic.vcproj personal/Acissej/mk/msvc71/grpclient_static_pstypical.vcproj personal/Acissej/mk/msvc71/grplibs_psminimal.vcproj personal/Acissej/mk/msvc71/grplibs_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grplibs_psstatic.vcproj personal/Acissej/mk/msvc71/grplibs_pstypical.vcproj personal/Acissej/mk/msvc71/grpplugins_psminimal.vcproj personal/Acissej/mk/msvc71/grpplugins_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpplugins_psstatic.vcproj personal/Acissej/mk/msvc71/grpplugins_pstypical.vcproj personal/Acissej/mk/msvc71/grpserver_psminimal.vcproj personal/Acissej/mk/msvc71/grpserver_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpserver_psstatic.vcproj personal/Acissej/mk/msvc71/grpserver_pstypical.vcproj personal/Acissej/mk/msvc71/grpserver_static_psminimal.vcproj personal/Acissej/mk/msvc71/grpserver_static_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grpserver_static_psstatic.vcproj personal/Acissej/mk/msvc71/grpserver_static_pstypical.vcproj personal/Acissej/mk/msvc71/grptools_psminimal.vcproj personal/Acissej/mk/msvc71/grptools_psminimalstatic.vcproj personal/Acissej/mk/msvc71/grptools_psstatic.vcproj personal/Acissej/mk/msvc71/grptools_pstypical.vcproj personal/Acissej/mk/msvc71/libbulkobjects.vcproj personal/Acissej/mk/msvc71/libdbmysqlstatic.vcproj personal/Acissej/mk/msvc71/libeffects.vcproj personal/Acissej/mk/msvc71/libfparser.vcproj personal/Acissej/mk/msvc71/libgui.vcproj personal/Acissej/mk/msvc71/liblibpsnpcclient.vcproj personal/Acissej/mk/msvc71/libpaws.vcproj personal/Acissej/mk/msvc71/libpsclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc71/libpsengine.vcproj personal/Acissej/mk/msvc71/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc71/libpsnet.vcproj personal/Acissej/mk/msvc71/libpsnpcclient_static_plugins.vcproj personal/Acissej/mk/msvc71/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc71/libpsserver_static_plugins.vcproj personal/Acissej/mk/msvc71/libpsserver_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc71/libpssound.vcproj personal/Acissej/mk/msvc71/libpsutil.vcproj personal/Acissej/mk/msvc71/libwordnet.vcproj personal/Acissej/mk/msvc71/libxdelta3.vcproj personal/Acissej/mk/msvc71/libxpnet.vcproj personal/Acissej/mk/msvc71/plgdbmysql.vcproj personal/Acissej/mk/msvc71/wkspsminimal.sln personal/Acissej/mk/msvc71/wkspsminimalstatic.sln personal/Acissej/mk/msvc71/wkspsstatic.sln personal/Acissej/mk/msvc71/wkspstypical.sln personal/Acissej/mk/msvc8/appccheck.vcproj personal/Acissej/mk/msvc8/appeedit.vcproj personal/Acissej/mk/msvc8/apppawseditor.vcproj personal/Acissej/mk/msvc8/apppsclient.vcproj personal/Acissej/mk/msvc8/apppsclient_static.vcproj personal/Acissej/mk/msvc8/apppslaunch.vcproj personal/Acissej/mk/msvc8/apppslaunch_static.vcproj personal/Acissej/mk/msvc8/apppsnpcclient.vcproj personal/Acissej/mk/msvc8/apppsnpcclient_static.vcproj personal/Acissej/mk/msvc8/apppsserver.vcproj personal/Acissej/mk/msvc8/apppsserver_static.vcproj personal/Acissej/mk/msvc8/grpall_psminimal.vcproj personal/Acissej/mk/msvc8/grpall_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpall_psstatic.vcproj personal/Acissej/mk/msvc8/grpall_pstypical.vcproj personal/Acissej/mk/msvc8/grpapps_psminimal.vcproj personal/Acissej/mk/msvc8/grpapps_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpapps_psstatic.vcproj personal/Acissej/mk/msvc8/grpapps_pstypical.vcproj personal/Acissej/mk/msvc8/grpclient_psminimal.vcproj personal/Acissej/mk/msvc8/grpclient_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpclient_psstatic.vcproj personal/Acissej/mk/msvc8/grpclient_pstypical.vcproj personal/Acissej/mk/msvc8/grpclient_static_psminimal.vcproj personal/Acissej/mk/msvc8/grpclient_static_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpclient_static_psstatic.vcproj personal/Acissej/mk/msvc8/grpclient_static_pstypical.vcproj personal/Acissej/mk/msvc8/grplibs_psminimal.vcproj personal/Acissej/mk/msvc8/grplibs_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grplibs_psstatic.vcproj personal/Acissej/mk/msvc8/grplibs_pstypical.vcproj personal/Acissej/mk/msvc8/grpplugins_psminimal.vcproj personal/Acissej/mk/msvc8/grpplugins_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpplugins_psstatic.vcproj personal/Acissej/mk/msvc8/grpplugins_pstypical.vcproj personal/Acissej/mk/msvc8/grpserver_psminimal.vcproj personal/Acissej/mk/msvc8/grpserver_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpserver_psstatic.vcproj personal/Acissej/mk/msvc8/grpserver_pstypical.vcproj personal/Acissej/mk/msvc8/grpserver_static_psminimal.vcproj personal/Acissej/mk/msvc8/grpserver_static_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grpserver_static_psstatic.vcproj personal/Acissej/mk/msvc8/grpserver_static_pstypical.vcproj personal/Acissej/mk/msvc8/grptools_psminimal.vcproj personal/Acissej/mk/msvc8/grptools_psminimalstatic.vcproj personal/Acissej/mk/msvc8/grptools_psstatic.vcproj personal/Acissej/mk/msvc8/grptools_pstypical.vcproj personal/Acissej/mk/msvc8/libbulkobjects.vcproj personal/Acissej/mk/msvc8/libdbmysqlstatic.vcproj personal/Acissej/mk/msvc8/libeffects.vcproj personal/Acissej/mk/msvc8/libfparser.vcproj personal/Acissej/mk/msvc8/libgui.vcproj personal/Acissej/mk/msvc8/liblibpsnpcclient.vcproj personal/Acissej/mk/msvc8/libpaws.vcproj personal/Acissej/mk/msvc8/libpsclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc8/libpsengine.vcproj personal/Acissej/mk/msvc8/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc8/libpsnet.vcproj personal/Acissej/mk/msvc8/libpsnpcclient_static_plugins.vcproj personal/Acissej/mk/msvc8/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc8/libpsserver_static_plugins.vcproj personal/Acissej/mk/msvc8/libpsserver_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc8/libpssound.vcproj personal/Acissej/mk/msvc8/libpsutil.vcproj personal/Acissej/mk/msvc8/libwordnet.vcproj personal/Acissej/mk/msvc8/libxdelta3.vcproj personal/Acissej/mk/msvc8/libxpnet.vcproj personal/Acissej/mk/msvc8/plgdbmysql.vcproj personal/Acissej/mk/msvc8/wkspsminimal.sln personal/Acissej/mk/msvc8/wkspsminimalstatic.sln personal/Acissej/mk/msvc8/wkspsstatic.sln personal/Acissej/mk/msvc8/wkspstypical.sln personal/Acissej/mk/msvc9/appccheck.vcproj personal/Acissej/mk/msvc9/appeedit.vcproj personal/Acissej/mk/msvc9/apppawseditor.vcproj personal/Acissej/mk/msvc9/apppsclient.vcproj personal/Acissej/mk/msvc9/apppsclient_static.vcproj personal/Acissej/mk/msvc9/apppslaunch.vcproj personal/Acissej/mk/msvc9/apppslaunch_static.vcproj personal/Acissej/mk/msvc9/apppsnpcclient.vcproj personal/Acissej/mk/msvc9/apppsnpcclient_static.vcproj personal/Acissej/mk/msvc9/apppsserver.vcproj personal/Acissej/mk/msvc9/apppsserver_static.vcproj personal/Acissej/mk/msvc9/grpall_psminimal.vcproj personal/Acissej/mk/msvc9/grpall_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpall_psstatic.vcproj personal/Acissej/mk/msvc9/grpall_pstypical.vcproj personal/Acissej/mk/msvc9/grpapps_psminimal.vcproj personal/Acissej/mk/msvc9/grpapps_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpapps_psstatic.vcproj personal/Acissej/mk/msvc9/grpapps_pstypical.vcproj personal/Acissej/mk/msvc9/grpclient_psminimal.vcproj personal/Acissej/mk/msvc9/grpclient_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpclient_psstatic.vcproj personal/Acissej/mk/msvc9/grpclient_pstypical.vcproj personal/Acissej/mk/msvc9/grpclient_static_psminimal.vcproj personal/Acissej/mk/msvc9/grpclient_static_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpclient_static_psstatic.vcproj personal/Acissej/mk/msvc9/grpclient_static_pstypical.vcproj personal/Acissej/mk/msvc9/grplibs_psminimal.vcproj personal/Acissej/mk/msvc9/grplibs_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grplibs_psstatic.vcproj personal/Acissej/mk/msvc9/grplibs_pstypical.vcproj personal/Acissej/mk/msvc9/grpplugins_psminimal.vcproj personal/Acissej/mk/msvc9/grpplugins_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpplugins_psstatic.vcproj personal/Acissej/mk/msvc9/grpplugins_pstypical.vcproj personal/Acissej/mk/msvc9/grpserver_psminimal.vcproj personal/Acissej/mk/msvc9/grpserver_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpserver_psstatic.vcproj personal/Acissej/mk/msvc9/grpserver_pstypical.vcproj personal/Acissej/mk/msvc9/grpserver_static_psminimal.vcproj personal/Acissej/mk/msvc9/grpserver_static_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grpserver_static_psstatic.vcproj personal/Acissej/mk/msvc9/grpserver_static_pstypical.vcproj personal/Acissej/mk/msvc9/grptools_psminimal.vcproj personal/Acissej/mk/msvc9/grptools_psminimalstatic.vcproj personal/Acissej/mk/msvc9/grptools_psstatic.vcproj personal/Acissej/mk/msvc9/grptools_pstypical.vcproj personal/Acissej/mk/msvc9/libbulkobjects.vcproj personal/Acissej/mk/msvc9/libdbmysqlstatic.vcproj personal/Acissej/mk/msvc9/libeffects.vcproj personal/Acissej/mk/msvc9/libfparser.vcproj personal/Acissej/mk/msvc9/libgui.vcproj personal/Acissej/mk/msvc9/liblibpsnpcclient.vcproj personal/Acissej/mk/msvc9/libpaws.vcproj personal/Acissej/mk/msvc9/libpsclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc9/libpsengine.vcproj personal/Acissej/mk/msvc9/libpslaunch_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc9/libpsnet.vcproj personal/Acissej/mk/msvc9/libpsnpcclient_static_plugins.vcproj personal/Acissej/mk/msvc9/libpsnpcclient_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc9/libpsserver_static_plugins.vcproj personal/Acissej/mk/msvc9/libpsserver_static_plugins_CRYSTAL.vcproj personal/Acissej/mk/msvc9/libpssound.vcproj personal/Acissej/mk/msvc9/libpsutil.vcproj personal/Acissej/mk/msvc9/libwordnet.vcproj personal/Acissej/mk/msvc9/libxdelta3.vcproj personal/Acissej/mk/msvc9/libxpnet.vcproj personal/Acissej/mk/msvc9/plgdbmysql.vcproj personal/Acissej/mk/msvc9/wkspsminimal.sln personal/Acissej/mk/msvc9/wkspsminimalstatic.sln personal/Acissej/mk/msvc9/wkspsstatic.sln personal/Acissej/mk/msvc9/wkspstypical.sln personal/Acissej/mk/msvcgen/custom2.cslib personal/Acissej/psclient.cfg personal/Acissej/pslaunch.cfg personal/Acissej/src/client/actionhandler.cpp personal/Acissej/src/client/authentclient.cpp personal/Acissej/src/client/charapp.cpp personal/Acissej/src/client/chatbubbles.h personal/Acissej/src/client/clientvitals.cpp personal/Acissej/src/client/cmdadmin.cpp personal/Acissej/src/client/cmdadmin.h personal/Acissej/src/client/cmdgroups.cpp personal/Acissej/src/client/cmdgroups.h personal/Acissej/src/client/cmdguilds.cpp personal/Acissej/src/client/cmdguilds.h personal/Acissej/src/client/cmdusers.cpp personal/Acissej/src/client/cmdusers.h personal/Acissej/src/client/cmdutil.cpp personal/Acissej/src/client/cmdutil.h personal/Acissej/src/client/gui/chatwindow.cpp personal/Acissej/src/client/gui/chatwindow.h personal/Acissej/src/client/gui/inventorywindow.cpp personal/Acissej/src/client/gui/inventorywindow.h personal/Acissej/src/client/gui/pawsactionlocationwindow.cpp personal/Acissej/src/client/gui/pawsactivemagicwindow.cpp personal/Acissej/src/client/gui/pawsbankwindow.cpp personal/Acissej/src/client/gui/pawsbookreadingwindow.cpp personal/Acissej/src/client/gui/pawsbuddy.cpp personal/Acissej/src/client/gui/pawscharcreatemain.cpp personal/Acissej/src/client/gui/pawschardescription.cpp personal/Acissej/src/client/gui/pawscharpick.cpp personal/Acissej/src/client/gui/pawscharpick.h personal/Acissej/src/client/gui/pawsconfigchattabs.cpp personal/Acissej/src/client/gui/pawsconfigchattabs.h personal/Acissej/src/client/gui/pawscontainerdescwindow.cpp personal/Acissej/src/client/gui/pawscontrolwindow.cpp personal/Acissej/src/client/gui/pawscraft.cpp personal/Acissej/src/client/gui/pawsdetailwindow.cpp personal/Acissej/src/client/gui/pawsexchangewindow.cpp personal/Acissej/src/client/gui/pawsgameboard.cpp personal/Acissej/src/client/gui/pawsglyphwindow.cpp personal/Acissej/src/client/gui/pawsgmaction.cpp personal/Acissej/src/client/gui/pawsgmgui.cpp personal/Acissej/src/client/gui/pawsgmspawn.cpp personal/Acissej/src/client/gui/pawsgroupwindow.cpp personal/Acissej/src/client/gui/pawsguildwindow.cpp personal/Acissej/src/client/gui/pawsilluminationwindow.cpp personal/Acissej/src/client/gui/pawsinfowindow.cpp personal/Acissej/src/client/gui/pawsinfowindow.h personal/Acissej/src/client/gui/pawsinteractwindow.cpp personal/Acissej/src/client/gui/pawsinventorydollview.cpp personal/Acissej/src/client/gui/pawsitemdescriptionwindow.cpp personal/Acissej/src/client/gui/pawsloading.cpp personal/Acissej/src/client/gui/pawsloginwindow.cpp personal/Acissej/src/client/gui/pawslootwindow.cpp personal/Acissej/src/client/gui/pawsmerchantwindow.cpp personal/Acissej/src/client/gui/pawsnpcdialog.cpp personal/Acissej/src/client/gui/pawspetitiongmwindow.cpp personal/Acissej/src/client/gui/pawspetitionwindow.cpp personal/Acissej/src/client/gui/pawspetstatwindow.cpp personal/Acissej/src/client/gui/pawsquestrewardwindow.cpp personal/Acissej/src/client/gui/pawsquestwindow.cpp personal/Acissej/src/client/gui/pawsskillwindow.cpp personal/Acissej/src/client/gui/pawsslot.cpp personal/Acissej/src/client/gui/pawssmallinventory.cpp personal/Acissej/src/client/gui/pawsspellbookwindow.cpp personal/Acissej/src/client/gui/pawsspellcancelwindow.cpp personal/Acissej/src/client/gui/pawstutorialwindow.cpp personal/Acissej/src/client/gui/pawswritingwindow.cpp personal/Acissej/src/client/gui/psmainwidget.h personal/Acissej/src/client/guihandler.cpp personal/Acissej/src/client/modehandler.cpp personal/Acissej/src/client/pscamera.cpp personal/Acissej/src/client/pscelclient.cpp personal/Acissej/src/client/pscharcontrol.cpp personal/Acissej/src/client/psclientchar.cpp personal/Acissej/src/client/psclientdr.cpp personal/Acissej/src/client/psengine.cpp personal/Acissej/src/client/psengine.h personal/Acissej/src/client/psinventorycache.h personal/Acissej/src/client/psmovement.cpp personal/Acissej/src/client/psnetmanager.cpp personal/Acissej/src/client/psnetmanager.h personal/Acissej/src/client/questionclient.cpp personal/Acissej/src/client/sound/pssoundmngr.cpp personal/Acissej/src/client/zonehandler.cpp personal/Acissej/src/common/effects/pseffectmanager.cpp personal/Acissej/src/common/effects/pseffectmanager.h personal/Acissej/src/common/engine/loader.cpp personal/Acissej/src/common/engine/loader.h personal/Acissej/src/common/engine/psregion.cpp personal/Acissej/src/common/engine/psregion.h personal/Acissej/src/common/net/clientmsghandler.cpp personal/Acissej/src/common/net/clientmsghandler.h personal/Acissej/src/common/net/cmdbase.cpp personal/Acissej/src/common/net/cmdbase.h personal/Acissej/src/common/net/cmdhandler.cpp personal/Acissej/src/common/net/connection.h personal/Acissej/src/common/net/message.h personal/Acissej/src/common/net/messages.cpp personal/Acissej/src/common/net/messages.h personal/Acissej/src/common/net/msghandler.cpp personal/Acissej/src/common/net/msghandler.h personal/Acissej/src/common/net/netbase.cpp personal/Acissej/src/common/net/netpacket.h personal/Acissej/src/common/net/npcmessages.cpp personal/Acissej/src/common/net/subscriber.h personal/Acissej/src/common/paws/pawslistbox.cpp personal/Acissej/src/common/paws/pawsmainwidget.h personal/Acissej/src/common/paws/pawsmanager.cpp personal/Acissej/src/common/paws/pawsmanager.h personal/Acissej/src/common/paws/pawsobjectview.cpp personal/Acissej/src/common/paws/pawsobjectview.h personal/Acissej/src/common/paws/pawstabwindow.cpp personal/Acissej/src/common/paws/pawstabwindow.h personal/Acissej/src/common/paws/pawstextbox.cpp personal/Acissej/src/common/paws/pawswidget.cpp personal/Acissej/src/common/rpgrules/Jamfile personal/Acissej/src/common/rpgrules/psmoney.cpp personal/Acissej/src/common/rpgrules/psmoney.h personal/Acissej/src/common/util/eventmanager.cpp personal/Acissej/src/common/util/eventmanager.h personal/Acissej/src/common/util/mathscript.cpp personal/Acissej/src/common/util/mathscript.h personal/Acissej/src/common/util/mathscript_unittest.cpp personal/Acissej/src/common/util/pspath.h personal/Acissej/src/npcclient/command.cpp personal/Acissej/src/npcclient/networkmgr.cpp personal/Acissej/src/npcclient/npc.cpp personal/Acissej/src/npcclient/npcbehave.cpp personal/Acissej/src/npcclient/npcclient.cpp personal/Acissej/src/npcclient/perceptions.cpp personal/Acissej/src/pslaunch/download.cpp personal/Acissej/src/pslaunch/pawslauncherwindow.cpp personal/Acissej/src/pslaunch/pslaunch.cpp personal/Acissej/src/pslaunch/updater.cpp personal/Acissej/src/pslaunch/updaterconfig.cpp personal/Acissej/src/pslaunch/updaterconfig.h personal/Acissej/src/pslaunch/updaterengine.cpp personal/Acissej/src/pslaunch/updaterengine.h personal/Acissej/src/server/Jamfile personal/Acissej/src/server/actionmanager.h personal/Acissej/src/server/adminmanager.cpp personal/Acissej/src/server/adminmanager.h personal/Acissej/src/server/bulkobjects/activespell.h personal/Acissej/src/server/bulkobjects/dictionary.cpp personal/Acissej/src/server/bulkobjects/pscharacter.cpp personal/Acissej/src/server/bulkobjects/pscharacter.h personal/Acissej/src/server/bulkobjects/pscharacterloader.cpp personal/Acissej/src/server/bulkobjects/pscharinventory.cpp personal/Acissej/src/server/bulkobjects/pscharinventory.h personal/Acissej/src/server/bulkobjects/psitem.cpp personal/Acissej/src/server/bulkobjects/psquest.cpp personal/Acissej/src/server/bulkobjects/psquestprereqops.cpp personal/Acissej/src/server/bulkobjects/psquestprereqops.h personal/Acissej/src/server/cachemanager.cpp personal/Acissej/src/server/cachemanager.h personal/Acissej/src/server/chatmanager.cpp personal/Acissej/src/server/client.cpp personal/Acissej/src/server/client.h personal/Acissej/src/server/creationmanager.cpp personal/Acissej/src/server/database/mysql/characters.sql personal/Acissej/src/server/database/mysql/command_access.sql personal/Acissej/src/server/database/mysql/commonstrings.sql personal/Acissej/src/server/database/mysql/create_indexes.sql personal/Acissej/src/server/database/mysql/math_scripts.sql personal/Acissej/src/server/database/mysql/race_spawns.sql personal/Acissej/src/server/database/mysql/trade_processes.sql personal/Acissej/src/server/database/mysql/upgrade_schema.sql personal/Acissej/src/server/entitymanager.cpp personal/Acissej/src/server/entitymanager.h personal/Acissej/src/server/exchangemanager.cpp personal/Acissej/src/server/gem.cpp personal/Acissej/src/server/gem.h personal/Acissej/src/server/msgmanager.cpp personal/Acissej/src/server/msgmanager.h personal/Acissej/src/server/netmanager.cpp personal/Acissej/src/server/psserver.cpp personal/Acissej/src/server/psserver.h personal/Acissej/src/server/psserverdr.cpp personal/Acissej/src/server/questmanager.cpp personal/Acissej/src/server/scripting.cpp personal/Acissej/src/server/slotmanager.cpp personal/Acissej/src/server/usermanager.cpp personal/Acissej/src/server/usermanager.h personal/Acissej/src/server/workmanager.cpp personal/Acissej/src/server/workmanager.h personal/Acissej/src/tools/ccheck/Jamfile personal/Acissej/src/tools/fparser/fparser.cpp personal/Acissej/src/tools/fparser/fparser.h personal/Acissej/src/tools/fparser/fparser.txt personal/Acissej/src/tools/fparser/fpconfig.h personal/Acissej/src/tools/fparser/fpoptimizer.cpp personal/Acissej/src/tools/fparser/fptypes.h personal/Acissej/src/tools/xdelta3/xdelta3-decode.h personal/Acissej/src/tools/xdelta3/xdelta3-hash.h personal/Acissej/src/tools/xdelta3/xdelta3-list.h personal/Acissej/src/tools/xdelta3/xdelta3.c personal/Acissej/src/tools/xdelta3/xdelta3.h Added Paths: ----------- personal/Acissej/data/renderlayers/lighting_simple.xml personal/Acissej/data/shader/lighting/lighting_simple.xml personal/Acissej/data/tests/ personal/Acissej/data/tests/rpgrules.xml personal/Acissej/mk/msvc/apptestrpgrules.manifest personal/Acissej/mk/msvc/apptestrpgrules.rc personal/Acissej/mk/msvc7/apptestrpgrules.vcproj personal/Acissej/mk/msvc7/libpsrpgrules.vcproj personal/Acissej/mk/msvc71/apptestrpgrules.vcproj personal/Acissej/mk/msvc71/libpsrpgrules.vcproj personal/Acissej/mk/msvc8/apptestrpgrules.vcproj personal/Acissej/mk/msvc8/libpsrpgrules.vcproj personal/Acissej/mk/msvc9/apptestrpgrules.vcproj personal/Acissej/mk/msvc9/libpsrpgrules.vcproj personal/Acissej/src/common/rpgrules/test/ personal/Acissej/src/common/rpgrules/test/Jamfile personal/Acissej/src/common/rpgrules/test/testrpgrules.cpp personal/Acissej/src/common/rpgrules/test/testrpgrules.h personal/Acissej/src/tools/fparser/fparser.html personal/Acissej/src/tools/fparser/style.css Removed Paths: ------------- personal/Acissej/data/tests/rpgrules.xml personal/Acissej/mk/msvc7/libpsrpgrules.vcproj personal/Acissej/mk/msvc71/libpsrpgrules.vcproj personal/Acissej/mk/msvc8/libpsrpgrules.vcproj personal/Acissej/mk/msvc9/libpsrpgrules.vcproj personal/Acissej/src/common/rpgrules/test/Jamfile personal/Acissej/src/common/rpgrules/test/testrpgrules.cpp personal/Acissej/src/common/rpgrules/test/testrpgrules.h Property Changed: ---------------- personal/Acissej/ personal/Acissej/data/renderlayers/ personal/Acissej/data/shader/ personal/Acissej/lang/1337/ personal/Acissej/lang/french/ personal/Acissej/lang/italian/ personal/Acissej/src/tools/ccheck/ Property changes on: personal/Acissej ___________________________________________________________________ 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:2962-3420 + /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:2962-3614 Modified: personal/Acissej/Jamfile.in =================================================================== --- personal/Acissej/Jamfile.in 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/Jamfile.in 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/ProgressionSchema.rng =================================================================== --- personal/Acissej/data/ProgressionSchema.rng 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/ProgressionSchema.rng 2009-05-04 09:54:29 UTC (rev 3616) @@ -319,7 +319,7 @@ <choice> <attribute name="location"/> <group> - <attribute name="map"/> + <attribute name="sector"/> <optional> <attribute name="x"/> <attribute name="y"/> Modified: personal/Acissej/data/effects/misc/admin_location.eff =================================================================== --- personal/Acissej/data/effects/misc/admin_location.eff 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/effects/misc/admin_location.eff 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/effects/misc/admin_path_point.eff =================================================================== --- personal/Acissej/data/effects/misc/admin_path_point.eff 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/effects/misc/admin_path_point.eff 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/effects/misc/admin_waypoint.eff =================================================================== --- personal/Acissej/data/effects/misc/admin_waypoint.eff 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/effects/misc/admin_waypoint.eff 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/effects/misc/shadow.eff =================================================================== --- personal/Acissej/data/effects/misc/shadow.eff 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/effects/misc/shadow.eff 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/gui/chat.xml =================================================================== --- personal/Acissej/data/gui/chat.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/gui/chat.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/gui/pslaunch.xml =================================================================== --- personal/Acissej/data/gui/pslaunch.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/gui/pslaunch.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -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/Acissej/data/options/chat_def.xml =================================================================== --- personal/Acissej/data/options/chat_def.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/options/chat_def.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -6,36 +6,6 @@ <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" /> Modified: personal/Acissej/data/races/quickpaths.xml =================================================================== --- personal/Acissej/data/races/quickpaths.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/races/quickpaths.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -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" /> Property changes on: personal/Acissej/data/renderlayers ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/data/renderlayers:2-2715,2962-3420 + /trunk/data/renderlayers:2-2715,2962-3614 Modified: personal/Acissej/data/renderlayers/lighting_basic.xml =================================================================== --- personal/Acissej/data/renderlayers/lighting_basic.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/renderlayers/lighting_basic.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -1,6 +1,6 @@ <layerconfig> <layer> - <defaultshader name="fullbright" file="/shader/lighting/lighting_basic.xml" /> + <defaultshader name="lighting_basic" file="/shader/lighting/lighting_basic.xml" /> <!-- Draw layer, even if no lights are present --> <ambient /> <staticlights> Copied: personal/Acissej/data/renderlayers/lighting_simple.xml (from rev 3607, trunk/data/renderlayers/lighting_simple.xml) =================================================================== --- personal/Acissej/data/renderlayers/lighting_simple.xml (rev 0) +++ personal/Acissej/data/renderlayers/lighting_simple.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -0,0 +1,39 @@ +<layerconfig> + <layer> + <defaultshader name="z_only" file="/shader/early_z/z_only.xml" /> + <ambient /> + <shadertype>depthwrite</shadertype> + </layer> + <layer> + <defaultshader name="lighting_simple" file="/shader/lighting/lighting_simple.xml" /> + <!-- Tells the shader ambient should be taken into account - + this should only happen on the first pass --> + <shadervar name="pass do_ambient" type="integer">1</shadervar> + <!-- Draw layer, even if no lights are present --> + <ambient /> + <!-- Options to control lighting for static lights --> + <staticlights> + <!-- Don't draw static lights for meshes which have the + CS_ENTITY_STATICLIGHT flag set --> + <nodraw /> + <!-- We could use <specularonly/> to only get specular + lighting from static lights, but lighter2 can provide + data for that, too --> + </staticlights> + <maxlightpasses>1</maxlightpasses> + <shadertype>base</shadertype> + <shadertype>ambient</shadertype> + <shadertype>standard</shadertype> + </layer> + <layer> + <shadervar name="pass do_ambient" type="integer">1</shadervar> + <ambient /> + <staticlights> + <nodraw /> + </staticlights> + <maxlightpasses>1</maxlightpasses> + <shadertype>splatting ambient</shadertype> + <shadertype>terrain splat</shadertype> + </layer> +</layerconfig> + Property changes on: personal/Acissej/data/shader ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/data/shader:2-2715,2962-3420 + /trunk/data/shader:2-2715,2962-3614 Modified: personal/Acissej/data/shader/lighting/lighting_basic.xml =================================================================== --- personal/Acissej/data/shader/lighting/lighting_basic.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/shader/lighting/lighting_basic.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -13,4 +13,5 @@ <connection from="apply_mixmode_alpha" to="sectorfog" /> </pass> </technique> + <fallbackshader name="lighting_vproc_fixed" file="/shader/lighting/vproc_fixed.xml" /> </shader> Modified: personal/Acissej/data/shader/lighting/lighting_character.xml =================================================================== --- personal/Acissej/data/shader/lighting/lighting_character.xml 2009-05-04 09:21:30 UTC (rev 3615) +++ personal/Acissej/data/shader/lighting/lighting_character.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -211,5 +211,5 @@ </technique> <?endif?> - <fallbackshader name="lighting_basic" file="/shader/lighting/lighting_basic.xml" /> + <fallbackshader name="lighting_static" file="/shader/lighting/lighting_simple.xml" /> </shader> Copied: personal/Acissej/data/shader/lighting/lighting_simple.xml (from rev 3607, trunk/data/shader/lighting/lighting_simple.xml) =================================================================== --- personal/Acissej/data/shader/lighting/lighting_simple.xml (rev 0) +++ personal/Acissej/data/shader/lighting/lighting_simple.xml 2009-05-04 09:54:29 UTC (rev 3616) @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + Copyright (C) 2007-2008 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_simple" lights="3"> + <alias name="ambient" file="/shader/snippets/lighting/ambient-static.xml" /> + <alias name="parallax" file="/shader/snippets/surface/parallax-none.xml" /> + <alias name="normalmap" file="/shader/snippets/surface/normalmap-none.xml" /> + <alias name="specular" file="/shader/snippets/surface/specular-none.xml" /> + <alias name="staticspecular" file="/shader/snippets/lighting/staticspec-null.xml" /> + <alias name="apply_alpha" file="/shader/snippets/surface/alpha-premult.xml" /> + <alias name="lighting" file="/shader/snippets/lighting/lighting-pvl.xml" /> + <alias name="surface" file="/shader/snippets/surface/surface-modulate.xml" /> + + <technique priority="300" minlights="3"> + <!-- 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"> + <!-- 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"> + <!-- 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> + ... [truncated message content] |