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

5384 Commits (7789f9586a2739057a00b22c3db5053b61b55bfe)
 

Author SHA1 Message Date
Nicolas Hake 459fce0758 Replace std::auto_ptr with std::unique_ptr 
std::auto_ptr has awkward copy semantics and is deprecated in C++11.
 2013-03-26 15:43:01 +01:00
Sven Eberhardt 698be41e90 Fix build 2013-03-26 10:57:46 +01:00
Sven Eberhardt d2037caef7 GoldenMountain starting conditions rework 2013-03-26 10:53:20 +01:00
Sven Eberhardt e387c7cdb9 Added new settlement scenario "Golden Mountain" to Experimental.ocf 2013-03-26 00:48:22 +01:00
Sven Eberhardt c60220be27 Added some helper functions to Library_Map 2013-03-26 00:46:50 +01:00
Sven Eberhardt c115fbfaa0 FnBlastFree: Added max_density parameter. 
Also updated material densities and added attribute MaxPickDensity to pickaxe, so it's now possible to define a pickaxe that cannot go through granite.
 2013-03-26 00:45:44 +01: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 671a815223 Fix MapLayer functions on derived prop lists (#935) 2013-03-24 13:29:04 +01:00
Sven Eberhardt 4b6c26a48a Added script function array MapLayer.CreateMatTexMask(any mask_spec). 
Returns mask_spec as an array of 256 bools to be used e.g. in conjunction with the return value of GetPixel.
 2013-03-24 13:23:37 +01:00
Günther Brammer 03a045810e Script: Ignore attempts to set Scenario.Prototype 
This is mostly for the benefit of savegames, which rely on being able to
save scenario functions as Scenario.Prototype.*, but also removes an
opportunity to break things.
 2013-03-22 23:00:12 +01:00
Günther Brammer 4550d00edc autotools: Catch up to C4MapScript 2013-03-22 23:00:12 +01:00
Sven Eberhardt ec38b4d9e4 Fix some C4MapScript dependencies 2013-03-22 22:24:20 +01:00
Sven Eberhardt ac8e48e85e Added some C4MapScript stubs for mape 2013-03-22 22:05:58 +01:00
Sven Eberhardt eeb6436f89 FrostySummit: Fixed some scenario properties. 2013-03-22 21:49:01 +01:00
Sven Eberhardt eeac0f7c98 Fixed MinPlayer in some experimental scenarios 2013-03-22 21:46:09 +01:00
Sven Eberhardt 0801209a34 New experimental scenario: Frosty Summit. 
At the moment, the round is a bit too short I think :)
 2013-03-22 21:35:14 +01:00
Sven Eberhardt fcddb56b04 Some Library_Map extensions 2013-03-22 21:31:56 +01:00
Sven Eberhardt cc7c9488c5 FnLayerSetPixel also takes string parameter for pixel color 2013-03-22 21:31:34 +01:00
Sven Eberhardt 0edee130a7 Fix error message in C4MapScriptAlgo::GetXYProps 2013-03-20 23:09:40 +01:00
Sven Eberhardt 0b8476c029 Scripted map drawing: Fix integer overflow issues for large maps in MAPALGO_Ellipsis and MAPALGO_Polygon 2013-03-19 20:10:37 +01:00
Sven Eberhardt 5101147b5f Test scenario: Local defs only 2013-03-19 19:29:50 +01:00
Sven Eberhardt aeeedcd770 Fix script errors in scenarios that don't load Objects.ocd 2013-03-19 19:27:19 +01:00
Sven Eberhardt 57e63a5275 Added support for scripted maps (Map.c) and documentation. 2013-03-19 00:36:06 +01:00
Sven Eberhardt b0a0d2a83c Rework logging of unfreed C4Strings a bit 2013-03-19 00:36:05 +01:00
Sven Eberhardt 9e9e05f492 Added GetStartupPlayerCount script function 2013-03-19 00:36:05 +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
Armin Burgmeier e0b977c88d MineRescue: Goal checks whether elevator can move, not whether it does move 2013-03-16 16:59:18 +01:00
Armin Burgmeier 6d688f8d23 Add new experimental scenario Mine Rescue 2013-03-16 14:11:39 +01:00
Günther Brammer 814f809885 cmake: USE_GTK3 defaults to off for now 
The defaults should follow the settings the binary downloads use where
reasonable.
 2013-03-12 02:12:26 +01:00
