Commit Graph

131 Commits (f9f784a285b5f50c961425de352267e2539b72cc)

Author SHA1 Message Date
Armin Burgmeier b33bc157bd Change .c4v extension to .ocv 2011-03-13 17:07:19 +01:00
Armin Burgmeier 2e0b00a5e0 Change .c4b extension to .ocb 2011-03-13 17:06:23 +01:00
Armin Burgmeier 3a9556f1a3 Change .c4m extension to .ocm 2011-03-13 17:01:53 +01:00
Armin Burgmeier c61e92ec98 Change .c4i extension to .oci 2011-03-13 16:56:26 +01:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
Armin Burgmeier 2a2408f9a8 Change .c4p extension to .ocp 2011-03-13 16:39:48 +01:00
Armin Burgmeier eaf62f71f9 Change .c4f extension to .ocf 2011-03-13 16:38:33 +01:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00
Armin Burgmeier e282bf9a9c Change .c4s extension to .ocs 2011-03-13 16:11:55 +01:00
Günther Brammer c49f8b32d5 win32: wrap all windows.h-includes to always undef troubling macros 2011-03-13 15:48:45 +01:00
Günther Brammer 61410ab666 autotools/win32: c4script shell needs -lwinmm 2011-03-11 03:48:52 +01:00
Günther Brammer 8323f6c01d Add a standalone C4Script interpreter 2011-03-05 17:40:22 +01:00
Günther Brammer 111df0392c Split C4Script.cpp into game functions and C4Script support functions 2011-03-04 13:49:41 +01:00
Günther Brammer e250312c26 Move C4DefList class into from C4Def.cpp/h to new C4DefList.cpp/h 2011-03-03 17:10:22 +01:00
Günther Brammer 5d1d53bcb6 autotools: add C4CrashHandlerWin32.cpp to the Makefile.am 2011-03-01 21:59:11 +01:00
Günther Brammer bb8696576e Version 5.1.90 (5.2 Alpha) 2011-02-26 21:03:05 +01:00
Günther Brammer 7ce65373a3 Replace C4AList with some std::lists 2011-02-26 00:48:19 +01:00
Günther Brammer f105e45d6a autotools: clean up duplicate files in Makefile.am 2011-02-03 21:52:16 +01:00
Günther Brammer c74e43b61f Add C4ObjectScript.cpp 2011-01-20 01:56:01 +01:00
Günther Brammer dfa1ad948b Move C4AulDefFunc* templates to a header 2011-01-20 00:19:19 +01:00
Günther Brammer 1f54d38f06 autotools: Correct merge mistake from two commits ago
Yes, that wasn't a merge commit. It was still a merge mistake.
2011-01-30 21:51:35 +01:00
Nicolas Hake b8d3b00d90 Move TinyXML into thirdparty/ 2011-01-25 21:28:44 +01:00
Günther Brammer 9041137e49 autotools: Do not compile shared source files twice for c4group and puncher 2011-01-27 01:29:22 +01:00
Günther Brammer 987d8872ea autotools: Fix dist and distcheck 2011-01-20 02:26:26 +01:00
Günther Brammer 5151177d44 Move some BMP-loading helpers to C4Landscape.cpp 2011-01-19 23:52:46 +01:00
Günther Brammer 83322f596a Move Mesh loaders from src/platform to src/lib
They are entirely platform-independent.
2011-01-19 22:55:18 +01:00
Günther Brammer b7d8eb8959 netpuncher: Make it compile again 2011-01-15 19:11:48 +01:00
Günther Brammer 4e01716f28 editor: Automatically open landscape tools dialog
The landscape tools is mostly useless without the dialog, whereas the other
modes are useful without the dialog.

