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

954 Commits (b8d3b00d90c3fa333906cb253bcc9b233e0fa11b)

Author SHA1 Message Date
Martin Plicht 2e13bcb5e7 C4GuiContainers.cpp: Call GetDialogWindow()->RequestUpdate() instead of directly calling Draw() if GetDialogWindow() is not NULL 2010-12-13 23:14:56 +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
Maikel de Vries d0e7beee1a Materials: Remove unused MGranite 2011-01-08 18:21:46 +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 4e75f2a134 Merge Plane branch 
Conflicts:
	src/C4Game.cpp
	src/C4Game.h
 2011-01-08 17:39:59 +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
Armin Burgmeier 7c26fc4d8d Cleanup: Remove unused C4Game::LocalFileMatch 2010-12-30 17:51:21 +01:00
Günther Brammer 241869b1e6 objects: Replace the sorting functionality of Categories with a Plane property 
This makes changing the drawing order a lot easier.
 2010-12-27 20:15:55 +01:00
Günther Brammer cc3768f34e objects: Objects are only moved by SolidMasks of Objects behind them 2011-01-03 23:54:17 +01:00
Günther Brammer 9df4bd4d86 objects: Remove Growth defcore val in favor of a script solution 
This actually requires extending the DoCon interface to support more
precision. The new growth functionality uses an effect timer, of course.
 2011-01-03 02:30:04 +01:00
Günther Brammer d65d48b159 editor: Drop of definitions uses CreateObject even for C4D_Structures 2011-01-03 01:31:10 +01:00
Günther Brammer 96fa57eb6b objects: Replace Grab defcore value with Touchable property 2011-01-02 23:55:48 +01:00
Günther Brammer db54822b89 objects: Remove Collectible from Defcore in favor of Collectible property 2011-01-02 23:17:47 +01:00
Günther Brammer 2c69baeb26 Script: Remove BlastObjects in favour of the script implementation 2011-01-02 22:17:51 +01:00
Günther Brammer eab445f806 Script: Remove ShakeObjects 
The script replacement is a little awkward, but will hopefully get better.
 2011-01-02 21:14:30 +01:00
Günther Brammer fbb96b2fb3 objects: Remove context menus 2011-01-02 21:10:53 +01:00
Günther Brammer 3c7f17c1aa objects: Do not change Controller on Enter for Alive non-C4D_Livings 
Previously, only C4D_Livings that were Alive did not get their
Controller changed. There is no need for the Category check, the
Alive check is sufficient.
 2011-01-02 19:52:29 +01:00
Günther Brammer 74135b4350 objects: Corpses can burn 2011-01-02 19:51:17 +01:00
Günther Brammer 846e707134 objects: Remove OCF_Living in favor of OCF_Alive 2011-01-02 19:40:48 +01:00
Günther Brammer c9f8a695be objects: Structures do not automatically remove snow and flyashes 
Besides yet another category hack, this allow the removal of two out of
seven hardcoded material names.
 2011-01-02 02:16:26 +01:00
Günther Brammer 1f3831963e Script: Add DigFreeMat 
So that one can script magical winter services or whatever else that
requires removing just some specific materials.
 2011-01-02 02:14:45 +01:00
Günther Brammer e32650d378 objects: DoCon always preserves the position of the bottom of the object 
Previously, it only did so on object creation, on straight objects, and did
something strange to rotated buildings.
 2011-01-02 02:03:44 +01:00
Günther Brammer 6d7e7c6989 objects: Simplify layer bounds 
The category check was introduced in 2002 with no explanation. Layer bounds
are totally undocumented and unused anyway.
 2011-01-02 01:24:35 +01:00
Günther Brammer 877dfee49e objects: Remove Chop command, OCF_Chop, CHOP procedure, Chop defcore val, FX_Call_DmgChop 2011-01-02 01:18:45 +01:00
Günther Brammer 4984cd6b99 objects: Remove DFA_BUILD procedure 2011-01-04 00:55:42 +01:00
Günther Brammer b2bf7ffda4 objects: Remove Build and Construct command 2011-01-04 00:47:31 +01:00
Günther Brammer 8843950662 objects: Remove a bunch of resorting functions that will be obsoleted by Planes 2010-10-12 22:32:25 +02: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 4588c797eb docs: Slight rewrite for the actmap-as-proplist change 2011-01-02 01:11:30 +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
Tobias Zwick 7baa1db40a removed OnRegisterBtn event in C4StartupAboutDlg 2010-12-27 02:30:18 +01:00
Maikel de Vries 8a200ba706 Engine: Removed all specific line behaviour 
This can be implemented in C4Script very easily.
Removed OCF_LineConstruct, ObjectComLineConstruction, Defcore LineConnect, Line types, Line related IDs.
Changed LineAttach, is now a property of the object to which the line should be attached.
Updated documentation.
 2010-12-21 19:22:06 +01:00
