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

241 Commits (544c1cbb4bb6da97d30571ff28772660c7ad5969)

Author SHA1 Message Date
Sven Eberhardt f50e2e9e3a Fix scroll bars in zoomed editor viewports on Windows. 2014-12-14 16:08:56 +01:00
Sven Eberhardt 8df39d06e4 Fix texture preview in editor tools dialogue on Windows. 2014-12-14 15:20:57 +01:00
Armin Burgmeier 56b19ac065 Fix brush preview in GTK+ developer mode 
This looks like an artifact from when the alpha channel was inverted.
 2014-11-24 16:32:25 -05:00
Martin Plicht b2fcc2ee32 C4EditCursor: Instead of manual list traversal use iterator 2014-10-25 21:26:06 +02:00
Martin Plicht 03f43f462b C4ObjectList: Replace trivial cases of manual list traversal with iterator usage 2014-10-25 21:25:52 +02:00
Armin Burgmeier a597dc28d7 Use PerformMultiLines where appropriate 2014-10-08 18:33:46 -04:00
Armin Burgmeier 05a3e86472 Make C4EditCursor use PerformMultiPix instead of DrawPix for selection frame 2014-10-08 18:33:45 -04:00
Kevin Zheng 6a1a551d01 Clean up deprecated headers and functions 
"gdk_pixbuf_unref has been deprecated since version 2.0 and should not be
used in newly-written code. Use g_object_unref()."

sys/timeb.h isn't used anymore since 2005.
 2014-05-27 00:30:20 +02:00
Günther Brammer 04e1c74c05 Merge Call fix commit 2014-04-19 19:02:27 +02:00
Günther Brammer 22016e075f Replace some usages of C4ID with C4Def* 
In particular those that made the c4script shell depend on C4Id.cpp.
 2014-04-19 19:02:22 +02:00
Julius Michaelis 2c7d9c0549 Fix a load of warnings (two were actual errors, only in diagnostics though) 2014-04-17 19:24:41 +02:00
Maikel de Vries db8e639b3e Fixed some Clonk 4 string occurrences in C4Console 2014-03-20 21:16:27 +01:00
Martin Plicht 3d9c965ebd mac: C4Particles: glGenVertexArrays fix for Mac OS X 2014-01-23 17:52:19 +01:00
Nicolas Hake e0dc30c59a Update copyright notices 
As discussed in http://forum.openclonk.org/topic_show.pl?tid=2917, I
have merged all copyright notices into a single file and referenced that
merged file from each source file.

For the updated source files, the timeline has been split into three
parts:
 1. Pre-RWD code (before 2001)
 2. RWD code (2001 through 2009)
 3. OpenClonk code (2009 and later)
All pre-RWD copyright notices have been left intact, as have RWD-era
copyright notices where the file did not have a RedWolf design copyright
notice but only individual author ones. All copyright notices of the
OpenClonk era have been replaced by a single notice ranging from the
first recorded year to the current year (2013). Mape code did not get a
OpenClonk Team copyright notice because it is somewhat separate from the
main OpenClonk codebase and has only been touched by Armin Burgmeier.
 2013-12-23 13:03:19 +01:00
Tim Blume 240193ad5a Remove remains of Direct3D support 
Direct3D hasn't worked for more than a year now, and there don't seem to
be any efforts to revive it. Remove it and concentrate on better OpenGL
support.
 2013-11-02 21:39:34 +01:00