Günther Brammer 2d86e47c04 Fix use-after-free in C4Value::CompileFunc 
C4StringTable::RegString modifies the provided StdStrBuf. Use FindString
instead, since GetPropertyByS reliably returns failure for a
freshly-registered string anyway.
 2013-03-10 22:47:17 +01:00
Günther Brammer 16f3fe34e1 Use correct exception when unable to compile a static proplist 
excNotFound is used to signal that the end of a list is reached. But these
error conditions in C4Value::CompileFunc signal some logic error, not
finding an end-of-list marker instead of a C4Value.
 2013-03-10 22:46:32 +01:00
Günther Brammer dfc4b9e077 Increase exception-safety of C4PropListNumbered::CompileFunc 2013-03-10 21:40:22 +01:00
Günther Brammer deeb6eeba5 Clean up a forgotten C4DirectExecScript 
Found by ker.
 2013-03-10 17:37:30 +01:00
Günther Brammer 6b097a49c5 Some slight parser cleanups 2013-03-10 17:37:30 +01:00
Günther Brammer a384e1bdbd Make most of C4AulParse private 
This finishes the transformation from a struct to share some variables
when the parser was first split into multiple functions to a C++ class.
 2013-03-10 17:37:30 +01:00
Günther Brammer 7be81f78e8 C4GameObjects::ObjectPointer does not need to be virtual 2013-03-10 17:37:30 +01:00
Günther Brammer b19259a22c Switch to a better random number generator 
This is already used in C4Landscape::ChunkyRandom, where it produces good
results.
 2013-03-10 17:37:30 +01:00
Günther Brammer 2d7b472ab3 Script: GetID returns the prototype of an object, not the internal C4Def 2013-03-10 17:37:29 +01:00
Günther Brammer 169b3750d4 cmake: Also search for freetype version 2.4.11 2013-03-10 14:01:38 +01:00
Günther Brammer 2ef47af689 cmake: Default to a deps folder in CMAKE_CURRENT_BINARY_DIR 2013-03-10 14:01:35 +01:00
Günther Brammer 1075822af3 cmake: Don't try to create openclonk.png without convert 2013-03-10 14:01:26 +01:00
Günther Brammer 12c8b31a10 cmake: Use CMAKE_DEPENDENT_OPTION to structure the various options 2013-03-10 14:01:15 +01:00
Günther Brammer 159cfb9885 cmake: Explicitly instead of indirectly link openclonk with pthread 
In practice, other libraries pulled pthread in, except for the USE_CONSOLE
build. But since there are direct calls to pthread in our code, we really
shouldn't rely on that.

Also, this should fix the USE_CONSOLE build on windows.
 2013-03-10 14:00:01 +01:00
Peter Wortmann 43bbcecd99 Ignore "would block" errors from UDP sendto 
Given that SimpleUDP makes no promises on delivering data anyway, it's okay
to just drop packets silently.

While I'm at it, it's probably a good idea for non-Windows system to
set sockets as non-blocking too, as well as C4NetIOUDP to be more
consistent with its handling of errors along these lines.
 2013-03-07 21:26:32 +00:00
Sven Eberhardt d505c8a760 DeadlyGrotto fix DuroLava and statue head vertices 2013-03-07 22:23:27 +01:00
Sven Eberhardt 44f45a8e06 New settlement scenario in Experimental.ocf: Deadly Grotto. 2013-03-07 01:09:38 +01:00
Sven Eberhardt e5ecf33455 Experimental ruby cave: Icon and knowledge. 2013-03-07 01:09:37 +01:00
Julius Michaelis 5483072726 8f429dc50fc9b46afb/USE_CONSOLE MissionAccess: do it right. 
/bin/brain not found
 2013-03-03 19:41:23 +01:00
Julius Michaelis b23243124f 8f429dc50fc9b46afb/USE_CONSOLE MissionAccess: do it right. 2013-03-03 19:29:00 +01:00