Commit Graph

619 Commits (35f31a7c1d402c6f0a4c2711b147374b96f146ec)

Author SHA1 Message Date
Armin Burgmeier f710c68b9a Reset AlphaToCoverage GL state after having rendered a mesh 2012-02-19 17:49:02 +01:00
Armin Burgmeier 8dae8c111d Implement XML loading support for geometry shared between submeshes
The new OGRE blender exporter (2.6) creates meshes which make use of this
feature.
2012-02-15 23:04:19 +01:00
Armin Burgmeier e52d914638 Read but ignore some more "pass" options in material scripts
These are the ones that the blender 2.6 exporter sets automatically. We don't
support them yet but we want to be able to load the material script
nevertheless. Many of the additional options are set to their default values
anyway.
2012-02-13 23:40:47 +01:00
Günther Brammer 90f4f7f77b Work around crash bug in SDL_mixer 1.2.12
See http://bugzilla.libsdl.org/show_bug.cgi?id=1418 for details
2012-02-12 21:28:17 +01:00
Günther Brammer 9f180dffee Script: Remove ScriptGo, ScriptCounter, goto and the ScriptN callbacks
No scenario uses them, and ScheduleCall provides an alternative.
2011-09-19 21:33:05 +02:00
Günther Brammer a9e1af7226 unix: Use clock_gettime(CLOCK_MONOTONIC, ...) instead of gettimeofday
gettimeofday returns wall clock time, which can jump around, which is bad for
our purposes. clock_gettime(CLOCK_MONOTONIC, ...) does exactly what we need - a
stable measurement of time since an arbitrary point.
2011-06-27 01:52:39 +02:00
Armin Burgmeier de4a93cfc5 win32: Actually use the new delay when the timer delay is updated
Instead of just re-creating the timer with the old value. This fixes using
/speed to make the game faster than the default.
2012-02-12 15:54:36 +01:00
Armin Burgmeier 70a67204cb win32: Scheduler runs timeouted procs also when flooded by event inputs (#256) 2012-02-12 15:15:03 +01:00
Armin Burgmeier 86bc3ac417 Don't print an error message for ERROR_PATH_NOT_FOUND in DirectoryIterator::Read
We do the same already for ERROR_FILE_NOT_FOUND. This fixes a harmless warning
when running the engine in a release directory where there is no planet/
directory.
2012-01-28 18:15:51 +01:00
Nicolas Hake 3738069ecd MinGW: Define UPnPNAT CLSID/IID values 2012-01-15 23:22:01 +01:00
Nicolas Hake 683800c33c win32: Add UPnP port mapping support 2012-01-15 21:27:16 +01:00
Armin Burgmeier 6afadc6397 Allow mesh graphics images in messages 2012-01-10 22:40:46 +01:00
Armin Burgmeier 9682cec2ed Make MOD2 rendering for meshes work properly
It will still fail for multi-textured meshes or textures with special
drawing options. This could be fixed eventually using a shader or
applying colormod/MOD2 in an additional texture unit.
2011-12-25 18:55:45 +01:00
Günther Brammer 91e3a0ca07 Remove unused EraseFiles and EraseItems functions 2011-11-02 21:34:04 +01:00
Günther Brammer 5f2f995852 Unify the #include blocks a little bit
One line for C4Include.h, one for the .h corresponding to the .cpp, one
empty line, the other C4* includes, another empty line, external headers.
2011-11-01 23:17:41 +01:00
Nicolas Hake af8cc1320f Do not throw from DirectoryIterator::Read (#681) 2011-10-29 01:16:13 +02:00
Günther Brammer 5f5f2f3975 Fix definition drag-n-drop from file manager to editor viewport 2011-10-21 22:56:26 +02:00
Julius Michaelis 926e251931 Fix SoundSystem, attempt #4 2011-10-15 14:43:18 +02:00
Julius Michaelis eda64786fc Fix Windows build (C4VidePlayback vs f1202c46e544) 2011-10-15 12:55:24 +02:00
Julius Michaelis 74af3071e3 C4SoundSystem: Load all sounds statically
Enable true wildcards in sound names
Fix #680 / 115b63d14d54
2011-10-13 17:05:40 +02:00
Günther Brammer 4aa119af21 Make C4SoundSystem.cpp utf-8 again 2011-10-13 02:09:50 +02:00
Julius Michaelis 0f12b3485e Find sounds with all extensions instead of only wav, so Sound() does no longer require .ogg extensions
Do not replace * with ? in sound name wildcards anymore, adjust scripts
2011-10-12 23:09:22 +02:00
Günther Brammer fa1cab4896 Clean up some obsolete Config.General.ExePath usages 2011-10-10 23:28:01 +02:00
Sven Eberhardt 452f34ffd9 Debug: Add thread checking for CStdFile 2011-10-09 20:11:18 +02:00
Martin Plicht d5c94ae089 Mac: Fix some compiler errors caused by class renamings (C4AbstractApp etc) 2011-10-09 19:33:14 +02:00
Peter Wortmann ad79ece074 Mac: Put game data into bundle
This makes it possible to ship the bundle stand-alone. Also
note that CMake will automatically pack the game data for
release builds, but sym-link the game data for debug builds.

Note this means you will only see the parts of planet/ that
are mentioned in OC_C4GROUPS in CMakeList.txt! This is equivalent
to the behaviour of the shipped build, so I don't see this as
a problem.
2011-10-09 17:09:48 +01:00
Günther Brammer 20b71f030a Clean up StdDDraw2.h a little 2011-10-03 17:19:51 +02:00
Günther Brammer 1cafba4be8 Rename files implementing C4AbstractApp and C4Window 2011-10-03 17:19:24 +02:00
Günther Brammer c2908d5bd5 Rename CStdDDraw to C4Draw 2011-10-03 16:34:08 +02:00
Günther Brammer 2b6f4432de Rename lpDDraw to pDraw 2011-10-03 16:30:18 +02:00
Günther Brammer ad89e12a2c Rename CTexMgr and CTexRef to C4TexMgr and C4TexRef 2011-10-03 16:16:38 +02:00
Günther Brammer 68d6b34f72 Replace SURFACE with C4Surface * 2011-10-03 16:07:07 +02:00
Günther Brammer 55f6bc8d0f Replace CSurface and C4Surface with just C4Surface
The methods that previously were on C4Surface still are in a separate
file.
2011-10-03 16:06:41 +02:00
Günther Brammer d835ab002a Rename CStdWindow to C4Window 2011-08-27 23:12:01 +02:00
Günther Brammer eac2ce9034 Rename CStdAppPrivate to C4X11AppImpl 2011-08-27 22:05:22 +02:00
Günther Brammer efed250aa7 Rename CMarkup to C4Markup 2011-08-27 21:13:15 +02:00
Günther Brammer 6700bff4de Replace CFacet with C4Facet
The latter is almost a superset of the former.
2011-08-27 17:47:49 +02:00
Günther Brammer 156a502289 Rename CClrModAddMap to C4FogOfWar 2011-08-27 16:41:26 +02:00
Günther Brammer f4ff47239f Rename CBltTransform, CBltVertex, CBltData, CPattern and CGammaControl 2011-09-30 22:15:51 +02:00
Günther Brammer 08dacd878d Rename CBitmap(256)Info to C4BMP(256)Info 2011-08-27 16:32:15 +02:00
Günther Brammer 8039a35791 Rename CStdApp to C4AbstractApp 2011-08-27 16:20:39 +02:00
Nicolas Hake cc672bbd00 win32: Automatically check for DbgHelp availability 2011-10-03 13:09:51 +02:00
Nicolas Hake 6a18a56f5d Remove some extraneous parentheses 2011-09-28 19:44:03 +02:00
Nicolas Hake 8d8b087808 Return NULL instead of ((T*)false) from more functions 2011-09-28 19:42:56 +02:00
Nicolas Hake aa8f8b0a43 Silence clang's "conversion to self will not be used" warning
clang defines macros pretending to be GCC 4.2, but it supports
rvalue references so the conversion operator is superfluous
2011-09-28 00:15:59 +02:00
Sven Eberhardt 994bab2dbc CStdDDraw::Blit: Do not modify passed transformation matrix (#645) 2011-09-18 15:54:22 +02:00
Günther Brammer 69c66d9b8f Make StdFile.cpp utf-8 2011-09-07 14:22:35 +02:00
Günther Brammer ec232bbfaf copyright notices update 2011 part II 2011-09-01 20:22:35 +02:00
Günther Brammer 9bc61db360 copyright notices update 2011 2011-09-01 16:58:52 +02:00
Nicolas Hake fe747db554 Clean up copyright notices
Use real names for copyright attribution wherever they are known,
drop duplicates
2011-09-01 12:47:54 +02:00
Armin Burgmeier 6c156a22a7 Implement mesh update on definition reload (#76) 2011-08-20 00:01:08 +02:00
Nicolas Hake f11bf6f368 win32: only hook assertion handler when assertions are enabled 2011-08-19 12:53:48 +02:00
Nicolas Hake d8f7a8ba01 mingw/w32-x86: Build fix 2011-08-15 02:27:47 +02:00
Nicolas Hake bae1cf4718 mingw: Define CONTEXT_ALL for older MinGW versions 2011-08-15 01:09:58 +02:00
Nicolas Hake c62190c693 win32: Define target windows version before including any MinGW header 2011-08-15 00:28:52 +02:00
Nicolas Hake 4e6f367c0a win32: Log a stack trace on assertion failure 2011-08-14 21:17:39 +02:00
Nicolas Hake 1b1b77c5a0 win32: Output wide module names/paths with %ls instead of %s 2011-08-14 21:16:12 +02:00
Sven Eberhardt 1a176a52b9 MSVC2010 fix: Use _filesize instead of filesize
silence a few warnings
2011-08-14 18:16:19 +02:00
Nicolas Hake 0f4e6e8ccd win32: Use wide variants of CRT file access APIs 2011-08-11 15:46:06 +02:00
Nicolas Hake b2e83c3cb2 Replace raw CRT file access API calls with StdFile equivalents 2011-08-11 15:45:27 +02:00
Nicolas Hake c5b92bba26 win32: Pass a wide filename to crash handler's CreateFile 2011-08-11 15:42:41 +02:00
Günther Brammer 5b46441e2a win32: #define UNICODE 2011-04-03 15:48:36 +02:00
Günther Brammer 4d1238beb4 win32: Use Unicode APIs for File manipulation 2011-04-02 18:45:44 +02:00
Günther Brammer ce8012f998 unix: Do not leak CStdNotifyProc fds 2011-06-27 01:51:05 +02:00
Günther Brammer 505b616404 Remove obsolete CStdFile::Load/Save 2011-06-19 16:35:06 +02:00
Nicolas Hake 6efa0ac05e win32: Correctly read back unicode strings from registry 2011-07-27 17:30:56 +02:00
Armin Burgmeier 81cd645fae Use a wrapper function instead of a #define for swprintf
For some obscure reason the boost headers remove the swprintf #define
2011-07-16 13:53:26 +02:00
Sven Eberhardt 339cceb6d4 MinGW fix for swprintf 2011-07-16 12:56:41 +02:00
Sven Eberhardt 6fadd97438 MSVC fix: length parameters for swprintf 2011-07-16 12:08:00 +02:00
Nicolas Hake 7cd06269e9 win32: Don't truncate viewport titles (#608) 2011-06-19 00:59:36 +02:00
Tobias Zwick 8c490dca05 Implemented free shapes (=polygons) to be added or cleared from the landscape:
+ Refactored the ShakeFree, BlastFree, DigFree, DrawQuad etc. functions and
  removed unused functions ClearRectDensity, DigFreeMaterial,...
+ Moved the polygon fill algorithm from StdSurface8.cpp to C4Landscape.cpp
+ Clearance functions which used to subtract a circle now subtract something
  that looks more like a chunk
+ Pickaxe works with BlastFree now
+ Removed Dig2ObjectRequest
2011-05-31 00:33:35 +02:00
Peter Wortmann bfb0849fe5 Fixed Mac build 2011-05-21 16:38:54 +01:00
Günther Brammer 3c943479ab editor: File/Save creates a savegame when the original scenario was one 2011-05-15 19:38:47 +02:00
Günther Brammer 8bb2afc477 editor: Remove File/Save Game in favor of File/Save Game As
Overwriting a non-savegame scenario with a savegame is too seldomly useful
to feature prominently in the menu.
2011-05-15 18:07:26 +02:00
Günther Brammer 35a8667672 Savegames: Include *.ocf directories in Origin, not *.c4f 2011-05-15 19:32:39 +02:00
Nicolas Hake 34aa95562d Allow resolution change with mismatching display refresh rates
Removing the DM_DISPLAYFREQUENCY flag from the DEVMODE::dmFields
member lets Windows choose its own preferred frequency.
2011-05-15 16:24:26 +02:00
Günther Brammer 273acfff80 win32: Make vfw32 optional
The features it was used for are very seldomly used, and some build
environments don't have the import library.
2011-05-12 17:13:38 +02:00
Günther Brammer 9b3afcef04 Remove IDS_LANG_CHARSET and supporting code, everything is in UTF-8 now 2011-04-09 02:51:57 +02:00
Günther Brammer 21e28a4689 Script: Use Unicode instead of Byte strings
Internally, strings are UTF-8 as before, but GetChar returns an
Unicode code point instead of a byte from the UTF-8 encoded string,
and Format("%c") takes an Unicode code point as well.
2011-03-10 00:26:31 +01:00
Nicolas Hake 05608a3edd CStdFont: Assert UTF-8 conformance before drawing or measuring text 2011-04-05 21:03:15 +02:00
Nicolas Hake 5e2e25cc74 win32: Fix StdCompilerConfigRead::ReadString 2011-04-05 18:04:32 +02:00
Günther Brammer 3f7e879ffe win32: Use Unicode APIs for the user interface 2011-04-03 15:47:02 +02:00
Günther Brammer 0abe1bb633 win32: Use Unicode registry APIs 2011-04-02 18:48:01 +02:00
Günther Brammer 702dc65b83 win32: Add helper functions to convert UTF-8 to UTF-16
They mostly add automatic memory management to MultiByteToWideChar.
2011-04-02 16:48:54 +02:00
Günther Brammer 6e30f2b7e8 win32: Remove unused StdConfig class and associated Registry APIs
It has long since been replaced by the StdCompilerConfig* classes. A few
of the Registry functions are still used in other code, and a few are now
implementation details.
2011-04-02 17:49:55 +02:00
Günther Brammer bd051a972d win32: Remove duplicate file type association code from the engine
The installer already does this, and on newer windows versions the engine
isn't able to do this anyway.
2011-04-02 17:31:01 +02:00
Günther Brammer b46b827cdc Add a few virtual destructors
This ensures that classes that inherit from these have their destructors
called even if they are deleted with a pointer to the base class.
Though at the moment, this just silences a warning.
2011-04-02 00:18:14 +02:00
Günther Brammer ce6f2c9fe0 editor/gtk: Use "draw" instead of "expose-event" signal with GTK+ 3.0
Since the event resp. cairo context isn't used, both events can share a
handler for now.
2011-03-31 00:48:47 +02:00
Günther Brammer 1c43f9dd76 sdl: fixes inspired by compiler warnings 2011-03-30 21:18:16 +02:00
Günther Brammer 5d0df4f028 win32: Miscellanous fixes inspired by compiler warnings 2011-03-30 21:06:30 +02:00
Günther Brammer 259c4aa30a Fix DirectoryIterator::DirectoryIterator(const DirectoryIterator &)
Thankfully, this copy constructor is unused, so nothing relied on the
previously broken behaviour.
2011-03-30 21:11:37 +02:00
Günther Brammer 3bbf7c6c38 Add DirectoryIterator & DirectoryIterator::operator = (const DirectoryIterator &)
Because every class with pointer members should have one.
2011-03-30 21:04:42 +02:00
Günther Brammer 5b808be269 Remove some unused variables
gcc 4.6 finds variables that are write-only.
2011-03-28 19:31:28 +02:00
Sven Eberhardt 269c7b208c control config dialog 2011-03-30 22:11:47 +02:00
Julius Michaelis bf161543b7 Fix 1aab98cfd1e2 2011-03-22 16:42:36 +01:00
Günther Brammer 0f44b39ab9 Split CStdApp out of StdWindow.h into StdApp.h 2011-03-19 22:09:10 +01:00
Günther Brammer 1b361bbcb7 win32: Remove some unnecessary CStdApp helper functions 2011-03-21 17:54:34 +01:00
Günther Brammer 513dd9b252 A simple priority mechanism for the StdScheduler
Everything is more important than the next game tick: network activity,
user input or editor redraw.

On windows, the ordering is still delegated to (Msg)WaitForMultipleObjects.
2011-03-19 13:59:56 +01:00
Günther Brammer fe1ea5c5a3 linux: remove inotify support on glibc < 2.4 2011-03-17 02:33:56 +01:00
Günther Brammer cacceef1c6 linux: use eventfd for CStdNotifyProc 2011-03-17 02:26:37 +01:00
Günther Brammer 03b3678050 Remove unused CStdNotifyProc::Check 2011-03-17 02:22:33 +01:00
Günther Brammer 8036211c30 linux: Use timerfd instead of poll timeouts 2011-03-15 17:27:10 +01:00
Martin Plicht bbbe2ace49 mac: Use new file extensions 2011-03-14 20:12:00 +01:00
Günther Brammer 492ae967fc win32: include windows.h before GL/glew.h
The GL/glu.h from mingw64 needs the WINAPI macro and is included by glew.h.
2011-03-14 16:19:29 +01:00
Nicolas Hake 35745ed2a3 MinGW: Fix pointer output format on crash reporter 2011-03-13 20:36:20 +01:00
Günther Brammer 4a9fb459d2 fix CSurface::ClearBoxDw size calculations 2011-03-13 23:33:52 +01:00
Günther Brammer 2d1ea830ec win32: Do not include windows header from PlatformAbstraction.h 2011-03-13 22:21:16 +01:00
Günther Brammer 05146718c0 Remove RECT structure from platformindependant code 2011-03-13 20:45:30 +01:00
Günther Brammer 6dafb53c15 Replace RECT with C4Rect in CSurface 2011-03-13 20:32:21 +01:00
Günther Brammer 2a1db87698 Replace RECT CStdWindow::GetSize argument with C4Rect 2011-03-13 20:00:03 +01:00
Günther Brammer d5ab5d31bb Replace RECT PageFlip arguments with C4Rect 2011-03-13 17:41:42 +01:00
Günther Brammer 6c2a89eaf8 Replace timeGetTime with a platformneutral GetTime wrapper 2011-03-13 17:25:35 +01:00
Nicolas Hake d2070b8aa3 win32: Fix build 2011-03-13 20:30:33 +01:00
Armin Burgmeier 884809e8f2 Merge filename extension changes 2011-03-13 17:15:40 +01:00
Günther Brammer e56a5b0136 Correctly use the C4RGB macro
C4RGB sets the alpha channel to 0xFF instead of 0x00 like RGB did.
2011-03-13 17:09:47 +01:00
Armin Burgmeier c1f340a74a Change .c4u extension to .ocu 2011-03-13 17:09:17 +01:00
Armin Burgmeier 8ff1667533 Change .c4l extension to .ocl 2011-03-13 17:08:02 +01:00
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
Armin Burgmeier 085acf3d9a Remove .c4k icon 2011-03-13 16:01:34 +01:00
Armin Burgmeier c69e2c9248 Remove .c4x icon 2011-03-13 16:01:34 +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 7bc20a8dc3 win32: add some missing #include <windows.h> 2011-03-13 02:03:45 +01:00
Günther Brammer 01c4845bb5 win32: add includes missing for some windows header versions 2011-03-13 01:15:52 +01:00
Günther Brammer 226eb9b366 win32: work around wingdi.h macros harder 2011-03-13 01:15:22 +01:00
Günther Brammer 81b9297498 win32: include windows.h before dbghelp.h 2011-03-12 23:45:04 +01:00
Günther Brammer 21a8f337d5 win32: avoid winbase.h in PlatformAbstraction.h 2011-03-12 15:29:21 +01:00
Günther Brammer 62bcf4d5c2 win32: move StdStrBuf(const wchar_t*) to StdBuf.cpp to avoid winnls.h 2011-03-12 15:26:35 +01:00
Günther Brammer 6912b118e5 If boost uses static_assert, do not make static_assert use boost 2011-03-11 14:58:58 +01:00
Günther Brammer 8569eaab8c win32: Do not include windows.h from PlatformAbstraction.h
A few windows headers are still included, but not the big offenders
rpcndr.h, wingdi.h and winuser.h. Unfortunately, the latter two need to be
included from StdWindow.h, so still wind up in a lot files, which means
some of the #defines in them need to be undone. To avoid doing that in
multiple places, a few more files include StdWindow.h now.
2011-03-11 03:48:25 +01:00
Günther Brammer 23eedce46a Make RECT use int32_t instead of long 2011-03-12 15:31:37 +01:00
Günther Brammer 040ebfa612 Replace ZeroMemory(p,l) with memset(p,0,l) 2011-03-12 14:59:41 +01:00
Günther Brammer 2820716057 Include fewer headers from C4Game.h so C4NetIO.h isn't included from there 2011-03-11 03:43:38 +01:00
Günther Brammer 81d64df737 Do not use Windows' RGB macros for BGR colors 2011-03-11 03:37:27 +01:00
Nicolas Hake 62f840412e Check for static_assert support 2010-05-29 14:44:16 +02:00
Günther Brammer 8ff6ae847c C4Group::LoadEntry takes pointer instead of non-const reference 2011-03-05 02:44:26 +01:00
Nicolas Hake d82815087e win32/g++: Silence some format warnings 2011-03-04 00:40:17 +01:00
Nicolas Hake 73ec989261 win32: Avoid build error when using old SDK headers 2011-03-04 00:08:11 +01:00
Nicolas Hake ff2ac49368 win32: Log human-readable crash info while writing minidump
The information that will be written to the logfile is the exception data,
processor control and GP registers (x86/x64), up to 512 bytes around the stack
pointer, a stack trace, and the list of loaded modules.
2011-03-01 13:28:13 +01:00
Martin Plicht 9ff63b25d7 editor: cocoa: Enable/Disable some more user interface controls when game running/closed 2011-01-29 09:05:04 +01:00
Martin Plicht 6d711b1fe4 editor:cocoa: Fix viewport scrollbars when zoomed 2011-02-15 12:45:55 +01:00
Martin Plicht b7a542089b cocoa: Don't update opengl context in drawRect: 2011-01-26 17:11:02 +01:00
Martin Plicht c887878af9 editor:mac: Increase/Decrease Zoom command 2011-01-26 17:09:48 +01:00
Günther Brammer 9aa331d98c console mode: Fix compilation without libreadline 2011-02-04 00:16:45 +01:00
Günther Brammer cde66b249f C4Include.h: Do not include C4Gui.h
The two dialogs in headers included in C4Game.h are only used by classes in
those headers, and do not need to be defined in the headers.
2011-01-24 01:15:58 +01:00
Julius Michaelis 8cbfa00a4e dedicated: fix CMake and object loading (thanks ck and Guenther) 2011-01-30 21:44:54 +01:00
Günther Brammer 7771a58f38 Do not include SDL_mixer.h from headers
In case the header is included but not used by a program compiled without
sound support.
2011-01-24 01:17:06 +01:00
Günther Brammer 14f90d0fc1 editor/gtk: Fix scrollbars of zoomed viewports 2011-01-25 20:21:49 +01:00
Günther Brammer 76370cb0ec gtk: Fixes for newer GTK+ 3 versions 2011-01-24 01:06:34 +01:00
Günther Brammer 7c56940c4b gtk: use gtk_show_uri to open a browser if possible 2011-01-23 23:03:57 +01:00
Günther Brammer 829874e011 editor/gtk: Migrate to non-deprecated APIs 2011-01-23 23:04:40 +01:00
Günther Brammer 8b989e414a Move C4ViewportWindow initialization to C4ViewportWindow::Init 2011-01-23 23:02:23 +01:00
Günther Brammer 60b3415624 sdl: update for refresh rate API changes 2011-01-24 23:32:51 +01:00
Martin Plicht cdc29a593a Mac: Fix build by adding refresh rate parameter (ignoring it) 2011-01-24 12:11:18 +01:00
Martin Plicht ae447c30c1 Mac: Fix wrong method signature for ClonkAppDelegate makeFakeArgs 2011-01-10 02:21:09 +01:00
Martin Plicht 2aed52a6fb Mac: Cocoa: Add "Reset Zoom" menu item to set zoom level of active viewport to 1 2011-01-13 21:21:19 +01:00
Nicolas Hake d1b2f1a325 win32: Default to current desktop display settings (#484, #493)
Previously, the graphics code tried to set a refresh rate as close to
85 Hz as possible. This led to black screens when the display driver
would report a refresh rate that was not actually supported by the
monitor.
This change also uses the currently set monitor orientation, instead
of always selecting a non-rotated display mode.
2011-01-20 15:43:19 +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 5b3fe189ea editor/gtk: Save the clipboard on exit
Normally, this is done by gtk_main with a private function. Since Clonk
does not use gtk_main, that function is copied and slightly changed to use
the public API and compile as C++.
2011-01-16 21:30:59 +01:00
Günther Brammer f10e01a01c config: Remove unused General.Record 2011-01-16 17:21: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 173d247b4f x11: Restore argc/argv saving accidentally removed two commits ago 2011-01-10 15:52:50 +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
Martin Plicht 0226c11f12 Mac: Cocoa: Allow resizing the game window. Aspect ratio enforced, no actual resolution switching 2011-01-06 17:56:04 +01:00
Martin Plicht 50c69ebedb Mac: Cocoa: Keyboard input: Feed whole utf8-string to C4GuiScreen::CharIn 2011-01-02 18:57:11 +01:00
Martin Plicht acf5480ac9 Mac: Cocoa: Multisampling 2011-01-02 02:13:09 +01:00
Martin Plicht 89a59b5453 Mac: Remove references to MacUtility.h in SDL files 2010-12-23 01:47:20 +01:00
Martin Plicht 776dd7060b Mac: Magnify gesture to toggle fullscreen mode when in the menus 2010-12-21 03:14:45 +01:00
Martin Plicht 37ef64344d Mac: Treat cmd and ctrl the same 2010-12-13 23:05:27 +01:00
Martin Plicht c56f385ecc Mac: Cocoa: Make C4EditCursor.(Delete|Duplicate|GrabContents) accessible via main menu 2010-12-13 23:29:14 +01:00
Martin Plicht 8ee91cb326 Mac: Remove obsolete constructor 2011-01-09 00:49:54 +01:00
Günther Brammer 6d3feabe69 Reduce #includes so that C4Include.h doesn't include C4Value.h
This should avoid many complete rebuilds.
2011-01-08 17:04:20 +01:00
Günther Brammer 00db064ad5 SDL: updates for the editor and CStdWindow::Init changes 2011-01-08 02:18:36 +01:00
Armin Burgmeier 9f74506e9b Support loading game data from system path 2011-01-06 21:18:13 +01:00
Günther Brammer 57f9600de1 scheduler: Only execute one proc per poll call
The Execute callback could create a new proc which made the poll results
and proc list disagree, confusing the loop.
2011-01-07 00:22:44 +01:00
Günther Brammer 6a17914955 Silence various compiler warnings
None of them pointed to a serious problem, fortunately.
2011-01-03 00:03:28 +01:00
Günther Brammer d90f91d2eb X11: Don't take the address of an empty vector, always dispatch the context
Probably doesn't fix anything other than libstdc++ debug mode, but that's
important enough
2010-12-27 21:35:13 +01:00
Armin Burgmeier 9299b8762c Fix crash when both shaders and FoW are enabled (#549)
PerformBlt and BlitLandscape did not clean up the GL state properly as the
texcoord pointer for texture 3 was still set and enabled but pointing to
nowhere anymore.
2011-01-02 20:33:45 +01:00
Armin Burgmeier 5ed8c5830a Fix a crash in editor mode 2010-12-29 23:26:29 +01:00
Armin Burgmeier 0e72f0d2fe Cleanup: Remove unused cx,cy variables in StdGLCtx 2010-12-29 16:37:47 +01:00
Armin Burgmeier f814708a9c Implement Anti-Aliasing (#518) 2010-12-29 15:19:46 +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
Martin Plicht a22d5ee35c Mac: Add Cocoa port 2010-12-27 04:49:02 +01:00
Martin Plicht b4157c5ec9 C4SoundLoaders: Remove duplicate header includes 2010-12-13 21:54:44 +01:00
Martin Plicht cc95f8231f Add IsGermanSystem as forward declaration to PlatformAbstraction.h and implement IsGermanSystem, OpenURL and EraseItemSafe in platform-specific files (StdWindow.cpp/StdGtkWindow.cpp etc) 2010-12-27 03:19:19 +01:00
Martin Plicht cd290cdb39 Mac: Re-add ReadStdInCommand 2010-12-27 02:18:11 +01:00
Martin Plicht eb26711102 C4GamePadCon: Fix some method signatures and a preprocessor directive 2010-12-24 14:18:51 +01:00
Günther Brammer be342d4a51 copyright notices update 2010
This time with more manual checking and using git blame -M -C, so that
a few cases of copied code get a copyright notice corresponding to
their initial introduction.
2010-12-23 01:01:24 +01:00
Armin Burgmeier ed86f1a97e Add some comments explaining how the Glib main loop integration works 2010-12-12 19:16:21 +01:00
Armin Burgmeier f3952bc3f7 Glib main loop: Don't freeze when iterating the mainloop from a callback
This made File/Open in the GTK editor freeze
2010-12-12 17:43:46 +01:00
Armin Burgmeier fabc022481 Fix crash when starting a scenario in console mode on Linux 2010-12-12 14:53:57 +01:00
Martin Plicht 44928f1a8d Platform-specific code in C4Console.cpp gets factored out into C4Console(Win32/GTK).cpp 2010-12-11 19:50:38 +01:00
Sven Eberhardt e2a580fd55 revive MSVC10 memleak checking and fix a few memleaks 2010-12-07 23:43:00 +01:00