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

1158 Commits (55db5fa98afa9a64678a1b5f2a9a9d41e8bb5888)

Author SHA1 Message Date
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 506466ef2e Remove the jpeglib.h versus windows.h/rpcndr.h boolean workaround 2011-03-11 14:37:51 +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
David Dormagen e30811c7c2 removed obsolete FnIncinerate 2011-03-12 22:10:28 +01:00
David Dormagen fa733be978 FirePhase fix and further performance improvements on the fire effect 
that means it looks sooo GWE now.
 2011-03-12 20:49:36 +01:00
David Dormagen 5577766ab1 line endings fixed 2011-03-12 19:29:25 +01:00
David Dormagen 3bd3a1fcbb most of the fire stuff removed from the engine 2011-03-12 18:38:47 +01:00
Armin Burgmeier 52c2227cef Merge 2011-03-12 14:12:14 +01:00
Armin Burgmeier fd2b981547 Backed out changeset: b019ea52537e 
Breaks build with more recent jpeglib such as used by nightly builds
 2011-03-12 14:12:04 +01:00
Armin Burgmeier 68c214dd98 Make player file saving work again 2011-03-12 13:55:05 +01:00
Armin Burgmeier 6e025ee4ec Remove C4Group sort order for files no longer used in OC 2011-03-12 13:55:01 +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 ee355a7bc9 Do not include C4Network2IRC.h from C4Application.h 2011-03-11 03:41:05 +01:00
Günther Brammer 81d64df737 Do not use Windows' RGB macros for BGR colors 2011-03-11 03:37:27 +01:00
Julius Michaelis 0d804cad50 Workaround a jpeglib 6b weirdness 2011-03-09 00:01:27 +01:00
Nicolas Hake 894fefa8c9 Remove unconditional infinite loop in C4GameObjects 2011-03-08 17:54:12 +01:00
Nicolas Hake b332e73ba3 C4Group: Fix FindNextEntry 
The char* parametered FindNextEntry didn't pass the last found
filename to its implementation, so it always found the first file
matching the wildcard
 2011-03-08 17:53:30 +01:00
Günther Brammer c009851ce2 Script: Remove unused category parameter from GetDefinition 
While at it, also remove it from the internal function and a bunch of dead
code from C4IDList.
 2011-03-07 21:26:56 +01:00
Günther Brammer 8323f6c01d Add a standalone C4Script interpreter 2011-03-05 17:40:22 +01:00
Günther Brammer 89413fcd6e Move some code out of C4ScriptHost.cpp 2011-03-05 17:36:16 +01:00
Günther Brammer de626b18aa Script: Only show error messages in the Log 2011-03-05 16:50:22 +01:00
Günther Brammer 39276c6fd1 Check all pointers to PropLists in c4values in debug engines 
This can find some refcounting errors by verifying that the proplist did
not get deleted before it is used.
 2011-02-06 22:30:31 +01:00
Günther Brammer 75dc49e746 Replace Objects.ObjectNumber with C4PropListNumbered::CheckPropList 
There's no need to go through the entire object list to get an object
number, so convert most usages of ObjectNumber(obj) with obj->Number. Add a
new method to check proplist pointers for debugging purposes to
C4PropListNumbered.
 2011-02-06 01:59:49 +01:00
Günther Brammer a7615ddced Make C4PropListNumbered global data static members of the class 
Previously, this was in ::Game and ::Objects. Both classes still work on
that data, but not as much as before.
 2011-03-05 03:32:51 +01:00
Günther Brammer f4ee636072 Remove some redundant Default methods 
Using the same method for the constructing and clearing an instance just
leads to leaks and subtle bugs.
 2011-03-05 03:24:11 +01:00
Günther Brammer 01e9dce9ce Store C4ComponentHost filenames in StdCopyStrBufs 2011-03-05 02:45:27 +01:00
Günther Brammer 8ff6ae847c C4Group::LoadEntry takes pointer instead of non-const reference 2011-03-05 02:44:26 +01:00
Günther Brammer 28a154dcdf Drop unused third C4LangStringTable::ReplaceStrings parameter 2011-03-05 01:05:36 +01:00
Günther Brammer 609b9bbe93 Fold C4ComponentHost::Default() into C4ComponentHost::C4ComponentHost() 2011-03-05 01:03:09 +01:00
Günther Brammer 6eebaeaac8 Fold C4AulScript::Default() into C4AulScript::C4AulScript() 2011-03-04 15:20:21 +01:00
Günther Brammer 60dcd65708 Languages.GetPackGroup creates a new GroupSet containing the original group 
Just moves some code from C4ComponentHost to C4Language.
 2011-02-07 03:37:35 +01:00
