Commit Graph

189 Commits (69ad91c56ba7d38d444709f36e7fa48b1225ecfb)

Author SHA1 Message Date
Giel van Schijndel dc391434a3 * Remove text/plain mime-type from editworld.rc
* Add a simple resource file (editworld.rc) for the wxWidgets version of EditWorld containing two icons (aside from the default wxWidgets icons)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3211 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 12:17:02 +00:00
Giel van Schijndel 88e0d37c1c * Rename mainfrm.cpp and mainfrm.h to mainframe.cpp and mainframe.h respectively
* Remove mainfrm.cpp and mainfrm.h from the Code::Blocks project file (as mainframe.cpp and mainframe.h where already present)
 * Add mainframe.xrc to the Code::Blocks project file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3210 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 11:47:39 +00:00
Giel van Schijndel 712b4f11d0 * After reporting the bug when loading menus in wxSmith from XRC files to the Code::Blocks devs they've fixed it
* So now convert our MainFrame window to an XRC file
  * This results in less code (as the window is now defined as an XML file rather than a huge amount of window creating code)
  * Also the compile time has now drastically decreased for mainframe.cpp

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3209 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 11:26:57 +00:00
Giel van Schijndel 9fd1fde8ec * Add a start for the MainFrame window (and display it when starting the program)
* An implementation of Help->About is already provided :-D (which is probably the easiest thing about the program...)
  * Currently this window is produced through means of code generation since I can work around something that seems to be a bug in wxSmith this way (the "bug" only occurs when defining windows in XML resource files)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3207 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-28 00:08:25 +00:00
