Commit Graph

5104 Commits (814f80988541056a194f0538da62adc47e2d4000)
 

Author SHA1 Message Date
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
Sven Eberhardt c3ad022a25 Skylands made a bit easier 2012-12-02 21:33:17 +01:00
Sven Eberhardt fc10ae7b33 Skylands balancing... 2012-12-02 21:19:12 +01:00
Sven Eberhardt f7bde6706d Skylands now a bit more playable 2012-12-02 18:53:25 +01:00
Günther Brammer 0f48d92036 Move Minimal.ocs back to Tests.ocf
Minimal.ocs is not at all experimental. It has two uses: Testing aspects of
the game that do not depend on the scenario in a clean environment, and
checking that the default scenario settings still work.
2012-12-02 17:48:34 +01:00
Maikel de Vries 9489759d3a Renamed Tests.ocf to Experimental.ocf
This scenario folder is now intended more towards scenario testing purposes rather than containing random development stuff.
Both Experimental.ocd and Experimental.ocf should never be included in releases.
2012-12-02 16:55:53 +01:00
Maikel de Vries 365c6e94c6 Moved Experimental.ocd out of Tests.ocs to planet
This is necessary such that these objects are not automatically loaded for scenarios inside Tests.ocs
2012-12-02 16:42:37 +01:00
Maikel de Vries db9093c2d5 Renamed Lines.ocs to Playground.ocs
This is supposed to be a scenario where the player has access to all objects and can try them to his liking.
2012-12-02 16:39:17 +01:00
Maikel de Vries 016c616d1e Fixed a script error in Lines.ocs 2012-12-02 16:21:17 +01:00
Maikel de Vries 6a0e920879 Removed Settlement.ocs from Tests.ocf
And again, this is nowhere near releasing.
2012-12-02 16:20:52 +01:00
Maikel de Vries 529aef6941 Removed Materials.ocs from Tests.ocf
What was this even used for? I think a single material can be tested locally.
2012-12-02 16:13:19 +01:00
Maikel de Vries 50eabaf952 Removed MeleeMoutain.ocs from Tests.ocf
This scenario is not release material currently and has not been maintained in a long time.
2012-12-02 16:13:19 +01:00
Armin Burgmeier dfdd0fba3e Remove debug logs in X11 gamma ramp code 2012-12-02 15:52:29 +01:00
Armin Burgmeier 55b2a15d15 SaveDefaultGammaRamp: Return true if everything worked correctly 2012-12-02 15:52:13 +01:00
Armin Burgmeier fab541798f SaveDefaultGammaRamp: Don't crash if primary output is not connected
Instead, use the first connected output from the list of all outputs.
This happens on my computer, probably because the desktop environment
does not set the correct primary output.
2012-12-02 15:51:06 +01:00
Armin Burgmeier e8a4628d6a Fix xrandr version check for gamma ramp modification 2012-12-02 15:10:27 +01:00
Armin Burgmeier 0556bd6cd7 Initialize all variables in C4X11AppImpl 2012-12-02 15:09:44 +01:00
Günther Brammer 8cfd88f0d2 Make dedicated server compile with fmod 2012-11-30 22:20:16 +01:00
Günther Brammer 327bfa31e7 Remove some superflouos output from the dedicated server 2012-11-30 22:20:16 +01:00