Julius Michaelis 98717a4051 C4Script: Remove obsolete function GetSystemTime 2011-03-05 14:25:37 +01:00
Günther Brammer 374d8e743b C4Group: Error message for Open failing due to filename on the ignorelist 2011-03-04 03:49:39 +01:00
Günther Brammer 111df0392c Split C4Script.cpp into game functions and C4Script support functions 2011-03-04 13:49:41 +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 0800b3a209 StdBuf: change member order to silence g++ warnings 2011-03-04 00:02:43 +01:00
Günther Brammer 60ce34ad52 Remove redundant global pConfig 2011-03-03 17:11:03 +01:00
Günther Brammer 264009060c Script: Remove Method from function descs 2011-03-03 02:25:01 +01:00
Günther Brammer 45620c2b85 Move some C4AulDebug code into C4AulDebug 2011-03-03 00:58:43 +01:00
Günther Brammer 8749395a18 Use Nillable<void>() instead of C4VNull as the always-nil return value 2011-03-03 00:57:38 +01:00
Günther Brammer bdbe3beabf Optimize the template engine script function wrappers slightly 2011-03-02 23:42:34 +01:00
Günther Brammer e250312c26 Move C4DefList class into from C4Def.cpp/h to new C4DefList.cpp/h 2011-03-03 17:10:22 +01:00
Günther Brammer ed86af5f29 Script: Proplists with Object prototypes are also Objects 2011-03-02 14:12:06 +01:00
Günther Brammer 78c2c98dce c4group: new command "Pack To" which takes a target filename 
This allows creating packed groups in a build directory without copying
the source files first.
 2011-03-01 22:56:05 +01:00
Julius Michaelis 530a70f43c Create a log file for each instance of clonk on UNIXes (cmake only) 2011-03-02 18:54:28 +01:00
Sven Eberhardt 37b630a472 load additional player control defs from definition local System.c4g files 
adjust invalid video mode bit depth values
 2011-03-02 18:13:43 +01:00
Sven Eberhardt c6c3af0e1b fix wrong video mode selection in ApplyResolutionConstraints() 2011-03-02 17:35:52 +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
Günther Brammer 7ce65373a3 Replace C4AList with some std::lists 2011-02-26 00:48:19 +01:00
Günther Brammer 5c18c7aa33 Reduce the time a C4String pointer sits in an integer variable 2011-02-22 00:07:08 +01:00
Günther Brammer a13309d752 Separate builtin C4Strings from dynamic ones in the leaked-strings-list 2011-02-25 18:11:54 +01:00
Günther Brammer 3a3434fc95 Script: Remove some unnecessary inspections of callers of builtin functions 2011-02-23 21:06:14 +01:00
Günther Brammer 05381a63a9 Script: Drop third AddMsgBoardCmd parameter, always escape the input 
There is no reason for the engine to preprocess the input for the script.
AddMsgBoardCmd doesn't enable anyone to do anything they couldn't do
without it, so there's no security problem that is solved by extra input
filtering, as long as all scripts use "%s" instead of plain %s.
 2011-02-23 20:00:50 +01:00
Günther Brammer 0bad4b7f59 Script: Parse negative numbers in nested constant expressions 
Previously, local foo = [-1]; would complain about an unexpected '-'
operator.
 2011-02-19 22:37:42 +01:00
Günther Brammer b9cf00d824 Script: obj->~foo() cannot have whitespace between -> and ~ anymore 
This slightly simplifies the parser, as ->~ is now one token and ~ does not
double as binary not and call failsafety indicator.
 2011-02-19 22:18:27 +01:00
Günther Brammer 16511790a9 Script: Do not disguise '.' and '=' as unrecognized tokens 2011-02-25 18:12:36 +01:00
Günther Brammer f3af290c26 objects: Use Planes to separate objects before and behind the landscape 
Instead of maintaining an extra object list just for the objects behind the
landscape.
 2011-02-19 00:44:54 +01:00
