Commit Graph

4906 Commits (016f626cbe5e10e0291f28d6b16b4057ba6c9975)
 

Author SHA1 Message Date
Nicolas Hake 016f626cbe planet: Normalize line endings 2013-01-13 19:00:12 +01:00
Armin Burgmeier 2d3a4981bf map creator: don't crash when using a template within itself (#534) 2013-01-13 18:19:32 +01:00
Tobias Zwick 28e2bdbb92 fix #724: revers the order in which GetCrew(plr,index) returns the crew 2013-01-13 15:45:51 +01:00
Tobias Zwick 65d50da83f cleaned up obsolete entries in scenario.txt 2013-01-13 15:45:01 +01:00
Tobias Zwick 6dc75fb22a documentation -> link to git repos in header 2013-01-13 15:40:28 +01:00
Tobias Zwick b85b08687f fix #907: name of the construction site is not localized 2013-01-13 14:16:43 +01:00
Gabriel f4d8d81a70 Changed actmap.xml "Facet" entry to coordinates.
Replaced "Facet" with "X", "Y", "Wdt" and "Hgt".

Signed-off-by: Tobias Zwick <newton@westnordost.de>
2013-01-13 14:07:27 +01:00
Martin Plicht 379cd1c210 StdStrBuf::AppendFormatV: Pass copied va_list to vsnprintf so the second iteration of the while loop does not crash 2013-01-13 11:31:13 +01:00
David Dormagen 7ba10ca3cf added IsPointInRectangle(point, rectangle) to System.ocg/Math.c 2013-01-12 18:15:51 +01:00
David Dormagen 00d5ffea03 added LargeCaveMushroom and Cave
the Cave-dummy-object has a Place() method which places a cave
2013-01-12 18:15:51 +01:00
David Dormagen 1cd7ffec6a added a FindLocation function in System.ocg/FindLocation.c 2013-01-12 18:15:50 +01:00
Günther Brammer 864c5c7ea8 copyright notices update 2012 2013-01-12 16:31:40 +01:00
Nicolas Hake a619b4b6ed c4group: Fix incorrect swprintf usage 2013-01-11 23:41:58 +01:00
Tobias Zwick 0d0df683d8 add WindowsGamesExplorer.xml to .gitignore 2013-01-08 23:52:45 +01:00
Tobias Zwick d0a6bb099f fix #792: wouldn't load Overlay.*.png 2013-01-08 23:52:45 +01:00
Günther Brammer 08f86c2038 Script: continue in a do-while loop jumps to test instead of start of loop
This matches C and other languages.
2013-01-08 21:21:11 +01:00
Gabriel 8bce48f166 Fixed parameters and text in SetGamma.xml, Schedule.xml and Effects.xml
I also managed to get rid off the extra " automatically inserted at the end of the Schedule examples, by adding a <funclink></funclink> after the last &quot;. The string is not highlighted green now, but it not even was before.

Signed-off-by: Tobias Zwick <newton@westnordost.de>
2013-01-02 22:45:31 +01:00
Sven Eberhardt 58ea47a4fd Added support for function pointers to ScheduleCall/AddTimer/ClearScheduleCall/RemoveTimer 2013-01-02 00:50:01 +01:00
Sven Eberhardt 4c44e4cc25 Fix some docs errors in GetColor and Sort_Random. 2013-01-01 15:40:48 +01:00
Günther Brammer 41c88ba863 Use _snwprintf instead of swprintf
Apparently the C standard committee and Microsoft couldn't agree on how
swprintf should work.
We previously tried to work around the resulting breakage, but I just got
the following compilation error. It's really better to avoid that function
entirely. Since we only used it in windows-specific code, the
windows-specific _snwprintf is a nicely compiler-independent replacement.

src/platform/PlatformAbstraction.h: In function ‘int swprintf(wchar_t*, size_t, const wchar_t*, ...)’:
src/platform/PlatformAbstraction.h:243:12: error: redefinition of ‘int swprintf(wchar_t*, size_t, const wchar_t*, ...)’
/usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/swprintf.inl:30:5: error: ‘int swprintf(wchar_t*, size_t, const wchar_t*, ...)’ previously defined here
2012-12-31 22:03:12 +01:00
Günther Brammer 6e4b5bd0ca Don't crash on Call() 2012-12-31 22:03:12 +01:00
Günther Brammer 2d05c9501c Make StdSync.h compile with neither windows nor pthreads again 2012-12-31 22:03:12 +01:00
Günther Brammer d5c1cb8c51 Remove some unused variables 2012-12-31 22:03:12 +01:00
Günther Brammer 6a6190564f Remove some forward declarations that are already in C4Prototypes.h 2012-12-31 22:03:12 +01:00
Sven Eberhardt 6e85a7a5fc Fix SolidMasks not moving objects if the top left of the landscape was solid
A missing fixed conversion let the shape check happen at or around position 1/1 instead of at the actual object position.