But mostly this is a side effect of removing PropertyDlg.Active along with
the C4PropertyDlg class.
2011-01-13 18:21:59 +01:00
Günther Brammer 20afa7b470 console mode: Move keyboard input to CStdInProc, make it compile again 2011-01-10 00:01:17 +01:00
Armin Burgmeier 9f74506e9b Support loading game data from system path 2011-01-06 21:18:13 +01:00
Günther Brammer f990fe7651 editor/gtk: Warning fixes 2011-01-04 16:27:38 +01:00
Günther Brammer a9162e6358 console mode: Fix all the obvious compile errors
One of them even affected any engine configured without OpenGL support.
2010-12-29 00:46:35 +01:00
Günther Brammer a89667f3d7 Merge C4ValueList and C4ValueArray into one class
Now that the last usage of numbered variables in effects is gone,
C4ValueList wasn't used except as a base class. If the array and
refcounting aspect should be separated at all, the reference count
should be in the base class.
2010-12-27 17:05:35 +01:00
Günther Brammer 0b746f756a Autotools: Add new editor files and rename a new header to .h
If it's #included, it's a header, even if it looks like a normal
compilation unit.
2010-12-13 03:11:06 +01:00
Günther Brammer 47594765cb c4group: Remove unused -a, -m, -e, -d, -r, -o commands
The new release scripts use -p instead. This doesn't make c4group a lot
simpler, but every bit helps.
2010-12-05 19:04:40 +01:00
Günther Brammer bf5c6cb231 Make gunzip4c4group build again
Hopefully nobody will actually have to use that tool, but one never knows.
2010-11-14 23:50:45 +01:00
Günther Brammer f23581c207 Autotools: Remove C4Version.h on make clean 2010-10-29 00:00:05 +02:00
Günther Brammer 951c9a3faf Rename "Console" to "Editor", matching --editor
OpenClonk too has an editor. The commandline option was already renamed.
2010-10-07 04:12:01 +02:00
Günther Brammer 9f0ba09c04 Split C4Viewportwindow out of C4Viewport.h/cpp 2010-09-28 21:29:00 +02:00
Martin Plicht 243e20bdf6 Add OpenAL implementation of C4SoundSystem
With an Ogg Vorbis loader using libvorbis and a .wav loader using a macosx
API.

Günther: Add autotools support
2010-09-26 02:36:35 +02:00
Günther Brammer 17016a6695 Version: Reduce version number from five numbers to four
Removing C4XVER4 and renaming C4VERBUILD to C4XVER4. Also, make the
Makefile.am read the version from the Version.txt and generate C4Version.h.
2010-09-25 00:43:30 +02:00
Günther Brammer 8039aa087c Autotools: Check for boost in configure 2010-09-22 16:43:26 +02:00
Charles Spurrill 1bc54ad197 Autotools: Fix windows build 2010-09-10 14:01:14 +01:00
Günther Brammer cbe621dd75 autotools: Remove a superflous warning option 2010-07-20 20:24:52 +02:00
Nicolas Hake e27ecd59b5 Rename FIXED to C4Real
There's already a typedef struct _FIXED FIXED; in wingdi.h, which conflicts
with the definition of FIXED in OpenClonk.
2010-05-04 17:35:18 +02:00
Armin Burgmeier 60d58f3ac8 Introduce C4ObjectPtr, a convenient way to (de)serialize C4Object pointers
Might also help to find out what the problem with #117 really is
2010-03-30 23:08:15 +02:00
Günther Brammer 5631bb197d autotools: create hgrevision.h 2010-03-25 20:56:41 +01:00
Günther Brammer 2a99ad1d39 Split Standard.h into two: Miscellanous utility and platform abstraction 2010-03-08 23:59:11 +01:00
Günther Brammer 3e6153098b Script: Warn about type conversions that are going to fail
At the moment, only function parameters are checked, and only immediate
type errors are catched - if there's a variable in between, the parser
won't see it. Still useful to catch some errors before running the
code.
2010-03-06 20:49:29 +01:00
Nicolas Hake 11e9f3235b Prefer loading meshes from binary format
This implements a loader for Ogre's binary mesh format. Loading times
are vastly superior to the TinyXML parser. If no binary mesh exists,
the loader will fall back to parsing XML.

This changeset introduces a dependency on the Boost libraries.
2010-03-02 17:12:28 +01:00
Benjamin Herr 1f25ca3b3a [PATCH] add C4AulDebug.cpp to Makefile.am
From 7f65f4b663939f07350dd4994d628f710bfa095e Mon Sep 17 00:00:00 2001
Date: Sun, 28 Feb 2010 22:48:37 +0100
---
 Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