Maikel de Vries 637e69b8da C4ObjectCom: Removed obsolete Object*Build 2011-02-20 21:02:51 +01:00
Maikel de Vries 78ce3da206 C4Def: Removed unused entries NoSell and Rebuy and adapted Library_Base 
These are implemented in C4Script and have no function in the engine, also fixed var a; a++;
 2011-02-20 20:59:50 +01:00
Maikel de Vries 886baebaf1 Script: Fixed SetGraphics for non specified source definition 2011-02-16 16:58:43 +01:00
Martin Plicht b82c8dc59e cocoa: Fix compilation 2011-02-05 21:35:18 +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 ae38a7d929 Fix "Savegames: Skip Proplists and Objects that have a duplicate number" 2011-02-13 22:07:29 +01:00
Günther Brammer c667de49b5 Script: Crash when parsing a function call with more than ten parameters 2011-02-12 20:24:52 +01:00
Günther Brammer a3ec7b5ae2 Put Objects.txt directly into the savegame instead of into a temporary file 2011-02-12 01:19:01 +01:00
Günther Brammer 45fa20617c Load definition stringtable before definition script 
This allows for a slight simplification of the ScriptHost API, as only the
definitions made the ScriptHost load the stringtable for them.

This changes the sortorder of definitions, but C4Update should be able
to make the necessary changes to the release groups.
 2011-02-07 02:18:24 +01:00
Günther Brammer 7be90977bf Make C4ScriptHost have a C4ComponentHost member instead of inheriting 
Previously, C4ScriptHost needlessly derived from two classes.
 2011-02-06 21:37:19 +01:00
Günther Brammer 489ae8c5b3 Remove unused C4ComponentHost::Name and LoadAppend 2011-02-06 21:31:33 +01:00
Günther Brammer 561c80fd91 Savegames: Skip Proplists and Objects that have a duplicate number 
Such savegames are broken anyway, any possible repair methods just
heuristic.
 2011-02-05 23:11:02 +01:00
Günther Brammer e4ef7e3d98 Replace C4VID with C4VPropList 
Most callsites use C4Id2Def instead, but for some a def->id->def
indirection could be removed.
 2011-02-05 23:09:09 +01:00
Günther Brammer 28be8dbcfd Remove some C4Id2Def(def->id) indirection 2011-02-05 11:34:25 +01:00
Günther Brammer 608040e7e5 docs: AddEffect return a proplist 2011-02-13 20:34:05 +01:00
Günther Brammer 9aa331d98c console mode: Fix compilation without libreadline 2011-02-04 00:16:45 +01:00
Günther Brammer d0ef0866d7 Flush stdout after every log line even without a terminal 2011-02-04 00:15:52 +01:00
Günther Brammer f105e45d6a autotools: clean up duplicate files in Makefile.am 2011-02-03 21:52:16 +01:00
Günther Brammer 05e98d8d9c Move C4Effects.h include to .cpp files needing it 2011-01-20 02:10:41 +01:00
Günther Brammer a2e530addf Move object related engine script functions to C4ObjectScript.cpp 2011-01-20 01:57:44 +01:00
Günther Brammer c74e43b61f Add C4ObjectScript.cpp 2011-01-20 01:56:01 +01:00
Günther Brammer dfa1ad948b Move C4AulDefFunc* templates to a header 2011-01-20 00:19:19 +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
Günther Brammer e939795a93 Script: Optionally warn about empty array expression entries 2011-02-02 22:07:46 +01:00
Günther Brammer 73d1d35800 Script: Optionally warn about empty function call parameters 2011-02-02 22:06:53 +01:00
Günther Brammer 5d3eff754b Script: Empty function parameters default to nil instead of 0 2011-02-02 21:45:46 +01:00
Nicolas Hake 20beb13b98 Only select display modes with the configured color depth 2011-01-31 14:37:32 +01:00
Günther Brammer 394ce658cc Merge with ssh://hg@bitbucket.org/caesar/openclonk 2011-01-30 21:58:59 +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 233f218cef Remove some dead code 2011-01-29 18:05:33 +01:00
Nicolas Hake b8d3b00d90 Move TinyXML into thirdparty/ 2011-01-25 21:28:44 +01:00
Günther Brammer 742b5ae855 Call ::GameScript.Default at the end of Game.Clear to prevent hang on exit 
This even more closely resembles the order before GameScript became a
global. It's probably not save to call Default() function before
ScriptEngine.Clear().
 2011-01-28 01:38:21 +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