Giel van Schijndel c86606c553 * Just upgraded my Code::Blocks installation (to r4751 of it); updating the generated parts of the code...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3204 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 23:09:52 +00:00
Giel van Schijndel 4239adc560 * Fix an error where we would execute the wrong application code (wxApp instead of EditWorldApp)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3199 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 16:07:31 +00:00
Giel van Schijndel 45125b9fc0 * Add all wxWidgets dialogs to the Code::Blocks project file and let wxSmith manage them
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3197 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:46:33 +00:00
Giel van Schijndel 6d03d9e4a7 * Don't mark the wxID_OK button as default since that is done by wxWidgets itself already
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3195 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 15:37:08 +00:00
Giel van Schijndel c6958c887c * Make sure to add listctrlval.hpp, numtextval.[ch]pp and wxstringconv.hpp to the Code::Blocks project file (for EditWorld) as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3192 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 14:28:22 +00:00
Giel van Schijndel 5c2ac3b1f2 * Add a "main.cpp" file to contain the main application start code
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3190 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 01:08:26 +00:00
Giel van Schijndel bc05caa6f6 * Use $(#boost) instead of an absolute path
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3188 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 00:52:04 +00:00
Giel van Schijndel 131ee472c4 * Add a Code::Blocks project file to aid in porting of EditWorld
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3187 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 00:18:36 +00:00
Giel van Schijndel d584c8f2cb * Don't use #pragma implementation as it causes warnings (not to mention I haven't got a clue what it's supposed to do...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3186 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-27 00:17:42 +00:00
Giel van Schijndel ff51a264c7 * Rename initiallimitsdlg.[ch]pp to initiallimitsdialog.[ch]pp
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3185 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 19:28:53 +00:00
Giel van Schijndel f41d6c52a6 * Clean up the class declaration of CMainFrame
* Make sure to add proper #include guards to every header file

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3184 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 19:08:20 +00:00
Giel van Schijndel 8a3b056ac0 * Make sure to include the proper wxWidgets headers (at the proper place, not to interfere with wxSmith)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3183 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 18:47:04 +00:00
Giel van Schijndel 4c783140ee * Remove a left over debugging statement which I accidentily committed in r3181
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3182 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 18:28:11 +00:00
Giel van Schijndel c7894a8a01 * Make globals g_HomeDirectory and g_WorkDirectory an std::string instead of char[1024]
* Use a function to return the current directory as an std::string (rather than writing it into a buffer that's given along)
 * #define snprintf _snprintf so we can use that as well...
 * Some const correctness

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3181 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 18:26:40 +00:00
Giel van Schijndel 8708174859 * Move the declaration of CBTEditApp to the implementation file since I don't want to export it through the header
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3180 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 17:13:40 +00:00
Giel van Schijndel 2a4c3e6c12 * Alphabetically sort the project file
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3179 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-26 17:13:26 +00:00
Per Inge Mathisen 8ba3716f13 pietoaster: Clean up OpenGL includes. Include SDL_opengl.h instead of gl.h - do not
use both. Fixes warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3175 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-25 18:26:15 +00:00
Dennis Schridde b6833db069 - define snprintf to _snprintf for MSVC
- use wzglobal.h defines where applicable
- add macros.h for imdloader.h: MAX/MIN
- sed RaNdOmTyPe to SDL-type: Reverts r2611 to easy porting.
  Watermelon afaik uses MSVC which has no stdint(.h), thus using it would make no immediate sense to him, since he has no more interest in POSIX-support.
- sed Bool/TRUE/FALSE to bool/true/false, like r2609
NOTE: r3171 was not vanilla 0.3, but also included a modified Makefile by me, wzglobal.h and some minor compilation fixes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3172 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:50:45 +00:00
Dennis Schridde d99dcb0ce1 Version 0.3 of PieToaster
Features:
1. Editing:
 * Polygon duplication
 * Support for submodel
 * Commandline 'filename' is optional, also allows to enter filename via GUI
 * Multiple pies loading
 * Merging of multiple pies into one file
 * Support for 3DTRANS animation (oil derik)
 * Support for 3DFRAMES animation (cyborg)

2. Load and Save:
 * Creation, Load, Save of ani animation
 * Submodel add and remove

3. Model View:
 * Optional VBO for polygon and grids rendering
 * VBO cache for grids
 * Separated frames in animation rendering
 * Animation play

4. GUI:
 * Improved overall GUI usability

5. Fixes:
 * Fixed various bugs in GUI creation strings


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3171 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 22:11:18 +00:00
Giel van Schijndel efba7fe2c4 * Rename the "url" tag of wxHyperLink to "href"
* Remove warzone2100.png from the current directory (it was just a (cheap) copy from icons/warzone2100.png anyway)
  * In aboutdialog.xrc refer to the warzone2100.png from icons/ instead...

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3169 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 21:20:34 +00:00
Giel van Schijndel 3ebbf43b9f * Add another ported dialog: InfoDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3168 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 20:52:59 +00:00
Giel van Schijndel f2d8ba9617 * Rename class ExportInfo to InfoDialog and exportinfo.[ch]pp to infodialog.[ch]pp since other than being __used__ to display export info it has on its own nothing to do with export info
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3164 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 16:50:14 +00:00
Giel van Schijndel 4ed296cbcd * Don't allocate a string buffer from the heap
* and especially don't use the wrong delete operator!! (delete [] String; was necessary not without the '[]')
Greater ease in porting to wxWidgets:
 * Rename class CExportInfo to ExportInfo
 * Pass the string to display to ExportInfo's constructor rather than funking around with its member variables (encapsulation!)
 * Clean up & remove large portions of ExportInfo's (unnecessary) code

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3149 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 01:17:50 +00:00
Giel van Schijndel 811f62370c * Add another ported dialog: AboutDialog; to directory wxDialogs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3148 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 00:40:28 +00:00
Giel van Schijndel 9ef5a36aaa * Add a wxWidgets XML Resource Handler for wxHyperLink (is a member class of wxHyperLink itself: wxHyperLink::XmlHandler)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3147 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 00:19:19 +00:00
Giel van Schijndel 3b2417bddd * Fix a small error where we would use the wrong class name for DECLARE_DYNAMIC_CLASS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3146 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-24 00:15:14 +00:00
Giel van Schijndel 4e784c5c02 * Add wxHyperLink class (copied from the wxCode project)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3145 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 23:39:16 +00:00
Dennis Schridde d21c8a2753 Correcting germanified Gerard...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3140 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 18:43:43 +00:00
Dennis Schridde c9e197c902 Improved MasterServer by Gerhard Schaden, patch #893.
Depends on Python 2.5, but we should have that on the server very soon.
Should effectively help fight ghostgames and also be easily extensible in the future. (Gerhard talked about a web-interface with admin functions. :) )


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3139 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 18:40:10 +00:00
Dennis Schridde 3c7898d1c3 Add fancy author/version/doc headers to masterserver
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3120 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-22 15:21:11 +00:00
Gerard Krol 49958fcc6b Expire games that were updated > 1 hour ago.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3114 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-21 20:51:06 +00:00
Giel van Schijndel a57b33f800 * Fix a wrong date in the license header (was 1007 instead of 2007...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2852 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-22 16:34:51 +00:00
Giel van Schijndel 9fd3c1a7f1 * Make conversion tool "imgfile" also output the file-format-version
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2726 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:49:43 +00:00
Giel van Schijndel 811eafc0af * Add a directory for conversion tools (conversion from some internal WZ format to another format)
* Add conversion tool '''imgfile'''
  * This tool will read in an "IMG" file ("IMG" is the WRF identifier) from standard intput; it'll then reformat it as XML and output it to standard output


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2725 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 15:41:27 +00:00
Giel van Schijndel 3510671340 * Rename test.bak to test.lnd
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2649 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-27 21:55:40 +00:00
Giel van Schijndel 870a536646 * Initialize PhysicsFS before using it
NOTE: PieToaster ''should'' compile, link and run on GNU/Linux systems right now (it does for me)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2613 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:26:26 +00:00
Giel van Schijndel 498959f9bb * #include <stdint.h> where we need it
* Use proper constness in main() to shut up gcc warning about wrong constness


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2612 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:23:59 +00:00
Giel van Schijndel 5a91f73056 * Replace usage of SDL types Uint* and Sint* for usage of standard C types uint*_t and int*_t respectively
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2611 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:17:37 +00:00
Giel van Schijndel 62f1be11f1 * Use "rm -f" to shut up the darn warning messages if several of the to-delete files don't exist while cleaning
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2610 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:14:18 +00:00
Giel van Schijndel 579e952cb8 * Lets use the built-in bool-type instead of a dirty macro!
* replace [Bb][Oo][Oo][Ll] with bool
   * replace TRUE with true
   * replace FALSE with false

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2609 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 14:04:25 +00:00
Giel van Schijndel 8cd7f8fd5b * Replace all instances of ''_snprintf'' with ''snprintf''
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2608 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:43:01 +00:00
Giel van Schijndel 3344b5b01c * Fix #include directives so compiling becomes yet a bit closer to possible
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2607 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:34:44 +00:00
Giel van Schijndel 0bb24b12c2 * Add a ''very'' simple Makefile for compiling PieToaster
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2606 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:29:35 +00:00
Giel van Schijndel c6392febca * Link PieToaster's sources to the repository history
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2604 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 13:12:10 +00:00
Giel van Schijndel 26a1f19cfe * Add initial version of PieToaster
* Developed by Carl Hee <Watermelon>
   * Licensed under the conditions of the GPLv3


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2603 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-24 12:29:36 +00:00
Giel van Schijndel eef217fc4a * Make some EditWorld documents be valid reStructured Text
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2583 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-22 00:38:08 +00:00