# HG changeset patch # User mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 # Date 1215958524 0 # Node ID 191654cf9855ac76da0d54a09f1461a2010a8831 # Parent 9d0a21184c13e3f3137cd7c2b5009016fde83036 * Fixed code::blocks unittest support; thanks to alexv for reporting * Updated AUTHORS * Removed old READMEs * Work in progress README for the upcoming release * Code::Blocks support on win32 currently broken, further investigation needed diff -r 9d0a21184c13 -r 191654cf9855 build/win32/build_environments/code_blocks/core_tests++.cbp --- a/build/win32/build_environments/code_blocks/core_tests++.cbp Sun Jul 13 13:14:04 2008 +0000 +++ b/build/win32/build_environments/code_blocks/core_tests++.cbp Sun Jul 13 14:15:24 2008 +0000 @@ -71,13 +71,13 @@ - - - - - - - + + + + + + + diff -r 9d0a21184c13 -r 191654cf9855 doc/AUTHORS --- a/doc/AUTHORS Sun Jul 13 13:14:04 2008 +0000 +++ b/doc/AUTHORS Sun Jul 13 14:15:24 2008 +0000 @@ -30,6 +30,7 @@ sja >> sja@mail.org skybound >> under.northern.sky@googlemail.com sleek >> dean98@gmail.com +spq >> spq@my-ct.de stro >> stroantree@gmail.com tesseract >> josh_root@users.sourceforge.net trapdoor >> ko2fan@gmail.com @@ -40,4 +41,3 @@ vtchill >> manning.jesse@gmail.com zahlman >> karl.knechtel@utoronto.ca zbyte64 >> zbyte64@gmail.com -spq >> spq@my-ct.de diff -r 9d0a21184c13 -r 191654cf9855 doc/README --- a/doc/README Sun Jul 13 13:14:04 2008 +0000 +++ b/doc/README Sun Jul 13 14:15:24 2008 +0000 @@ -1,57 +1,33 @@ == Introduction == -Welcome to the FIFE 2008.0 README. This snapshot is based on SVN revision 2109. +Welcome to the FIFE 2008.1 README. This snapshot is based on SVN revision !FIXME. == Theme of this release == -For the 2008.0 release we decided to pick up the island_demo concept again. Right: again. We already used this concept for the 2007.1 release but we put it on ice as we worked together with the Zero-Projekt developers on a different example game for the 2007.2 release. The cooperation didn't work out as planned for either side and so both teams stick to their own projects again now. +For the 2008.1 release we decided to flesh out the tropical island concept and called our example game "Rio de hola". -After the cooperation has ended we considered all possible options and finally decided to flesh out the old island_demo concept and base our future example game upon it. Although we were able to finish the initial planning work for the new island_demo game some days ago, there is almost none of the new planned content in place yet. On the other side the engine itself and the editor tool that ships with it now made _huge_ steps forward since the last release about 4 months ago. Therefore we decided to release the current status as stable release although it offers not many new aspects on the content side and the content that is in place is very likely to change with the 2008.1 release. +Caution: this release is still lacking a lot of polish, especially the "Rio de hola" game that ships with it. It lacks almost any form of gameplay but there is a reason why we decided to ship the release in its current form nevertheless. We planned to ship future FIFE releases under the LGPL to offer a less "restrictive" license to possible FIFE users (we know that the term "restrictive" is just our personal point of view). -The milestone itself seems to be a very important step into the right direction. You can build your own maps now with the help of the editor tool. Furthermore a basic application structure is in place that should give you an idea how can create your own FIFE-based game. We'll surely adjust the structure of the island_demo client over the next months but this release is stable enough to start working on your game now. +We had to clear up the legal situation first and fortunately the software freedom law center (http://www.softwarefreedom.org/) helped us with the transition. The agreement of all developers who contributed code that was still used in FIFE was needed and because over two dozens of people contributed code to the project, this took us a lot of time. We were not able to reach all of them so we decided to remove the code of the contributors who didn't reply to our license switch proposal mails. -This release is surely not the beginning of the end of the road for us, but it's the end of beginning for the FIFE development team. Enjoy it as we do :-) +We were able to replace the last problematic code today so now FIFE is official LGPL'ed software. We're glad that we were able to make this step after it took us so long and we think that the new license alone is worth a release. Therefore we're proud to finally present the first FIFE release that is published under LGPL 2.1 or newer (your choice). -== Important changes since the 2007.2 release == -* New audio module with support for some more advanced audio features. -* Optimized view code to improve the performance and resolve map instance z-order issues. -* Switched back to island_demo concept; this will be the example game that ships with future FIFE releases as well. -* Ability to save maps -* Routing pathfinding (previous release only had linear pather) -* Pluggable rendering system. Several new plugins including: -** Floating text renderer for map instances. -** Blocking info renderer to show instance blocking info -** Cell selection renderer for selection highlighting -** Coordinate renderer for cellgrids -** Quadtree renderer to show quadtree debug information -* New editor tool, which can be used to layout maps -* XML-format improvements: stack position, z-position, camera definitions, animation x/y offsets -* Vastly improved pychan extension; XML based GUI definitions -* Quadtree adjustments -* Ability to define own settings formats and interpret them from scripts -* Ability to attach cameras to instances (so that they are tracked while they move) -* Separate x/y scaling for cellgrids, allows more flexible geometry definitions (e.g. rectangle) -* Basic mouse map instance picking. -* Editor tool (still work in progress). -* Improved engine-script exception reporting -* Mouse cursors can be changed from scripts +Engine and the editor tool made _huge_ steps forward since the last release about 5 months ago. Therefore we decided to release the current status as stable release although it offers not many new aspects on the content side and the content that is in place is very likely to change with the 2008.2 release. + +The milestone itself seems to be a very important step into the right direction. You can build your own maps now with the help of the editor tool. Furthermore a basic application structure is in place that should give you an idea how can create your own FIFE-based game; this release is stable enough to start working on your game now :-) -Few non-code related changes -* Rough task list for the whole island demo has now been created: -** https://mirror1.cvsdude.com/trac/fife/engine/report/3 -* Vastly improved documentation with nightly updates: -** Core: http://fifedocs.boxbox.org//doxygen/ -** Scripts: http://fifedocs.boxbox.org//epydoc/ -* Lots of new content gathered and created for island demo -** E.g. agent definitions, clouds graphics, music... +== Important changes since the 2008.0 release == + +=== Non-code related changes === +* Switch from GPL to LGPL == Features == * A complete list of the features that FIFE offers can be found at the project wiki: http://wiki.fifengine.de/index.php?title=Engine_features == License == -The source code (*.cpp, *.h & *.py) is licensed under GPL 2.0 or newer: +The source code (*.cpp, *.h & *.py) is licensed under LGPL 2.1 or newer: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -The island_demo content was taken from a lot a lot of different 3rd party sources. Therefore each content directory comes with a separate LICENSE file that states the origin of the content, the author and the actual license it was published under. +Content was taken from a lot a lot of different 3rd party sources. Therefore each client directory comes with a separate LICENSE file that states the origin of the content, the author and the actual license it was published under. == Building FIFE == === Dependencies === @@ -60,10 +36,10 @@ === General notes === FIFE utilizes the SCons (http://www.scons.org) build system. Here is a quick list of scons commands that can be important for building FIFE on your platform: -* 'scons ext=1' will build the FIFE dependencies Guichan (http://guichan.sourceforge.net/) and minizip (http://www.winimage.com/zLibDll/minizip.html) from bundled source. Use this if you do not have these libraries, or have the wrong version. +* 'scons ext=1' will build specific FIFE dependencies that usually don't reside in the most important Linux package managers from source. * 'scons -h' will list additional compile options. * 'scons' will build FIFE. -* 'scons tests=1' will build FIFE and the boost unit tests (needed for test_fife.py). +* 'scons tests=1' will build FIFE and the unittests (needed for test_fife.py). * 'scons -c' clears any compiled objects (= scons equivalent of 'make clean'). Platform specific details how to build FIFE can be found down below. @@ -113,4 +89,4 @@ http://www.fifengine.de/ -2008/02/03 +2008/07/13 diff -r 9d0a21184c13 -r 191654cf9855 doc/README_2007.1_ENGLISH --- a/doc/README_2007.1_ENGLISH Sun Jul 13 13:14:04 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,113 +0,0 @@ -========================== -FIFE 2007.1 (official final release based on FIFE engine SVN rev. 1004 & content SVN rev. 162) -========================== - -Intention of this release: -========================== -Here it is: the final version of our 2007.1 milestone. This is quite an important release to us because our own map format is now in place and has been used for our own first rather huge demo map. Welcome to FIFE Island :-) - -The graphics that have been used for this demo map HAVEN'T BEEN CREATED BY US! They have been created by Reiner Prokein. You can get his graphics for free at his site "Reiner's tilesets": -http://reinerstileset.4players.de/ - - -Bug / issue reporting: -========================== -You can post problems in the help section of our forums, on the project mailing list or report them directly in our irc channel. - -IRC Channel: -http://wiki.fifengine.de/index.php?title=IRC - -Mailing list: -http://wiki.fifengine.de/index.php?title=Mailing_list - -Forums: -http://www.fifengine.de/module-pnForum-viewforum-forum-7.phtml - -Thanks for your support. - -Important changes since 2007.0 -========================== -* Stable custom XML map format for FIFE including our demo map to show the new features and syntax of it :-) -* FPS limiter (can be set in fife.config) to save important CPU time for future tasks (AI, pathfinding, etc.) -* Tile and object coordinates can be displayed (press "c") -* Color key overriding for Fallout transparency effects (see content/gfx/fallout_overrides.xml) -* Fixed DAT1 decoding code (bug was introduced with the DAT1 rewrite) -* Major map model classes have been exported to Lua and are now accessable via the console -* Map size dependant, configurable geometries -* Colorkeying for the SDL renderer -* Add custom VFS sources via vfs.addSource (see content/etc/vfs_sources.txt) -* Increased startup speed with FO2 DAT files -* Enhanced camera with support for multiple viewports (see content/scripts/demos/map_control.lua) -* Built against SDL_image 1.2.5 and guichan 0.61 now (Win32 binaries) -========================== - -For a complete changelog visit: -https://mirror1.cvsdude.com/trac/fife/engine/timeline - -For all closed tickets since 2007.0 see: -http://mirror1.cvsdude.com/trac/fife/engine/query?status=closed&milestone=2007.1 - -What works: -========================== -Have a look here: -http://wiki.fifengine.de/index.php?title=Engine_features - -What does not work: -========================== -* A lot, basically everything that is not listed at the wiki page that is linked above. - -Custom settings -=========================== -* FIFE uses a file called "fife.config" to give the user control about some engine aspects -* The file should be self-explanatory - -Working with Fallout 1 maps: -========================== -In Windows: -* Copy the "master.dat" & "critter.dat" from your Fallout 1 install to your FIFE install directory -* Edit the FIFE.bat to launch FIFE via: guimap_test.exe content/scripts/demos/load_fo1_maps.lua - -In Linux: -* Copy (or link) the "master.dat" & "critter.dat" from your Fallout 1 install to the directory containing guimap_test -* Launch FIFE via ./guimap_test content/scripts/demos/load_fo1_maps.lua - -Working with Fallout 2 maps: -========================== -In Windows: -* Copy the "master.dat" & "critter.dat" from your Fallout 2 install to your FIFE install directory -* Edit the FIFE.bat to launch FIFE via: guimap_test.exe content/scripts/demos/load_fo2_maps.lua - -In Linux: -* Copy (or link) the "master.dat" & "critter.dat" from your Fallout 2 install to the directory containing guimap_test -* Launch FIFE via ./guimap_test content/scripts/demos/load_fo2_maps.lua - -Working with custom (XML) maps: -========================== -FIFE supports a stable own map format now so you can test the engine without having one of the Fallout games installed. You can add custom XML or Fallout maps to the list by editing /FIFE_dir/content/etc/maps_custom_players.txt (maps_custom_developers.txt if you start FIFE the developer lua script). - -In Windows: -* Edit the FIFE.bat to launch FIFE via: guimap_test.exe content/scripts/demos/load_custom_maps_players.lua - -In Linux: -* Launch FIFE via ./guimap_test content/scripts/demos/load_custom_maps_players.lua - -Hint: the current demo map is "official_map.xml". The other maps in the list are slightly outdated and seem to share some markup issues. Therefore we advise to stick to the official demo map and our map format guide at the wiki if you plan to build custom maps for FIFE: -http://wiki.fifengine.de/index.php?title=Map_Format - -Loading maps via the maploader interface: -========================== -Make sure that you've launched FIFE via "guimap_test.exe content/scripts/demos/load_custom_maps_players.lua" (Win32) / "./guimap_test content/scripts/demos/load_custom_maps_players.lua" (Linux). Select the map you want to view from the dropdown menu and load it. Take screenshots (via F12) or do whatever you want. If you want to load the new map press F10, and click on the "Tools" button in the console. You can load another map via the maploader interface now. - -Sound troubles: -========================== -In Windows: -If you don't hear the "Maybe" song when you launch FIFE, you should install an updated OpenAL driver to resolve this issue. Simply execute the OpenALwEAX.exe that's inside your FIFE folder. Please report back at the fifengine.de forums if installing this updated driver did _NOT_ fix the sound problems for you. - -FIFE searching for new members: -========================== -Last but not not least FIFE is always searching for new members that want to support the project by contributing. If you think that FIFE is worth being supported you visit the following page to get an overview over the free positions on the team: -http://wiki.fifengine.de/index.php?title=Help_wanted - -You can contact the FIFE team @ fife-public@lists.sourceforge.net - -The FIFE Team, 2007/04/22 diff -r 9d0a21184c13 -r 191654cf9855 doc/README_2007.1_FRENCH --- a/doc/README_2007.1_FRENCH Sun Jul 13 13:14:04 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,114 +0,0 @@ -========================== -FIFE 2007.1 (release officielle finale basé sur le moteur FIFE SVN rev. 1004 & content SVN rev. 162) -========================== - -Le but de cette release: -========================== -La voilà: la version finale de notre étape 2007.1. C'est une release assez importante pour nous car notre propre format de carte est enfin mis en place et a été utilisé pour notre première carte de démonstration qui était assez énorme. Bienvenue sur l'île FIFE :-) - -Les graphismes utilisés pour cette carte de démonstration NE SONT PAS LES NOTRES! Ils ont été créés par Reiner Prokein. Vous pouvez récupérer ses graphismes gratuitement sur son site "Reiner's Tilesets" : -http://reinerstileset.4players.de/ - - -Pour tout report de Bug / Question : -========================== -Vous pouvez postez vos problèmes dans la section d'aide sur nos forums, sur la mailing liste du projet ou bien nous le faire savoir directement sur notre salon irc. - -Salon IRC: -http://wiki.fifengine.de/index.php?title=IRC - -Mailing liste: -http://wiki.fifengine.de/index.php?title=Mailing_list - -Forums: -http://www.fifengine.de/module-pnForum-viewforum-forum-7.phtml - -Merci de votre soutien. - -Changement Importants depuis 2007.0 -========================== -* Format de carte XML stable pour FIFE incluant notre carte de démonstration pour montrer les nouveaux dispositifs et leur syntaxe. -* Limiteur de FPS (peut être établi dans le fichier fife.config) pour garder du temps de CPU pour les tâches futures (IA, pathfinding, etc...) -* Les coordonnées des "tiles" et des objets peuvent être affichées (touche "c") -* Clé couleur d'override pour les effets de transparence de Fallout (voir content/gfx/fallout_overrides.xml) -* Probème du décodage du code DAT1 réglé (le bug a été introduit avec la réécriture du DAT1) -* La plupart des classes de modèle de carte ont été exportées dans Lua et sont accessibles via la console -* Taille de la carte variable, géométries configurables -* Clés de couleurs pour les rendus SDL -* Ajouts de sources VFS customisées via vfs.addSource (voir content/etc/vfs_sources.txt) -* Vitesse de démarrage améliorée avec les fichiers DAT de Fallout 2 -* Caméra améliorée avec possibilité de ports de vision multiples (voir content/scripts/demos/map_control.lua) -* Construit maintenant avec SDL_image 1.2.5 et guichan 0.61 (binaires Win32) -========================== - -Pour un changelog complet allez voir : -https://mirror1.cvsdude.com/trac/fife/engine/timeline - -Pour tous les tickets fermés depuis 2007.0 voir : -http://mirror1.cvsdude.com/trac/fife/engine/query?status=closed&milestone=2007.1 - -Ce qui marche : -========================== -Allez voir ici: -http://wiki.fifengine.de/index.php?title=Engine_features - -Ce qui ne marche pas: -========================== -* Beaucoup de choses, à peu près tout ce qui n'est pas énuméré sur la page du wiki en lien ci dessus. - -Configuration -=========================== -* FIFE utilise un fichier appelé "fife.config" pour donner à l'utilisateur un contrôle sur certains aspects du moteur -* Le fichier est commenté en anglais et s'explique de lui-même. - -Travailler avec les cartes de Fallout 1: -========================== -Sous Windows: -* Copiez le "master.dat" & "critter.dat" de Fallout 1 et mettez les dans le répertoire d'installation de FIFE -* Modifiez le FIFE.bat pour démarrer FIFE via: guimap_test.exe content/scripts/demos/load_fo1_maps.lua - -Sous Linux: -* Copiez (ou liez) le "master.dat" & "critter.dat" de Fallout 1 et mettez les dans le répertoire contenant guimap_test -* Démarrez FIFE via ./guimap_test content/scripts/demos/load_fo1_maps.lua - -Travailler avec les cartes de Fallout 2: -========================== -Sous Windows: -* Copiez le "master.dat" & "critter.dat" de Fallout 2 et mettez les dans le répertoire d'installation de FIFE -* Modifiez le FIFE.bat pour démarrer FIFE via: guimap_test.exe content/scripts/demos/load_fo2_maps.lua - -Sous Linux: -* Copiez (ou liez) le "master.dat" & "critter.dat" de Fallout 2 et mettez les dans le répertoire contenant guimap_test -* Démarrez FIFE via ./guimap_test content/scripts/demos/load_fo2_maps.lua - - -Travailler avec des cartes (XML) personnalisées: -========================== -FIFE possède son propre format de carte maintenant donc vous pouvez testez le moteur sans avoir un des jeux Fallout installé. Vous pouvez ajoutez une carte personalisée XML ou une carte Fallout en modifiant /FIFE_dir/content/etc/maps_custom_players.txt (maps_custom_developers.txt si vous démarrez FIFE avec le script développeur lua). - -Sous Windows: -* Modifiez le FIFE.bat pour démarrer FIFE via: guimap_test.exe content/scripts/demos/load_custom_maps_players.lua - -Sous Linux: -* Démarrez FIFE via ./guimap_test content/scripts/demos/load_custom_maps_players.lua - -Astuce: la carte de démonstration actuelle est "official_map.xml". Les autres cartes dans la liste qui sont un peu anciennes et semblent avoir quelques problèmes. C'est pourquoi nous vous conseillons d'utiliser la carte officielle de démonstration. Un guide pour le format des cartes est disponible sur le wiki si vous souhaitez créer des cartes personnalisées pour FIFE : -http://wiki.fifengine.de/index.php?title=Map_Format - -Chargement des cartes via l'interface "maploader" : -========================== -Vérifiez que vous avez lancé FIFE via "guimap_test.exe content/scripts/demos/load_custom_maps_players.lua" (Win32) / "./guimap_test content/scripts/demos/load_custom_maps_players.lua" (Linux). Selectionez la carte que vous souhaitez voir dans le menu et chargez la. Vous pouvez prendre des screenshots (avec F12) ou faire ce que vous voulez dessus. Si vous voulez charger une nouvelle carte, utilisez la touche F10, et cliquez sur le boutton "Tools" dans la console. Vous pouvez désormais charger une nouvelle carte avec l'interface maploader. - -Problèmes de Son: -========================== -Sous Windows: -Si vous n'entendez pas la chanson "Maybe" lorsque vous démarrez FIFE, vous devrez installer une version à jour du driver OpenAL pour résoudre ce problème. Exécutez simplement le OpenALwEAX.exe qui est dans votre répertoire FIFE. S'il vous plait reportez tout bug sur les fourms fifengine.de si, après installation de ce driver à jour vous n'avez _PAS_ résolu votre problème de son. - -FIFE recherche des nouveaux membres: -========================== -Enfin, FIFE est toujours à la recherche de nouveaux membres pour soutenir le projet en y contribuant. Si vous pensez que FIFE mérite d'être soutenu, allez voir la page suivante pour avoir un point de vue général sur les postes ouverts dans l'équipe : -http://wiki.fifengine.de/index.php?title=Help_wanted - -Vous pouvez contacter l'équipe FIFE @ fife-public@lists.sourceforge.net - -L'équipe FIFE, le 2007/04/22