Armin Burgmeier 58d3682678 Fix a crash when script players join the game (#571) 2011-01-27 01:12:56 +01:00
Armin Burgmeier 34e6e45864 Fix the netpuncher build on Windows 
Making the nightly builds work again
 2011-01-27 01:15:48 +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 208f283512 C4FullScreen: Initialization: Use CStdWindow::W_Fullscreen 2011-01-10 11:48:05 +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 91b6201d85 Do not load Rank.bmp anymore, Rank.png suffices 2011-01-19 23:53:14 +01:00
Günther Brammer 5151177d44 Move some BMP-loading helpers to C4Landscape.cpp 2011-01-19 23:52:46 +01:00
Günther Brammer cb34973ffc Remove loading of BMP definition graphics and portraits 
OpenClonk does not use that feature anymore. PNGs are enough.
 2011-01-19 23:31:24 +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 8d3692e093 editor/gtk: Ask before overwriting a scenario 
Previously, this was commented out because GTK 2.4 did not have the
convenience API, but Clonk requires a newer GTK now.
 2011-01-19 02:16:48 +01:00
Günther Brammer d3ddc171ee editor/win32: Remove Components menu in favour of external editors 2011-01-19 02:14:59 +01:00
Günther Brammer 5acda62b71 Do not initialize ::GameScript from ::Game 
In case Game was constructed first, this could crash.
 2011-01-19 02:13:51 +01:00
Armin Burgmeier d2b93d96d6 Fix the build with gcc 4.4.3 
making the Linux nightly build work again
 2011-01-18 01:25:09 +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 2c612c6425 Script: GetMaterialVal and friends return a definition when appropiate 
This was accidentally changed with the C4Id rewrite.
 2011-01-16 21:28:24 +01:00
Günther Brammer ec7e35a25a Script: Optional warnings about deprecated functions and 0->nil conversion 2011-01-16 21:26:18 +01:00
Günther Brammer f10e01a01c config: Remove unused General.Record 2011-01-16 17:21:48 +01:00
Günther Brammer 5e156a07d1 Script: == works when one side is an object with proplist type label 
I don't actually know how to get to that situation in script, but when it
happens, everything else expecting an object would correctly accept it
despite the proplist label.
 2011-01-15 23:03:01 +01:00
Günther Brammer b7d8eb8959 netpuncher: Make it compile again 2011-01-15 19:11:48 +01:00
Günther Brammer 91e85c04f8 editor/gtk: Wrap text instead requiring horizontal scrollbars 2011-01-14 00:50:36 +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 49241e4512 editor/win32: Get id to reload on demand instead of every selection change 2011-01-13 01:16:30 +01:00
Günther Brammer a2015e0db1 editor: Move function autocompletion list generation to C4AulScriptEngine 
This actually removes some code duplication and makes the ScriptEngine
API smaller.
 2011-01-13 01:09:06 +01:00
Günther Brammer 3ef004506c editor: Store the selected objects only in EditCursor 2011-01-12 23:40:22 +01:00
Günther Brammer 58a257f763 editor: Display object properties well readable 2011-01-13 17:55:58 +01:00
Günther Brammer 94335b6a49 editor: Move object debug information into C4Object(List) 2011-01-12 23:43:05 +01:00
Günther Brammer 05ccd857e3 editor/gtk: ObjectListDlg opens object properties on double click 2011-01-12 22:09:28 +01:00
Günther Brammer b64653d003 editor/gtk: Pipette updates material combobox 
This was lost in the editor source split.
 2011-01-13 17:56:46 +01:00
Günther Brammer 8a0cc8d072 editor/gtk: Move ObjectListDlg to the front when activated while open 
Previously, the menu entry did nothing when the dialog was open
 2011-01-12 22:09:16 +01:00
Günther Brammer c908c47ca5 editor: Immediately update information about selected objects 
This avoids resetting the selection of the object list dialog. Previously,
after selecting object in the list, C4EditCursor::Execute would set the
object list selection to what the user just had selected.
 2011-01-12 21:31:10 +01:00
Günther Brammer b1cc96d6ce Fix a mismatched malloc/delete resulting from StdStdBuf::GrabPointer usage 2011-01-12 19:58:33 +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 476439a1d4 editor/gtk: Hide unimplemented menu entries and object list pictures 
The components menu entries never got implemented for the gtk editor mode
and probably never will, given their limited utility. The object list
pictures are simply broken.
 2011-01-10 00:03:56 +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