Commit Graph

326 Commits (ed66b27cf39d4eba7f8aae5615688dbe4d3703f8)

Author SHA1 Message Date
Günther Brammer ed66b27cf3 Finally move the Log() declaration where it belongs
In the old days, the code was split in two parts - C4* files in one part
and the other files. Long, long ago, the other files were presumably used
by other programs, but that wasn't true since the GWE at least. But the
split was maintained, except for the Log functions. Now that everything
is one giant bunch anyway, the Log functions can be declared in C4Log.h
again.
2010-03-04 22:16:55 +01:00
Günther Brammer e30ff99d6a Remove all superflous #include <Standard.h>
Standard.h is included by C4Include.h, and every file includes that.
2010-03-04 22:11:12 +01:00
Günther Brammer 30b6a0c1bb Add missing #include <C4Include.h>
Every Clonk source file must include this one.
2010-03-04 22:12:35 +01:00
Günther Brammer e3292ad0f5 Remove obsolete code introduced by the debugger merge 2010-03-05 22:25:37 +01:00
Günther Brammer b81931a419 Miscellanous FIXME removals 2010-02-23 21:49:57 +01:00
Tobias Zwick b032bb087c hotfix: engine compiles again 2010-03-03 15:54:45 +01:00
Nicolas Hake ad1b75a071 Mesh loader: Suppress complaints about some chunks we don't care about
Ignores CID_Submesh_Name_Table and CID_Edge_List.
2010-03-02 22:48:44 +01:00
Nicolas Hake f2d1e1e871 Mesh loader: Fix 64bit linux and correctly read colors 2010-03-02 22:48:42 +01:00
Armin Burgmeier 6de92499e6 Fix compilation with MinGW 2010-03-02 18:56:18 +01:00
Tobias Zwick 1f97cb4dc0 stackable-display-fix; renamed all IDs to long IDs according to script guidelines; cleanup 2010-03-02 17:24:51 +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
Carl-Philip Hänsch 411a61276b Removed more shareware restrictions
Lobby: Desaturation filter and watermark on unregistered players gone
Startup: Doesn't show "Unregistered" anymore
About: No "register now button"
Network: /regjoinonly switch removed
2010-03-02 10:03:29 +01:00
Sven Eberhardt 8f83d4853e fix additional def graphics name and zoom (#100) 2010-02-28 14:35:48 +01:00
Nicolas Hake 766abfd190 msvc: Working build on x64
Win64 is a LLP64 architecture, so please don't use a long for storing
pointers. Use intptr_t instead.
2010-02-28 01:42:57 +01:00
Nicolas Hake 0b137e8cd5 msvc: Build fixes for x64 compatibility
I don't know whether it works, because I don't have 64 bit libraries at the
moment. But at least the syntax errors are gone.
2010-02-27 14:48:01 +01:00
Martin Plicht 15967dc313 Reorder preprocessor directives in C4AulDebug.cpp to make compiler happy 2010-02-24 19:16:17 +01:00
Tobias Zwick 028456affe removed some old control stuff from the gui 2010-02-24 18:52:58 +01:00
Martin Plicht a6a12309e9 Merge with debug 2010-02-24 17:30:32 +01:00
Martin Plicht b84561075e Fix Some C4GamePadControl compiler errors when compiling with SDL 2010-02-24 16:49:00 +01:00
Martin Plicht b8309bd851 Fix SDL code that still used DDrawCfg.Windowed 2010-02-24 12:49:08 +01:00
Sven Eberhardt c882b3ba9b send perioic gamepad axis change callbacks even if direction didn't change 2010-02-24 00:34:25 +01:00
Sven Eberhardt dda34d3897 send perioic gamepad axis change callbacks even if direction didn't change 2010-02-24 00:18:07 +01:00
Richard Gerum 3a18f4d41f added throw animation 2010-02-23 19:51:29 +01:00
Martin Plicht 2bb528b5d4 Define NOAULDEBUG to compile without C4AulDebug 2010-02-23 19:29:26 +01:00
Sven Eberhardt 25e5279c0d implement gamepad axis strength parameter in player controls
lowered axis threshold to 20%
2010-02-23 17:53:38 +01:00
Richard Gerum f588a8723e fixed pictures of mesh objects 2010-02-23 16:52:46 +01:00
Tobias Zwick 9f8337972c LF line endings 2010-02-23 13:05:13 +01:00
Tobias Zwick 5c109117fe Texture changes, authors.txt structure, fixed #160, ControlJump for attached objects 2010-02-23 12:50:14 +01:00
Richard Gerum c1aa47c237 ingame pictures of objects half working (meshes seem not to work and overlaid pictures) 2010-02-23 00:56:34 +01:00
Sven Eberhardt 526158dfe3 fix input binding fallbacks (#158)
compile fix
2010-02-23 00:35:06 +01:00
Tobias Zwick cb2a4f3e04 #67 Cleanup: Old HUD 2010-02-22 18:35:51 +01:00
Tobias Zwick 546f93938f icon with clearer borders 2010-02-21 21:42:30 +01:00
Martin Plicht 8e1390c92e debug branch brought up to date 2010-02-19 15:54:31 +01:00
Martin Plicht 16c4173d66 Mac: Use stringWithUTF8String instead stringWithCString 2010-02-19 15:42:24 +01:00
Martin Plicht 1063dbf413 Mac: Include MacUtility.h in OpenURL.cpp 2010-02-19 13:52:35 +01:00
Günther Brammer 5d05efefc4 Remove CollectionLimit
Use RejectCollect instead.
2010-02-18 21:47:11 +01:00
Günther Brammer 86b1ff47e6 Clean the windowed mode configuration switch
Instead of doing the resolution switch deep inside the OpenGL initialisation
code, the Application does it on startup, and the code responsible for
runtime resolution switches is responsible for the resolution-dependant
initialisations.

Unfortunately, the D3D code uses two different but similar pieces of code
for both cases, which need to be merged.
2010-02-18 21:19:04 +01:00
Günther Brammer f7a7dd41d1 Remove blitoffset option
It's only use was to compensate for the 0.5 pixel offset d3d applies to
everything. Do that directly in d3d specific code instead.
2010-02-18 21:11:14 +01:00
Günther Brammer 5c37e0e236 Remove manual clipping
A complicated workaround for obsolete hardware.
2010-02-18 17:26:01 +01:00
Günther Brammer 52b6028a2a Remove NoAlphaAdd, PointFiltering, AdditiveBlits, NoBoxFades and GLKeepRes
These were workarounds for limitations of obsolete hardware.
2010-02-18 17:24:43 +01:00
Tobias Zwick 16c20cff1a cleaned up obsolete scenario.txt options, enabled peter-scroll 2010-02-19 00:03:53 +01:00
Tobias Zwick 25a6eb1c94 inventory system changes, removed Explode() from the engine, granite != Paint spray can 2010-02-18 22:22:58 +01:00
Asmageddon f3fcf7e80e fix key release event not being triggered if shift state changed during key hold (#134) 2010-02-18 18:43:38 +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
Günther Brammer fd07c9e385 Fix SDLApp 2010-02-17 23:00:01 +01:00
Günther Brammer a16df97a95 Various cleanups in the platform code 2010-02-16 02:54:02 +01:00
Martin Plicht cf382f34ce Merge, resolving C4NetIO conflict 2010-02-03 03:39:21 +01:00
Armin Burgmeier 3fc5ec0cb7 Use FIXED for animation position and weight, to fix desync while hangling 2010-02-02 19:25:51 +01:00
Benjamin Herr 00c747aebe C4NetIOTCP: Removed assertions from bug #101
The non-winsock part of the code was making some funny assumptions about
the the connection/peer lists staying consistent with the pollfd array,
so we use a pollfd map instead.
---
 src/network/C4NetIO.cpp |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)
2010-02-02 16:41:18 +01:00
Benjamin Herr df0ff9ef00 C4NetIO::Execute: Extend std::vector lifetime as something points to it
In the not-STDSCHEDULER_USE_EVENTS case, the fds pointer will point to
the elements of a vector with automatic storage duration and then
outlive its lifetime, causing undefined behaviour.
---
 src/network/C4NetIO.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
2010-02-02 15:22:33 +01:00