marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,425 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

619 Commits (35f31a7c1d402c6f0a4c2711b147374b96f146ec)

Author SHA1 Message Date
Julius Michaelis 69bbc6b4d1 Fix resolution reset in editor mode and on tabbing out 
Win32's SetVideoMode doesn't enumerate display modes anymore for windowed mode
 2012-10-14 13:28:38 +02:00
Martin Plicht 38256bfaac mac: First startup with no resolution configuration uses desktop resolution, resolution switching from options works correctly 2012-10-13 15:01:13 +02:00
Armin Burgmeier 26e7ae3532 Fix crash when changing AA setting on Linux (#744) 2012-10-13 14:15:09 +02:00
Armin Burgmeier 2ce648e5b5 Fix a GTK warning when changing anti-aliasing 2012-10-13 12:49:53 +02:00
Sven Eberhardt 8bdd761027 PlayerControls: Allow usage of keyboard scan codes instead of virtual key names using $%x format (Win32 only) 
Also re-resolves keys if the keyboard layout changed at runtime.
 2012-10-09 00:54:34 +02:00
Sven Eberhardt dada37d70e Sound system: Fix leaking channels when using OpenAL. (This caused sounds to stop after playing for a while) 2012-10-07 17:03:46 +02:00
Sven Eberhardt 6e953acc88 Sound system: Fix endless recursion when a sound couldn't be started due to lack of free channels 2012-10-07 16:34:08 +02:00
Sven Eberhardt 00349f045a SoundSystem: Implement non-apple wav loading when using OpenAL 2012-10-07 13:18:28 +02:00
Julius Michaelis 87854916ba Fix fix: cb043bd90678 
Quickfixes are bad
 2012-10-07 12:42:51 +02:00
Sven Eberhardt 15aa9b961e FIx build using OpenAL in MSVC 2012-10-05 18:02:52 +02:00
Tobias Zwick 41a33999cd remove video playback feature 2012-10-04 23:03:57 +02:00
Julius Michaelis ab880d6bd8 Fix 2c9e6ac9f614 (windows + logic) 2012-10-03 00:54:56 +02:00
Julius Michaelis 023aa90c0e Add config option for automatic windowed/fullscreen switching 2012-09-29 23:49:30 +02:00
Martin Plicht b264612b10 mac: Move C4EditorWindowController from platform to editor 2012-09-02 20:57:49 +02:00
Martin Plicht 562565f865 mac: Move C4OpenGLView.mm/h to graphics/C4DrawGLMac.mm/h and move some C4AbstractApp functions to C4AppMac.mm to better match implementations for the other platforms 2012-09-02 20:51:43 +02:00
Martin Plicht c2c484e70b mac: Rename C4AppDelegate.consoleController to editorWindowController 2012-09-02 16:18:20 +02:00
Martin Plicht 10a328d5ba mac: Change prefix of Objective-C classes/filenames from Clonk to C4, give xib files names that make more sense 2012-09-02 15:39:29 +02:00
Martin Plicht f389fd230c mac: Fix C4FileMonitor implementation by reporting files modified since last 3 seconds 2012-09-02 14:59:30 +02:00
Martin Plicht f6825d073e mac: Compile with Automatic Reference Counting enabled 2012-09-02 13:56:53 +02:00
Martin Plicht f7a26ba1a5 mac: Filter out Cocoa command line arguments that confuse clonk when started from the Xcode debugger 2012-09-02 11:24:49 +02:00
Martin Plicht ee140e4d08 mac: C4Application::SetVideoMode: Use desktop size when passed iXRes=iYRes=-1 2012-09-02 10:51:35 +02:00
Günther Brammer f6db61750e Store the size of the non-fullscreen-window separately 
The size of that window can be adjusted by the player, so there is no need
for a GUI option.
 2012-08-30 00:13:14 +02:00
Günther Brammer cc25878ba6 Default to not changing the resolution 
1. We receive bugreports that changing the resolution doesn't work, but
can't reproduce that
2. Flat screens look best at their natural resolution
 2012-08-19 20:59:01 +02:00
Nicolas Hake 58ac553956 Win32: Do not reset graphics mode if no change is required 2012-08-28 00:01:01 +02:00
Nicolas Hake faf0006a6f Win32: Improve error reporting when changing resolution 2012-08-28 00:00:29 +02:00
Günther Brammer 06cb8b595d win32: Remove obsolete #include multimon.h 
multimon.h was only needed for compatibility with Windows 95.
 2012-07-18 03:40:19 +02:00
Nicolas Hake 59b48f5069 Win32: Accept dropped definition files 
Viewport windows had the required code to hande dropped files, but didn't tell
the window manager they'd accept drag & drop messages.

Also pull a loop invariant out of the loop (drop point can't change while we're
processing the drop message) to save function calls in cases with more than one
dropped file.
 2012-05-23 22:37:07 +02:00
Günther Brammer 1995b59adc win32: C4Window::SetSize calls AdjustWindowRectEx, GUI::Dialog doesn't need to 2012-04-28 15:09:35 +02:00
Günther Brammer 1a29f8625d Reorder engine source file organization a bit 
This mostly consists of flattening the hierarchy, splitting the
graphics stuff out of platform, and a few smaller cleanups.
 2012-04-27 19:04:43 +02:00
Armin Burgmeier e11e9845d1 Fix Windows build 2012-04-23 21:45:01 +02:00
Martin Plicht cd4db8ebaf mac: Remove KeyMask assignment and inline HandleNSEvent 2012-04-23 20:14:42 +02:00
Armin Burgmeier 206f90adbc Pass through key state handling from event callbacks (#745) 
This gets rid of Application.IsAltDown() and friends which was used for
this purpose in C4MouseControl and C4EditCursor. In case non-event
callbacks need to access the state of the modifier keys the state is
now cached in these classes (if it wasn't already).

This new solution is supposed to be more robust, since the key modifier
state comes always directly from the input event. This fixes #745, where
Application.IsAltDown was stuck for some reason.

I updated the Windows and Mac code as well, but wasn't able to test it,
it might not compile and/or not work, in which case please someone fix it :)
 2012-04-22 22:09:06 +02:00
Günther Brammer 075bc3b866 gtk: fix build with glib older than 2.30 2012-04-20 21:09:17 +02:00
Günther Brammer 7632c823fe gtk: Drop compatibility with GTK versions older than 2.18 2012-04-18 00:37:31 +02:00
Günther Brammer f0c545d773 gtk: Fix build with GTK versions older than 3.4 2012-04-18 00:31:48 +02:00
Günther Brammer 3596daad22 gtk: Make mousewheel scroll again 2012-04-17 22:45:11 +02:00
Bernhard Bonigl 63f0a49614 Added new blitmode: GFX_BLIT_Wireframe 2012-04-17 17:29:29 +02:00
Nicolas Hake 368692b7d8 GTK: Build fix 2012-04-15 13:32:13 +02:00
Nicolas Hake cbbcf200cf win32: Build fix 2012-04-15 13:22:58 +02:00
Tobias Zwick 46156e3f1c show tooltip for C4D_MouseSelect using the property "Tooltip" 
+ remove references to the old and obsolete "help mode"
 2012-04-15 12:09:54 +02:00
Günther Brammer e125003aa9 gtk: Deactivate the resize grip on the OpenGL-drawn windows 2012-04-15 01:17:50 +02:00
Günther Brammer ca7c284c85 gtk: Rename C4AppX to C4AppGTK 2012-03-05 00:38:23 +01:00
Günther Brammer 15ebf70ab1 win32: Move C4GUI::DialogWindow platform code to C4WindowWin32.cpp 2012-04-01 22:16:59 +02:00
Günther Brammer 52e0b52ba9 gtk: Remove some obsolete X11 code 2012-04-10 23:39:16 +02:00
Günther Brammer 31b4c1f2fa gtk: Use gtk X11 display connection for glX 2012-04-10 23:39:49 +02:00
Günther Brammer 05cc1490ea gtk: Reimplement C4Window's GetSize, SetSize, SetTitle 2012-04-04 21:05:48 +02:00
Günther Brammer 0a6c9df7f3 gtk: Move the FindInfo functions to C4WindowGtk.cpp 2012-04-01 22:30:55 +02:00
Günther Brammer c102fe19d8 gtk: Use gtk functions to make a window fullscreen 2012-04-10 03:36:09 +02:00
Günther Brammer c865021716 gtk: Fold C4GtkWindow into C4Window 2012-04-11 04:15:33 +02:00
Günther Brammer dc41afded5 gtk: Replace some X11 input event handling 
This regresses because IMs aren't used anymore. GTK+ has its own
IM implementations we should use instead, but for now event->string
is simpler.
 2012-04-09 01:10:21 +02:00
Günther Brammer 5f93869978 gtk: Replace C4FullScreen.cpp X11 code with gtk in C4WindowGTK.cpp 2012-04-10 01:56:20 +02:00
Günther Brammer feb13288fa gtk: Replace C4GUI::DialogWindow XLib with gtk calls 2012-04-04 03:42:33 +02:00
Günther Brammer 86a99ce458 C4Window: Introduce a separate WindowKind for the console window 2012-03-28 19:37:13 +02:00
Günther Brammer 85a75577e3 gtk: Move some C4ViewportWindow gtk code to C4WindowGTK.cpp 2012-04-09 01:15:30 +02:00
Günther Brammer c5f3cf88ae gtk: Use gtk clipboard functions instead of our own code 2012-03-26 00:43:09 +02:00
Günther Brammer a7330097f6 win32: Move parts of WM_ACTIVATE handling from CStdGL to C4Window 2012-04-07 21:33:39 +02:00
Armin Burgmeier 6238c1d5be Fix mesh rendering crash when previous GL operation enabled color array (#739) 2012-04-09 22:03:55 +02:00
Armin Burgmeier 7efd7f9df5 Replaced glInterleavedArrays by gl*Pointer 2012-04-07 16:47:23 +02:00
Martin Plicht 20343b4628 mac: Fix mouse movement. Again 2012-04-04 08:44:37 +02:00
Martin Plicht 26fec4ca89 mac: Lion: More fullscreen/mouse movement fixes, hopefully the mouse now actually works in-game and moving mouse into screen corners does not trigger mission control or whatever else is set as hot corner actions. Remaining problem is that when activating mission control with the clonk window active, the user cannot move the mouse cursor since it's still stunned by CGAssociateMouseAndMouseCursorPosition(FALSE) 2012-03-29 00:43:03 +02:00
Martin Plicht 397557f1e1 mac: Gamma: Don't maintain conversion table (what was I thinking?) 2012-03-29 13:30:36 +02:00
Martin Plicht c02f334d15 mac: Switch to game window when application activated 2012-03-28 22:38:33 +02:00
Martin Plicht 50e6e497b1 mac: Lion: Fix mouse movement when scrolling (grunt) 2012-03-28 15:03:25 +02:00
Martin Plicht e25351ed04 mac: Lion: More mouse shenanigans to suppress hot corner actions when in fullscreen mode 2012-03-28 14:50:50 +02:00
Martin Plicht f1c7ceeb75 mac: Lion: Restore not redrawing the window when in fullscreen mode and inactive 2012-03-24 19:43:50 +01:00
Martin Plicht ef289a0c60 mac: le typo 2012-03-25 12:52:48 +02:00
Martin Plicht 01530ea3b1 mac: Add key codes for "Backslash", "Comma_US" and "Less" 2012-03-23 18:11:46 +01:00
Martin Plicht db6009d8b1 mac: Fix exclusive dialogs not clickable in game mode 2012-03-25 12:08:06 +02:00
Günther Brammer 40de33ca3c win32: Make sdl-mainloop option work 
As it doesn't have the editor, this is only useful for compiling
more of our code on more platforms.
 2012-03-23 22:53:56 +01:00
Günther Brammer 25bbaef7d2 sdl-mainloop: Draw things again 2012-03-25 01:54:07 +01:00
Martin Plicht 160e214196 mac: Silly pinch gesture in mainmenu to toggle fullscreen mode Lion-compatible 2012-03-23 00:21:03 +01:00
Martin Plicht aaa5a71e4b mac: Support Lion FullScreen 2012-03-23 00:03:05 +01:00
Martin Plicht 62f7540b2d mac: Turns out, shift+mouse actions were never properly processed. Whoops 2012-03-22 21:08:19 +01:00
Martin Plicht 9177c3e515 mac: Fix some Xcode warnings 2012-03-22 01:19:10 +01:00
Martin Plicht a8cadb8723 Amazing fixes to make it compile for Mac again 2012-03-20 16:38:45 +01:00
Martin Plicht 379836f32c cmake: mac: Don't require rt library 2012-02-14 16:25:23 +01:00
Martin Plicht 12af060162 ClonkAppDelegate: Config.Load without parameters 2011-10-16 16:25:38 +02:00
Martin Plicht 5b67e90830 mac: Game window: Zoom to actual backing store size 2011-10-16 16:14:35 +02:00
Martin Plicht d86b7d36b0 Mac: Handle various quit messages gracefully 
*Not quitting immediately when in a game but just showing the Exit dialog
*React to Dock Quit menu item and Tab-Switcher Cmd+Q
 2011-10-16 16:12:37 +02:00
Martin Plicht e7878038c8 mac: Use standard localization facility for addon installation dialogs + put addons into preferred installation location (Library/Application Support) 2011-10-16 16:09:05 +02:00
Martin Plicht 12f2ca9c2e mac: Restore addon-installation behaviour + Open scenarios contained in Reloc paths 2011-03-20 07:04:49 +01:00
Sven Eberhardt 6b203c2fe1 MSVC compile warning fix 2012-03-18 17:25:27 +01:00
Günther Brammer 9f0370f26c win32: fix infinite recursion in editor viewport initialization 
Even the most trivial of code moving can result in bugs.
 2012-03-15 15:58:32 +01:00
Günther Brammer b895bbad31 Consolidate some random platform abstraction functions into a single file 
That way, the windows variants can be used without requiring the Win32
C4Window implementation.
 2012-03-12 20:43:27 +01:00
Günther Brammer 1929e8d779 linux: add CLOEXEC flag to miscellaneous calls 2012-03-05 02:48:27 +01:00
Günther Brammer b4fd8fcd15 linux: Add O_CLOEXEC to various open calls 
This should prevent some file descriptor leakage from forks that
some libraries we use do.
 2012-03-05 01:33:02 +01:00
Günther Brammer 4bc309122d Refactor C4Viewport::Init and C4ViewportWindow::Init a bit 2012-03-04 22:45:00 +01:00
Günther Brammer ea66890086 win32: Move fullscreen and viewport WndProcs to C4WindowWin32.cpp 2012-03-04 22:41:35 +01:00
Günther Brammer 8e8e965b8b win32: #define _UNICODE 
We apparently do not use any of the C library function this affects, so
this only silences some warnings some versions of some windows headers
produce when only UNICODE is defined.
 2012-03-04 19:16:30 +01:00
Günther Brammer ae322aa847 Remove some dead code 2012-03-04 21:44:20 +01:00
Günther Brammer 19eefbc777 Move Gammaramp code from CStdGL to C4AbstractApp 
The windows code now has to delegate to StdD3D like it does for the
resolution setting, but for the other ports the code fits much better in
the app source files.
 2012-02-28 20:40:19 +01:00
Günther Brammer b7f7c933b1 Remove unused Application.DoNotDelay 2012-03-11 23:06:23 +01:00
Günther Brammer afe5411709 linux: Replace Application.Location with readlink("/proc/self/exe") 2012-03-11 23:01:21 +01:00
Günther Brammer b4439ac1b7 Remove unused C4AbstractApp::ClearClipboard 2012-02-28 01:37:26 +01:00
Günther Brammer dfea0914a9 Merge the functions pointer branch 2012-03-09 17:42:48 +01:00
Julius Michaelis ed5d615aab Check for OpenGL Version 1.2 and two functions from 1.3 instead of requiring full 1.3 (#692) 2012-03-03 23:25:50 +01:00
Armin Burgmeier fa7e922321 Fix rendering of mesh pictures to non-square target rectangles 
This is still not perfect yet, but I suppose to get better we'd need
to compute the bounding box of the transformed mesh.
 2012-03-03 01:45:46 +01:00
Armin Burgmeier 7f5f916e76 Draw only partial set of faces for buildings in construction 2012-02-26 01:09:42 +01:00
Armin Burgmeier de67769065 Fix crash when C4Draw::Blit was called with NULL source surface (#721) 2012-02-26 01:01:55 +01:00
Armin Burgmeier 9d94b1da6e For scaled sprite graphics, don't interpret Picture coordinates as scaled 
Otherwise an object with a scale of 5 and a picture of 64x64 (such as the
Metal and the GoldBar objects) cannot properly set the picture rectangle.
 2012-02-25 17:35:24 +01:00