Commit Graph

619 Commits (35f31a7c1d402c6f0a4c2711b147374b96f146ec)

Author SHA1 Message Date
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
Maikel de Vries 1d83895487 C4Soundloaders.cpp: Fixed broken build 2010-12-07 18:56:55 +01:00
Martin Plicht 8ddeb8ebdb Some fixes to C4SoundLoaders 2010-10-02 01:06:51 +02:00
Günther Brammer e0ce6798bf Remove a unused function declaration from Stdsurface2
The implementation was removed in the split into Surface2/Surface8, but the
declaration was not removed from the header.
2010-12-05 19:33:20 +01:00
Günther Brammer 75c2b21ee8 GUI: Remove superfluous checks for pGUI 2010-10-30 01:47:50 +02:00
Günther Brammer 57f39cf645 X11: Remove duplicate OnResolutionChanged calls 2010-12-05 17:17:03 +01:00
Armin Burgmeier cfad8f67cd Order submeshes so that opaque ones are rendered before non-opaque ones 2010-12-04 23:33:05 +01:00
Günther Brammer aa0cef3a8d win32: Replace most BOOL usages
The callbacks apparently changed for 64 bit support, and
RegisterWindowClass is just a simple C++ function. Unfortunately, there's
one callback left.
2010-12-03 20:25:17 +01:00
Sven Eberhardt ec2fad98c5 fix OpenGL drawing after a new context has been created (#450) 2010-12-03 20:18:36 +01:00
Tobias Zwick 07d899bb0b line endings to unix format 2010-12-02 00:41:47 +01:00
Tobias Zwick 952f6b193c fixed new update system 2010-12-01 23:00:56 +01:00
Nicolas Hake 4faacde682 win64: Fetch correct update package 2010-11-18 20:45:28 +01:00
Nicolas Hake 59594a9ef2 Default all unowned ColorByOwner objects to blue (#486) 2010-11-15 12:22:08 +01:00
Günther Brammer 9494b90fe8 win32: Copy, paste and type arbitrary Unicode characters 2010-11-04 02:08:02 +01:00
Nicolas Hake f7588418c1 gl: Fixed incorrect delete on surface unlock 2010-10-11 18:17:58 +02:00
Günther Brammer ecf6fa550e Move viewport to landscape coordinates translation to common code
I should have done this two years ago when introducing zoom. Sorry for the
bug this has caused.
2010-10-10 18:45:00 +02:00
Peewee 3f11e47642 win32: Fix incorrect EditCursor offset (#81) 2010-10-06 18:34:19 -04:00
Günther Brammer 9bf3288c77 Rewrite ParseCommandLine to work on argc/argv instead of a single string
Using the standard utility function on windows to split the line and the
operating system provided argc/argv on the others.

Also move the function to C4Application. It's not a huge win because the
flags are spread out between C4Game and C4Application pretty evenly, but
eventually most of them should move to a more appropriate place.
2010-10-04 21:39:19 +02:00
Günther Brammer b8f8efa2d7 Move C4GraphicsSystem::SetGamma and friends to CStdDDraw 2010-10-01 23:36:48 +02:00
Nicolas Hake 75a723ec8b fmod: Fixed incorrect sample length calculation (#437)
The crash was caused by an incorrect integer division in the sound
loader that was supposed to be a double division. Sounds shorter than
a second were reported to have zero length because of this, leading
to a division by zero in the playback code.
2010-10-02 18:48:43 +02:00
Günther Brammer 2aa2712bfc Move C4GraphicsSystem::MouseMove to C4GUI::Screen
The function mostly operated on C4GUI::Screen anyway.
2010-09-29 23:58:59 +02:00
Günther Brammer 93a1e82907 Split out viewport stuff from C4GraphicsSystem to a new C4ViewportList 2010-09-29 03:44:05 +02:00
Günther Brammer 9f0ba09c04 Split C4Viewportwindow out of C4Viewport.h/cpp 2010-09-28 21:29:00 +02:00
Günther Brammer 8e2ae2f543 Replace Application.DDraw with lpDDraw everywhere
There's no need for two globals always storing the same value.
2010-09-28 20:35:26 +02:00
Günther Brammer a7e4dd9a9c Rename some fullscreen flags to editor 2010-09-28 20:16:33 +02:00
Günther Brammer c4a5039561 Move the last remnants of CDDrawCfg to Config.Graphics 2010-09-28 19:07:47 +02:00
Nicolas Hake bfd803bd54 cmake: Remove useless NULL_IS_NULLPTR_T check 2010-09-29 23:14:08 +02:00
Martin Plicht 37703d7ae6 Mac: Add FSEvents implementation of C4FileMonitor 2010-09-29 00:17:56 +02:00
Nicolas Hake 780873c25f fmod: fix memleak in error path of soundloader
When the FMOD sound loader is unable to get the frequency of a loaded
sample, the sample was not freed, leading to a memory leak.
2010-09-28 23:50:31 +02:00
Nicolas Hake d89857de86 Fix FMOD sound loader 2010-09-28 04:54:35 +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 e6ad5d3bd4 Object Draw: Really fix message display 2010-09-25 22:52:43 +02:00
Tobias Zwick d11a4f92ec fix msvc build 2010-09-24 20:23:27 +02:00
Günther Brammer 3dde77508a Object Draw: Account for parallaxity when zooming
Also zoom a parallax sky correctly.
2010-09-24 19:51:34 +02:00
Armin Burgmeier bd2f63bf1d Add an option to build against GTK+ 3 2010-09-22 17:11:19 +02:00
Julius Michaelis c80fcf1a62 correct out of screen coordinates for console windows (#288) 2010-09-17 14:07:12 +02:00
Armin Burgmeier d1dcffc86b Animation mirroring: Mirror all bones, not just .R and .L ones (#402)
Except those ending on .N
2010-09-14 00:18:25 +02:00
Günther Brammer cf92ceae2d Merge branch 'norefs'
Conflicts:
	planet/Melees.c4f/Ruins.c4s/ObjectFade.c4d/Script.c
	planet/Objects.c4d/Goals.c4d/KingOfTheHill.c4d/Script.c
	planet/Objects.c4d/Goals.c4d/LastManStanding.c4d/Relaunch.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/BlackPowder.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Coal.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Earth.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Firestone.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Gold.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Ice.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Loam.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Metal.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Ore.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Rock.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Snow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Sulphur.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Resources.c4d/Wood.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Axe.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Balloon.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Barrel.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Boompack.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/PowerLine.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/CableReel.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Dynamite.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Fuse.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Igniter.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/DynamiteBox.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Hook.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Rope.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/GrappleBow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Hammer.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/JarOfWinds.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/OrbOfTelekinesis.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Pickaxe.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/PowderKeg.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/LadderGrabber.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/LadderSegment.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Ropeladder.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Tools.c4d/Shovel.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Arrow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Bow.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Club.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Javelin.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Ammo.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Musket.c4d/Script.c
	planet/Objects.c4d/Items.c4d/Weapons.c4d/Shield.c4d/Script.c
	planet/Objects.c4d/Vehicles.c4d/Cannon.c4d/Script.c
	planet/Objects.c4d/Vehicles.c4d/Lorry.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Flag.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/FlagGoal.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/MenuDeco.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/ObjectRestorer.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/TutGuide.c4d/Script.c
	planet/Tutorial.c4f/Tutorial.c4d/TutorialGoal.c4d/Script.c
	planet/Tutorial.c4f/Tutorial03.c4s/ShootTheTargets.c4d/Script.c
	src/game/object/C4Def.h
2010-09-11 19:30:45 +02:00
Armin Burgmeier 5819c34211 Create a mirror animation for each animation ending on .R or .L (#401) 2010-09-09 22:40:07 +02:00
Günther Brammer bf9137149c Script: Initial proplists are readonly at runtime
That way, recreating them from game data during savegame load won't
suddenly revert changes, because there aren't any changes.
2010-09-08 14:54:39 +02:00
Armin Burgmeier 8251dad78b Apply zoom to SolidMask display (#370) 2010-09-07 17:00:27 +02:00
Nicolas Hake 3f1b1cb6f1 win32/opengl: Restore resolution on task switch from fullscreen mode 2010-09-05 15:07:45 +02:00
Nicolas Hake f4ef69ad76 win32/opengl: Enable dynamic window resizing 2010-09-05 14:10:05 +02:00
Armin Burgmeier debdde267e Cleanup: Set texture coordinates directly in CStdDDraw::Blit 2010-09-04 18:17:59 +02:00
Armin Burgmeier 234f25edbe Use non-square textures for surfaces when appropriate (#396)
This fixes #396 because every surface can now be composed of textures of the
exact same size that is required so GL_CLAMP_TO_EDGE can avoid accessing
non-used pixels when interpolating
2010-09-04 19:30:45 +02:00
Armin Burgmeier 251de34dd4 Add a TODO comment about properly applying clrmod/additive/mod2 on meshes 2010-09-01 20:53:32 +02:00
Armin Burgmeier e4de82a789 Add flags paramater to AttachMesh with an AM_DrawBefore flag (#391)
This fixes drawing of the Clonk in the cockpit of the airplane
2010-08-31 23:44:56 +02:00
Tobias Zwick 88f534771c Merge after Backout of 8b7ff234a603 (Windows+OpenGL didn't work in fullscreen anymore) 2010-08-14 18:54:28 +02:00
Tobias Zwick b2e744519e Backed out changeset: 8b7ff234a603 2010-08-14 18:52:01 +02:00
Armin Burgmeier e647e8862f Make XML loader work for slightly different formatted mesh files 2010-08-14 15:32:09 +02:00
Armin Burgmeier 10ad4ce70b Optimize the face ordering comparisation function 2010-08-14 12:38:15 +02:00
Armin Burgmeier 22386f7b1b Enable blending for clrmod with alpha<255 (#338) 2010-08-14 12:23:45 +02:00
Günther Brammer 95408be00a OpenGL: Print some information about the OpenGL implementation on error 2010-08-03 19:02:00 +02:00
Günther Brammer 5477a6fb6d Set the video mode before initialising OpenGL
This will further complicate a D3D port, but is the correct
solution for SDL.
2010-08-02 20:08:32 +02:00
Armin Burgmeier 1ae9b9469b Refuse to load meshes with empty bounding box (#341) 2010-08-04 22:30:15 +02:00
Armin Burgmeier 04f3bf4dc9 Apply Mesh/PictureTransformation in the meshes' frame of reference
This allows drawing meshes into a distorted target area by using the
transformation matrix.

This change might change the picture graphics of several objects. I fixed the
most important ones, others are still good but there might be a few more out
there that need to be updated.
2010-07-21 22:23:34 +02:00
Armin Burgmeier a52ae4e2c9 Apply scale in modelview matrix 2010-07-21 21:57:08 +02:00
Armin Burgmeier 3da1963f31 Fix lighting of two-sided polygons 2010-07-20 01:33:49 +02:00
Nicolas Hake b5e1ae2a65 Remove automatic scaling to bounding box (#321) 2010-07-10 21:49:31 +02:00
Nicolas Hake ea2ab2740a Re-enable mesh scaling (#320) 2010-07-08 16:21:44 +02:00
Nicolas Hake d8b97e964d win32: Fix build 2010-06-29 14:10:42 +02:00
Günther Brammer e109df627c Remove a lot of old obsolete palette code
Hardcode the few remaining palette references instead. We might want to
include some method to customize some colors again, but not for debug
display and such things.
2010-06-29 01:02:16 +02:00
Günther Brammer a7389bcef1 X11: Initial window size from config 2010-06-27 02:42:48 +02:00
Günther Brammer c0ce4d613b Make the startup progress bar more accurate
This should also simplify the startup code a bit. Not enough,
but it's a start.
2010-06-27 02:42:48 +02:00
Günther Brammer db6f4f502a Remove GDI font renderer, simplify font loader
Instead of having a list of fonts, simply look up the font file if
necessary, and cache the freetype library state for one font.
2010-06-27 02:30:47 +02:00
Günther Brammer 08b4858bd9 Fonts: Move the FontLoader into the global namespace
This speeds up recompilation when C4Fonts.h changes.
2010-06-27 02:21:23 +02:00
Günther Brammer 31e3293b84 Fonts: Remove support for prerendered bitmap fonts 2010-06-27 02:21:23 +02:00
Armin Burgmeier cb39d6c228 Sort triangles by nearest Z instead of mean Z (#303) 2010-06-26 21:20:10 +02:00
Nicolas Hake 3579a948b1 Update binary mesh loader file format documentation 2010-06-22 00:39:54 +02:00
Armin Burgmeier 4619179fe1 Remove debug logs on mesh loading (#308) 2010-06-22 00:19:42 +02:00
Stan 61a3e4569c win32: Use unrotated display modes only (#306) 2010-06-11 09:21:30 +02:00
Armin Burgmeier e282de55f1 Add support for scene_blend in material scripts (#303) 2010-06-09 00:55:34 +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 9f65838ae8 Fix a couple of compiler warnings 2010-04-28 23:43:25 +02:00
Armin Burgmeier 2527f9316c Don't exceed 60 degrees of FOV in either direction
This makes a difference in scaling for non-quadratic target areas.
Related to #279.
2010-04-28 21:30:15 +02:00
Günther Brammer 0f4e88db87 Improve the default Zoom and Zoom changes
The default Zoom should now show a piece of the landscape about the size of
one Clonk's vision.
2010-04-27 01:32:45 +02:00
Günther Brammer 349e463abd Fall back to the default font if the configured one doesn't load 2010-04-27 02:54:37 +02:00
Nicolas Hake 46ece7030e Use <cmath> M_PI instead of own "pi" constant
This solves a conflict with a definition with the same name within Apple SDK
headers (thanks, Mortimer)
2010-04-24 17:40:41 +02:00
Armin Burgmeier bb2c4a8ab4 Define WINVER and others early to avoid redefinitions 2010-04-23 19:53:30 +02:00
Benjamin Herr 224ab1b11b C4FileMonitor(win): use StdBuf::DeletePointer()
... on memory GrabPointer()ed from a StdCopyStrBuf. Fixes the previous
commit.
2010-04-22 14:27:15 +02:00
Benjamin Herr 838f0793ff C4FileMonitor(win): use free() instead of delete
... on memory malloc()ed by a StdCopyStrBuf.
2010-04-22 14:27:15 +02:00
TomyLobo 92e506f458 Changed C4GamePadControl::Execute() to C4GamePadControl::Execute(bool send_axis_strength_changes) to match declaration. 2010-04-22 11:39:13 +02:00
Sven Eberhardt 6158aec581 Removed internal score counting by player wealth/owned objects
Unified and renamed all Points/Value/Score functions/field names into Score
Some MSVC warning fixes
2010-04-21 21:12:49 +02:00
Nicolas Hake 5dc0d3b4cb Reduce value truncation warnings 2010-04-20 18:20:24 +02:00
Armin Burgmeier 70ac17c040 Mingw64 build fixes 2010-04-18 22:02:01 +02:00
Armin Burgmeier 57a2d20c4e Apply FoW to mesh graphics (#84) 2010-04-10 13:46:51 +02:00
Peter Wortmann 98c34b4fd3 Fixed a few warnings about booleans 2010-04-07 03:12:28 +02:00
Armin Burgmeier ffcefc82d4 Make drawing meshes additively and with mod2 work (again?) 2010-04-05 17:02:41 +02:00
Armin Burgmeier 2efb1c2705 Fix inverted SolidMask (#132) 2010-04-05 14:38:25 +02:00
Armin Burgmeier 4fd6f23809 Fix build with gcc 4.2 2010-04-03 12:44:59 +02:00
Armin Burgmeier babacbcc5f Implement material script inheritance
abstract is not supported yet
2010-04-02 22:49:39 +02:00
Armin Burgmeier 94389f3940 Fix build with MSVC 2010-04-02 15:15:58 +02:00
Armin Burgmeier c2924041c9 Fix seperate->separate everywhere 2010-04-01 23:08:06 +02:00
Armin Burgmeier 6b53d75997 Implement mesh serialization 2010-04-01 23:00:05 +02:00
Armin Burgmeier d52fd9eadb Pass correct poll result (revents) to glib mainloop
This fixes saving games in developer mode on Linux
2010-03-31 19:14:10 +02:00
Armin Burgmeier c8c26a0933 StdScheduler: Only execute timeouts after all events have been processed (#207) 2010-03-30 16:16:27 +02:00
Benjamin Herr 4378de147c Rerun astyle with missing \ added 2010-03-28 20:58:01 +02:00
Benjamin Herr 27287b981f Reformat everything according to style guidelines
as per http://forum.openclonk.org/topic_show.pl?tid=208
and http://wiki.openclonk.org/w/Style_Guidelines
via astyle
  --brackets=break
  --indent=tab=2
  --keep-one-line-statements
  --keep-one-line-blocks
  --indent-namespaces
  --convert-tabs
  --recursive
  --exclude=zlib
  --exclude=tinyxml
  src/\*.h src/*.cpp
2010-03-28 19:58:21 +02:00
Günther Brammer b4e37b070b Change all indentation with spaces to use tabs instead
This is a whitespace-only patch. Hopefully, it'll only affect rarely-changed
parts of the engine, since all regularly maintained pieces should already
use tabs.
2010-03-27 17:05:02 +01:00
Armin Burgmeier 3fd0be11cb Fix a memleak in the mesh loader 2010-03-25 13:38:52 +01:00
Armin Burgmeier 21fa993d10 Fix meshes as overlay graphics (#203) 2010-03-25 12:27:35 +01:00