Nicolas Hake 5db69dd5e0 Remove some remains of Rnd3 2011-01-02 13:51:09 +01:00
Nicolas Hake b05f539641 Remove Rnd3()/Randomize3() 
These functions didn't serve any purpose that wouldn't be also provided by the standard network-safe
RNG. Accordingly, they have been removed.
This patch also removes some apparently superfluous calls to Rnd3 that ignored the returned value.
 2011-01-02 04:05:21 +01:00
Nicolas Hake e049254e95 win32: Do not throw exceptions from WinMain 2011-01-02 03:50:06 +01:00
Nicolas Hake 672cc97d2b win32: Do not use SEH in WinMain because it needs stack unwinding 2011-01-02 03:44:07 +01:00
Nicolas Hake d906e7b359 Correctly specify type of GenerateDump 2011-01-02 03:41:20 +01:00
Armin Burgmeier ffe24d471a Add a CMake option for generating mini dumps 2011-01-02 01:20:52 +01:00
Maikel de Vries db2d9d7257 Editor: Fixed window creation for scoreboard 
Thanks to ck again
 2011-01-01 23:46:59 +01:00
Armin Burgmeier 392eeddc1e Fix build with USE_DIRECTX enabled (hopefully) 
In particular to make the MSVC nightly build work again
 2010-12-31 15:05:25 +01:00
Armin Burgmeier c32c638f78 Don't complain about invalid topfaces for mesh graphics 2010-12-30 17:32:16 +01:00
Maikel de Vries 3943e0da03 Editor: Fixed window creation 
Thanks to ck
 2010-12-30 17:01:02 +01:00
Armin Burgmeier 5ed8c5830a Fix a crash in editor mode 2010-12-29 23:26:29 +01:00
Armin Burgmeier f3a7bfb59e Fix a possible crash on initial Window creation 2010-12-29 23:25:56 +01:00
Armin Burgmeier bf00eb276f Don't reset progress bar when starting to load definitions 2010-12-29 17:00:13 +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 0876e89f3a C4Viewport: Don't apply zoom limits if viewport not owned or editor mode 2010-12-13 21:55:43 +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 31aec1bf1a C4Startup.h: Indentation fix 2010-12-08 02:48:46 +01:00
Martin Plicht eb26711102 C4GamePadCon: Fix some method signatures and a preprocessor directive 2010-12-24 14:18:51 +01:00
Martin Plicht 872fbe162f C4Network2: Fix comment typo 2010-12-24 14:17:42 +01:00
Martin Plicht afd09a2e64 C4InteractiveThread: Don't include StdWindow.h but boost/function.hpp 2010-12-24 14:17:28 +01:00
Martin Plicht 093ca56eaa C4Viewport: Add method to set zoom directly 2010-12-06 21:32:27 +01:00
Martin Plicht b42e9ab26f C4Viewport: Add DropFile method 2010-12-06 21:31:37 +01:00
Martin Plicht 96b90a5c35 C4Viewport::GetZoomByViewRange: Fix uninitialized-variable problem 2010-09-17 14:35:24 +02:00
Günther Brammer a89667f3d7 Merge C4ValueList and C4ValueArray into one class 
Now that the last usage of numbered variables in effects is gone,
C4ValueList wasn't used except as a base class. If the array and
refcounting aspect should be separated at all, the reference count
should be in the base class.
 2010-12-27 17:05:35 +01:00
Günther Brammer d2e4f8d544 Script: Remove ChangeEffect in favor of effect properties 2010-12-27 16:27:39 +01:00
Tobias Zwick 6da6f6a73b fix: Version information from masterserver is correctly parsed 
PeterW changed some stuff about the INI parser. I adjusted the parsing of the version info from the masterserver to fit his change
and let the C4Network2RefClient inherit from the C4Network2UpdateClient (as refclient does the same as updateclient only more) while I was at it.
 2010-12-27 01:07:59 +01:00
Tobias Zwick 311dcfbb7a Clonk client redirects user to download page if new version is available but not as update 2010-12-27 00:31:25 +01:00
Armin Burgmeier 1967d914c2 Add a compile-time option to disable automatic update 2010-12-26 21:39:52 +01:00
Armin Burgmeier 63faacc520 Fix update procedure on Windows 
by letting c4group wait for the Clonk process to terminate
 2010-12-26 20:49:04 +01:00
Julius Michaelis eb6d3db1f4 Log to record file, too, when recording 2010-12-25 16:00:59 +01:00
Günther Brammer 884572bbb3 Script: Reflect C++ effect variables as properties 
With references gone, the engine can sanely run code upon modification of
properties, or throw exceptions on read-only ones. This obsoletes one use
case of GetEffect, simplifying the function a lot.
 2010-12-24 15:10:39 +01:00
Günther Brammer e1874a5a1d Script: GetEffect can again return an effect by index 2010-12-23 22:55:04 +01:00
Maikel de Vries 0e2cf625e8 C4Script: GetEffect returns effect instead of number. 
This will fix scripts using GetEffect to find and use an effect.
 2010-12-23 16:01:18 +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