Martin Plicht 7ba5333f8b mac: C4ConsoleGUI: Implement SetInputFunctions 2013-10-05 13:19:59 +02:00
Nicolas Hake 5254302547 Win32/Editor: Use StdCopyStrBuf for Common Dialog buffers (#975) 
Change StdStrBuf usage to StdCopyStrBuf because FileSelect tries to
get a non-const pointer to its data, which correctly asserts when called
on a StdStrBuf that references const data.

Closes #975.
 2013-09-14 21:09:04 +02:00
Nicolas Hake 7e260aa9de Remove C4ControlScript::fInternal 
fInternal basically acted as a reverse "evil bit" as in RFC 3514: when
set, the engine would not do any checks on the script contained in the
control packet, nor log the script (visibly in game; the packet log
would of course contain the packet). A malicious game client thus would
be able to inject arbitrary script without people (immediately) noticing
anything was amiss.

As of this patch, only the host is able to execute arbitrary scripts,
and those will be shown in the message board for all players to see.
This privilege can be irrevocably disabled in network games by any
client by using the "/nodebug" message board command.

Closes #936.
 2013-09-04 20:18:06 +02:00
Nicolas Hake ef9f79d815 Fix GTK build 2013-09-04 19:57:26 +02:00
Nicolas Hake 7e70554a04 Use control packet for more editor mode actions 
Actions changed include dropping definitions, (de-)selecting objects,
player elimination. This removes some more pre-assembled C4Script code
going across the network unchecked.

Part of #936.
 2013-09-04 17:51:55 +02:00
Günther Brammer 9506c5ad97 Merge branch 'scancodes' 2013-05-24 17:47:59 +02:00
Günther Brammer 71d9e3c9e3 editor: Recognize pressing shift and alt in viewport again 2013-03-24 22:10:11 +01:00
Günther Brammer 346842470d Clean up some superfluous includes 2013-03-24 18:33:01 +01:00
Sven Eberhardt c64afb8626 Win32: Fix broken "Save as..." dialog in editor mode when engine is started with forward slashes in scenario path 2013-03-19 00:36:05 +01:00
Günther Brammer 2a9d63cb2a gtk: Use higher-resolution logo as window icon 
Metacity started to display bigger icons in the window list, so the higher
resolution is now actually useful for me. While at it, use gdk-pixbuf-csource
to generate the .h at build time from the .ico instead of duplicating the
data in the repository.
 2013-02-12 01:08:02 +01:00
Sven Eberhardt 06e70b7b74 Synchronized EditCursor(De)selection, so you can edit scenarios in network mode and/or record it. 2013-01-15 23:30:23 +01:00
Sven Eberhardt f51a085592 Added object callbacks EditCursorSelection and EditCursorDeselection. Useful to show or hide developer stuff in the editor. 2013-01-15 23:10:25 +01:00
Günther Brammer 864c5c7ea8 copyright notices update 2012 2013-01-12 16:31:40 +01:00
Günther Brammer 95de10f6a8 editor: Fix USE_CONSOLE 2012-11-16 00:05:58 +01:00
Sven Eberhardt 41cff7ad92 Editor: Fix handling of erronous map indices by material picker 2012-10-28 15:23:45 +01:00
Martin Plicht 4f8effcd10 mac: Fix editor window 2012-10-14 19:45:39 +02:00
Sven Eberhardt db84b849b1 /sound reenabled. Sound-creating client now shown in client list box (F4). No sounds played when client is ignored. 2012-10-13 13:37:59 +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
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 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 f6825d073e mac: Compile with Automatic Reference Counting enabled 2012-09-02 13:56:53 +02:00
Günther Brammer 5a2831a1e7 editor: Increase default viewport size to 800x500 
This should allow one to place four viewports plus the console and the
property/tool window on a 1920x1080 screen.
 2012-08-19 21:01:54 +02:00
Günther Brammer 2fded23a1b Editor: Get function autocomplete names from proplists instead of scripts 2012-05-18 17:49:38 +02:00
Martin Plicht daabc5be16 mac: Fix compilation 2012-05-01 15:05:43 +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
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 7632c823fe gtk: Drop compatibility with GTK versions older than 2.18 2012-04-18 00:37:31 +02:00
Günther Brammer bc5e77d9d0 Simplify C4Game::FindObject 
It isn't exposed to script anymore, and the internal users don't use most
features. This might even speed up lava-in-oil a bit.
 2012-04-15 23:32:37 +02:00
Nicolas Hake cbbcf200cf win32: Build fix 2012-04-15 13:22:58 +02: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 c865021716 gtk: Fold C4GtkWindow into C4Window 2012-04-11 04:15: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 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 9177c3e515 mac: Fix some Xcode warnings 2012-03-22 01:19:10 +01:00
Martin Plicht 6d21e74dab elsif shmelsif 2012-03-20 18:32:21 +01:00
Martin Plicht da7b38c263 C4EditCursor.h: Definition of ObjselItemDt contains platform specific thingies again 2012-03-20 17:30:41 +01:00
Martin Plicht a8cadb8723 Amazing fixes to make it compile for Mac again 2012-03-20 16:38:45 +01:00
Julius Michaelis 489255f7b5 Editor mode: Allow moving objects which are selected but covered by other objects 2012-03-17 18:10:36 +01:00
Julius Michaelis dee0811b23 Add an option to select an arbitrary object under the cursor via context menu to windows console mode 
Follow-up for 73a05d70b206
 2012-03-15 13:58:56 +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 3ec624bb7a win32: Clean up some leftover old frontend User Messages 2012-03-04 19:15:16 +01:00
Günther Brammer 89bf0fc35a Remove obsolete C4ConsoleGUI::SetCaption wrapper 
The old windows editor is gone and doesn't need to find the engine with
FindWindow anymore.
 2012-02-29 23:49:45 +01:00
Günther Brammer dfea0914a9 Merge the functions pointer branch 2012-03-09 17:42:48 +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
Julius Michaelis b4dba5b255 Add an option to select an arbitrary object under the cursor via context menu to gtk console mode 2012-01-27 23:01:37 +01:00
Günther Brammer 0cd46a2ebc Wrap C4AulFunc::Name in C4AulFunc::GetName() 2011-10-14 00:40:55 +02:00
Armin Burgmeier e44b216230 Enable face ordering individually for all submeshes 2011-10-15 21:35:39 +02:00
Günther Brammer 469eb4ddbc editor: Do copy the scenario before saving as a scenario 
The deletion only happened when saving as a savegame.

C4Console::SaveScenario also is a much more natural place to do the
copying, since it already contained the part where the new path was copied
to Game.ScenarioFilename.
 2011-10-12 20:47:08 +02:00
Martin Plicht d5c94ae089 Mac: Fix some compiler errors caused by class renamings (C4AbstractApp etc) 2011-10-09 19:33:14 +02:00
Günther Brammer 1cafba4be8 Rename files implementing C4AbstractApp and C4Window 2011-10-03 17:19:24 +02:00
Günther Brammer 2b6f4432de Rename lpDDraw to pDraw 2011-10-03 16:30:18 +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 f4ff47239f Rename CBltTransform, CBltVertex, CBltData, CPattern and CGammaControl 2011-09-30 22:15:51 +02:00
Günther Brammer 8039a35791 Rename CStdApp to C4AbstractApp 2011-08-27 16:20:39 +02:00
Günther Brammer 1f160083d7 editor: Do not copy and delete the scenario before saving 2011-09-28 01:10:31 +02:00
Günther Brammer b2e9fcd13e win32: FormatMessage now produces an utf-16 error message 2011-09-21 22:20:52 +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
Günther Brammer 69225246f1 editor/gtk: Also open the properties dialog when switching to edit mode 
And remove the last remains of the win32 implementation, too.
 2011-08-30 20:21:19 +02:00
Nicolas Hake 5c243fb048 win32: Always open property dialog when switching to C4CNS_ModeEdit (#635) 2011-08-30 15:23:49 +02:00
Nicolas Hake 0d61cf0fe2 win32: Correctly recode strings to UTF-16 in editor mode (#631) 2011-08-19 22:03:03 +02:00
Günther Brammer 4d1238beb4 win32: Use Unicode APIs for File manipulation 2011-04-02 18:45:44 +02:00
Tobias Zwick 221aae1bf5 fixed some ridiculous formatting of consts 2011-08-04 01:30:37 +02:00
Günther Brammer c4f16d42ce Initialize some uninitialized variables 2011-07-18 02:12:37 +02:00
Günther Brammer 6e5332517d editor: File/Save (As) again uses Game.ScenarioFile for saving (#611) 
This should make it work again without having to understand what exactly
went wrong.
 2011-06-24 14:25:30 +02:00
Günther Brammer c70013b208 editor: File/Save Game As correctly preserves the Origin 2011-05-15 19:40:14 +02: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 e537296829 editor: Change FileSelect abstraction to use StdStrBuf 
Of course, windows still uses a buffer on the stack, but at least the other
versions don't.
 2011-04-08 23:52:40 +02:00
Nicolas Hake ab2be9b53f win32/msvc: Fix build 2011-04-05 18:03:27 +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 b5dea20dae Remove some dead code 2011-03-27 18:15:10 +02:00
Günther Brammer 05146718c0 Remove RECT structure from platformindependant code 2011-03-13 20:45:30 +01:00
Günther Brammer 6c2a89eaf8 Replace timeGetTime with a platformneutral GetTime wrapper 2011-03-13 17:25:35 +01:00
Armin Burgmeier 884809e8f2 Merge filename extension changes 2011-03-13 17:15:40 +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 e282bf9a9c Change .c4s extension to .ocs 2011-03-13 16:11:55 +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