Also removed a redundant contact check.
2012-12-31 15:56:02 +01:00
Julius Michaelis b0015b8f1d Update .gitignore 2012-12-30 21:29:21 +01:00
Armin Burgmeier c3c148d53a Add CreateParticleAtBone script function 2012-12-29 00:06:30 +01:00
Armin Burgmeier 84c43f9a1d Draw particles with subpixel precision 2012-12-28 19:28:39 +01:00
Armin Burgmeier e03c980038 Linux: Fix a crash when no primary output is specified 2012-12-28 17:32:12 +01:00
Nicolas Hake 3c9198876c Win32: Mark OC "DPI aware" (#891)
Technically this mark is incorrect; we do not handle things differently
on high DPI settings. On the other hand, marking OC DPI aware means that
Windows won't try to scale our drawing, clipping menus and rendering in
the process.

Somewhere in the future, OpenClonk should also add proper DPI awareness
and change the default zoom and menu scaling to match.
2012-12-24 14:44:41 +01:00
David Dormagen 4dcc784d35 do not pass controls to disabled cursor anymore (i.e. via SetCrewEnabled) 2012-12-22 17:11:06 +01:00
David Dormagen 8f2058e55b adjusted PathFree2 to return the first point on the line from point1 to point2
before, when point1 was f.e. more to the right, PathFree2 would swap the points and return an unexpected point
2012-12-22 16:48:50 +01:00
Sven Eberhardt 803b1c5197 Add documentation for GetIndexOf 2012-12-18 01:19:49 +01:00
Sven Eberhardt 16d4258b09 Added some array sorting functions to C4Script 2012-12-17 16:41:39 +01:00
Sven Eberhardt 829e83dcdb Production menu shows missing components/liquids/materials/fuel in red 2012-12-17 14:32:48 +01:00
Sven Eberhardt 159e2e49b6 Rebalance loam to require less water 2012-12-17 14:32:10 +01:00
Sven Eberhardt 430d59fc8c Merge branch 'master' of ssh://git.openclonk.org/openclonk 2012-12-17 13:53:59 +01:00
Sven Eberhardt 4cdbd8641c Rebalanced wood usage so you need fewer trees to get a settlement started.
* Wind generator down to 3 wood, 1 metal
* Flagpole down to 3 wood, 1 metal
* Sawmill down to 1 wood, 4 rock
* Trees give 5 wood (that's still 2 wood with direct chopping) to make the sawmill even more efficient
* Reduce maximum number of trees by ~20%, because trees tend to cause so much lag
* Reduce amount of power needed by sawmill to make sure one wind generator is enough even with moderate wind conditions
2012-12-17 13:52:53 +01:00
Nicolas Hake 2e71694710 Producers: consume required material (#885)
Instead of just checking whether the material is available, also
consume it.

I'm not quite certain whether we should return the removed material
along with the amount removed (to match the return value of the barrel's
GetLiquid), but since the bucket is not currently accepting wildcards
I don't think it's necessary.
2012-12-17 02:11:15 +01:00
Nicolas Hake db9ee644eb Fix walking animation with xdir=0 (#887)
When trying to get the sign of the horizontal velocity, a calculation
erroneously assumed that it could never be 0. When it did, a #DE was
raised. This changeset replaces the calculation with the Sign() function
from Math.c, which handles a zero argument correctly.
2012-12-17 02:11:03 +01:00
Sven Eberhardt 548413449d fix material conversion on insertion into converting liquid 2012-12-16 18:52:32 +01:00
Sven Eberhardt 2e7d1e4ba7 Fix snow melting in lava/durolava 2012-12-16 18:51:44 +01:00
Sven Eberhardt 86b20be644 Fix C4Command::Jump, i.e. jumping as part of pathfinder. 2012-12-09 18:44:22 +01:00
Julius Michaelis 2a68766856 Fix error condition in cmake's git_get_changeset_id 2012-12-08 00:24:00 +01:00
Sven Eberhardt 8c3e78cee4 Skylands: Map update with less rock, so building the double elevator is easier now 2012-12-07 23:21:34 +01:00
Sven Eberhardt 9cc2c0aca1 Skylands loam length tweak 2012-12-07 23:13:18 +01:00
Sven Eberhardt 7cbf11e39d Skylands
* Removed lift tower
* Fix scaffolds walls to no longer move Clonks on creation
* Reduce scaffold hit points
* Add flints to home base material and more flints to landscape
* Remodeled landscape and chests a bit
* Made plane parts destructible on damage, so you can destroy them if they get stuck
* Tweaked storm push a bit
2012-12-07 23:11:52 +01:00
Sven Eberhardt 7ab2fe0ec9 Change bridge length constant to a local for Loam.
This silences a warning about overloaded constants. Unfortunately, you cannot change it at runtime (using Loam.BridgeLength=newlength).
2012-12-07 22:18:11 +01:00
Sven Eberhardt 6a4e5b0615 Attached objects with SolidMask (slave elevator case) can carry objects 2012-12-06 20:30:35 +01:00
Sven Eberhardt 7a042ecca5 Do not allow debugger connections in league games.
We do not have a league yet and once we do, people might start cheating with customized engines. But at least it shouldn't be that easy.
2012-12-06 17:18:43 +01:00