Günther Brammer 6025602038 Script: Correctly backtrace exceptions 
Global functions conspire with appendto/include to make this all horribly
fragile.
 2010-12-22 04:26:37 +01:00
Günther Brammer 1da199830e Remove a debug printf 2010-12-22 02:11:16 +01:00
Günther Brammer 40c24961dd Correctly map bytecode to linenumber for global/appended/included functions 
The method to get the C4AulScript instance that stores the bytecode of a
function is ridiculous, but at least it's now capsuled in a function. While
at it, this also always stores the bytecode index instead of a bytecode
pointer in the function.
 2010-12-22 02:10:58 +01:00
Günther Brammer a8abb445fd Renumber Commands after Energy removal to avoid crashing 
The table used by CommandByName got out of sync with the command numbers.
 2010-12-22 01:59:27 +01:00
Günther Brammer b562acb32c Script: Remove EffectVar, update effect documentation 2010-12-21 21:57:40 +01:00
Günther Brammer 8996fd3072 Script: RemoveEffect and ChangeEffect don't require effect with effectname 2010-12-21 19:20:55 +01:00
Günther Brammer 9ad1a3acff Script: GetEffect with name instead of effect instance works again 2010-12-21 01:40:40 +01:00
Maikel de Vries 53e507d2c5 Engine: Removed Power system including all components 
Removed power lines, power connects, energy rule, power OCFs, Energy command, C4Script CheckEnergyNeedChain and EnergyCheck, Action EnergyUsage and documentation.
 2010-12-15 21:02:50 +01:00
Günther Brammer 6140c73e81 Script: Change effect functions to use the effect instead of the number 
This doesn't require any script changes because the effect callbacks don't
heed the parameter type information.
 2010-12-20 00:19:24 +01:00
Günther Brammer e2c6a5fd17 Script: Effects are now proplists, too 
This doesn't yet affect any script interfaces,
 2010-12-20 00:13:56 +01:00
Günther Brammer f801ab61f5 Clear out interned strings instead of them deregistering themselves 
This probably prevents a crash when the strings are destructed after the
set.

Also show all C4Strings that are still in the stringtable at the end for
debugging purposes.
 2010-12-17 00:31:51 +01:00
Peter Wortmann f00ec07a7b Reference: Compile UpdateURL as RCT_All, set default so parsing won't fail because of it. 2010-12-19 20:16:18 +00:00
Peter Wortmann 0c8bac0140 StdCompiler: Removed "compatibility" hack to have RCT_Escaped fallback to RCT_All. 
RCT_Escaped is meant to be used when embedding a string into a custom encoding of a structure. That's why it has a terminator symbol and escapes anything that could be interpreted as a seperator. Falling back to RCT_All completely destroys this safeness, as it just blindly copies everything. In case this kind of functionality is really needed, introduce RCT_EscapedAll or something similar.
 2010-12-19 01:43:40 +00:00
Maikel de Vries e049c553a0 C4Script: Removed obsolete DrawVolcanoBranch 
Use DrawMaterialQuad instead.
 2010-12-15 23:23:29 +01:00
Maikel de Vries 2af84845b5 C4Def: Removed obsolete LineLightning and LineVolcano 
These things are or will be implemented in C4Script.
 2010-12-15 19:56:50 +01:00
Nicolas Hake dbb75f98cb win64: Fix crash when a C4String gets allocated at >4GB 2010-12-16 17:26:52 +01:00
Maikel de Vries 10acc3967e Physical: Helper functions to Set and Get MaxEnergy 
Only needed in tut04, these make the necessary callbacks.
 2010-12-13 23:22:15 +01:00
Maikel de Vries 92bd67f250 Physical: Breath value now represents the number of frames an object can hold his breath. 
More precise values do not make sense and complicate stuff.
 2010-12-13 22:46:42 +01:00
Günther Brammer fb28777c70 Physical: Remove the now unused implementation details 2010-12-13 02:58:22 +01:00
Günther Brammer fccd5597bc Physical: Replace Throw with a ThrowSpeed property 2010-12-13 02:17:21 +01:00
Günther Brammer 39e385a8da Physical: Replace Jump Physical with JumpSpeed property 2010-12-12 23:49:18 +01:00
Günther Brammer b9c1790c48 Physical: Replace Breath with a MaxBreath property 2010-12-12 23:01:08 +01:00
Günther Brammer b591ee0dc2 Physical: Replace Energy with a MaxEnergy property 2010-12-12 22:38:15 +01:00
Günther Brammer 1760c8851d Physical: Make BreatheWater and CorrosionResist simple properties 2010-12-12 21:49:47 +01:00
Günther Brammer 5bb3e81f4f Physical: Remove Magic and associated other Magic 2010-12-12 01:25:58 +01:00