2010-02-28 22:51:03 +01:00
Günther Brammer 99e2211cda c4group doesn't need -DUSE_CONSOLE anymore if it ever did 2010-02-18 21:22:10 +01:00
Günther Brammer ff8d950e85 Remove C4ENGINE define
Most files using it weren't used by c4group-the-application anymore, and
the remaining stuff can be dealt with by using stubs or the same code in
both cases.
2010-02-17 22:59:46 +01:00
Armin Burgmeier 5dcf92121d Introduce animation stack, adapt existing scripts 2010-01-22 19:27:02 +01:00
Armin Burgmeier fb95c3af2e Merge mesh into default 2010-01-04 01:10:31 +01:00
Günther Brammer c03a6cc96b Autotools: macosx support 2009-12-31 03:16:39 +01:00
Nicolas Hake 48986e9050 Rename C4RTF.h as well 2009-12-30 20:49:15 +01:00
Nicolas Hake 3abc5e30a5 autotools: Add C4PlayerControl to file list 2009-12-22 14:39:03 +01:00
Nicolas Hake 1a933780d4 Fix assertion and crash on game teardown (#37, #42)
Also, the build works on linux again. Whee!
2009-11-25 16:04:32 +01:00
Nicolas Hake 5491ce14e4 Remove DInput/DSound from autotools build 2009-10-21 20:50:19 +02:00
Armin Burgmeier 4fa029df2c Merged default into mesh 2009-08-27 21:35:55 -04:00
Günther Brammer 179097d389 Build fixes
glew needs opengl32 on windows, and c4group needs zlib.
2009-08-15 21:55:26 +02:00
Günther Brammer a28a6621da shuffle the #includes around a bit
This reduces the dependencies from src/lib to the rest of the code a bit.
2009-08-12 22:03:50 +02:00
Günther Brammer b46f4696e9 Split C4Rect out to its own source file
Because much more depends on C4Rect than only C4Shape, and C4Shape uses
lots of other stuff.

Also move some other files which depend on C4Group to src/c4group, because
I'm editing the build files anyway.
2009-08-14 01:46:32 +02:00
Günther Brammer 572d00c32e Move all source files
This might make stuff easier to find.
2009-08-10 17:59:18 +02:00
Günther Brammer b73009e65b Cleanup 2009-08-05 00:53:38 +02:00
Armin Burgmeier 6da0846c87 Merged default into mesh 2009-07-27 21:49:33 -04:00
Günther Brammer 893cd20109 Merge branch 'proplist' 2009-07-21 16:46:39 +02:00
Günther Brammer 399ea170ac Revert "Removed autotools and anjuta build files"
CMake does not support anjuta, so I still need those. We should probably share the file
lists, though.
2009-07-13 21:24:30 +02:00
Armin Burgmeier e52a4364b6 Added StdMesh data structures
Loading code is still to be written
2009-07-09 00:01:15 +02:00
Armin Burgmeier 9f35ffe470 Added TinyXML 2009-07-08 22:53:49 +02:00
Nicolas Hake 21d714bb93 Removed autotools and anjuta build files 2009-07-11 01:46:50 +02:00
Armin Burgmeier 639b40bbb6 Added StdMeshMaterial 2009-07-06 23:45:44 +02:00
Günther Brammer 6ff9c8c48a C4Group: Do not use C4Config
This disables writing the maker name into the group. But this bit of meta
data will be lost anyway when we move to ZIPs.

The temp directory and registration check bits are unnecessary, anyway.
2009-06-17 21:45:41 +02:00
Günther Brammer 009cfc9e7b Remove C4Wrappers and put most functions in relevant headers
This also removes the TickXXX #defines and moves the lookup of predefined
materials to C4Material.
2009-06-12 20:52:21 +02:00
Günther Brammer 4c897d7ac1 Mingw: Add -DGLEW_STATIC, assuming that everyone will use a static glew
When somebody figures out how to link to the dynamic one, this will have
to be revisited.
2009-05-14 01:57:50 +02:00
Günther Brammer 71dd7d454b autotools: Fix distcheck 2009-05-13 18:58:21 +02:00
Günther Brammer aab74094a4 configure: default to no sound on win32
Later this should be replaced by a check for fmod or sdl_mixer.
This also fixes glew and sdl_mainloop detection.
2009-05-10 01:39:04 +02:00
Günther Brammer 4f811263fb Update autotools build to not require library copies 2009-05-08 20:56:43 +02:00
Nicolas Hake 0f050f0343 Import source 2009-05-08 15:28:41 +02:00
Günther Brammer 42d3b6e79a Add C4PropList
A Proplist is a map of C4Strings to C4Values which can chain lookups
to "Prototype" Proplists. This can be used to implement inheritance.

Proplists can be stored in C4Values.

C4Object now inherits from C4Proplist, C4Values can be converted between
those two.
2009-05-20 00:12:11 +02:00