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

3773 Commits (09e0e482908af711207f6c05ffe4cc1eea33931b)
 

Author SHA1 Message Date
Armin Burgmeier 09e0e48290 When starting to drag an object, use the object at mouse down time 
and not at the time the drag is started, which is a bit later, after the mouse
has been moved a few pixels in order. This makes it easier to start dragging
when hitting the drag object on an edge.
 2012-02-25 22:05:47 +01:00
Armin Burgmeier 7f5b7bcdd6 Make a MouseHover callback when the object being hovered by the mouse changes 2012-02-25 21:56:11 +01:00
David Dormagen e0fa05418c added more array helper functions 2012-02-25 21:58:05 +01:00
David Dormagen 4169a9232c swapped parameters of GetIndexOf 2012-02-25 21:57:39 +01:00
Armin Burgmeier 9d94b1da6e For scaled sprite graphics, don't interpret Picture coordinates as scaled 
Otherwise an object with a scale of 5 and a picture of 64x64 (such as the
Metal and the GoldBar objects) cannot properly set the picture rectangle.
 2012-02-25 17:35:24 +01:00
Armin Burgmeier cebbacd3f4 Remove "Picture" DefCore entry in objects having mesh graphics 2012-02-25 17:04:00 +01:00
Armin Burgmeier 8eb76cef8c Unify overlay drawing of pictures 
Instead of having custom code drawing the picture in C4DefGraphics.cpp,
re-use C4Def::Draw().

This changeset changes the coordinate system on which draw transformations
are applied to sprite picture overlays. The transformation is no longer
applied in the frame of the overlay picture but in the frame of the object on
which the overlay is drawn. This was already the case before for mesh
graphics, so this change unifies the interpretation of draw transformations
for sprite and mesh graphics.

The Tools Workshop has been changed accordingly so that object is production
are properly displayed on the sign. This also fixes the pictures of some
objects being off the sign.
 2012-02-25 16:54:51 +01:00
Maikel de Vries c3b57957c4 Coniferous tree seeds faster, this is needed in for rounds like Goldmine 
Also some more trees and gold in goldmine.
 2012-02-25 16:15:17 +01:00
Julius Michaelis c96d5048f2 Fix a link in the german docs 2012-02-24 00:33:24 +01:00
Maikel de Vries dd2f93b3e4 Steamengine can now be accessed for contents 2012-02-23 22:35:30 +01:00
David Dormagen e3d84a550a added two particles 2012-02-23 21:45:58 +01:00
David Dormagen 7c883df228 added building: Power Compensator 2012-02-23 21:45:13 +01:00
David Dormagen 8f13c3c791 fixed Steam Engine to only burn fuel when needed, adjusted fuel values for coal and wood 2012-02-23 21:44:10 +01:00
David Dormagen d458eca6c4 ownable objects now have the right owner after construction 2012-02-23 21:42:15 +01:00
Charles Spurrill 3da02c2b2f (#694) Clonk can recollect boompacks in BoomRace 2012-02-22 22:33:24 -08:00
Maikel de Vries 6f2d4f629e Sawmill does not accepts trees before it is fully constructed (#715) 2012-02-21 18:51:29 +01:00
Sven Eberhardt bdd053e2dc Fix compilation with zlib 1.2.6 
Include zlib.h instead of just copying the definition for gzFile
 2012-02-21 17:12:00 +01:00
Maikel de Vries a9e43a1433 Fix sawmill woodchip and smoke production when off 2012-02-21 00:02:32 +01:00
Felix Wagner b61a44d7fa last fixes to make Eclipse happy 2012-02-20 12:27:14 +00:00
Felix Wagner 39e2fd8320 Unused var fix, I forgot to save 2012-02-20 12:06:38 +00:00
Felix Wagner 0051862213 For the sake of Eclipse: fixed various var declarations 2012-02-20 12:04:59 +00:00
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00:00
Felix Wagner 67efb5c7e1 Fixed undefined field [Physicals] 2012-02-20 11:29:01 +00:00
Felix Wagner 1c4deede8c Fixed Code never reached warnings 2012-02-20 11:25:43 +00:00
Armin Burgmeier 94f552bbb8 Fix earth material initialization to work when texture is given 
This fixes misplaced InEarth objects when the Material= option in Scenario.txt
contains a material-texture combination instead of a material only.
 2012-02-19 19:33:35 +01:00
Armin Burgmeier e8e1c4b9d8 Check only 3 version numbers when checking whether an update exists 2012-02-19 18:31:09 +01:00
David Dormagen 5341ec1c3d removed the ignore_sky parameter of Draw*Map - now always ignores sky 2012-02-19 17:57:33 +01:00
Armin Burgmeier f710c68b9a Reset AlphaToCoverage GL state after having rendered a mesh 2012-02-19 17:49:02 +01:00
Armin Burgmeier 9dc9ad4ca7 Fix initialization of AlphaToCoverage material property 2012-02-19 17:45:01 +01:00
Maikel de Vries afce022761 Remove testing settlement from Goldrush script 2012-02-19 17:43:57 +01:00
David Dormagen 3b093ac0de changed need-power-indicator to the classic blinking symbol 
power messages fade out a lot faster
messages are also shown when a producer/consumer returns to giving/needing 0 power
 2012-02-19 17:02:29 +01:00
David Dormagen 2262e1a8a9 added general helper for overhead symbols 2012-02-19 17:00:29 +01:00
David Dormagen 85b8e23a8b windmills produces power in steps, steam engine produces more power 2012-02-19 01:02:17 +01:00
David Dormagen e9bf6a3096 fixed the flag when constructed before using the power system 2012-02-19 00:49:13 +01:00
David Dormagen a334c212d2 fixed the foundry needing power 2012-02-19 00:48:48 +01:00
Maikel de Vries 4d1b10a23a Removed Cable reel and power line 2012-02-19 00:45:10 +01:00
David Dormagen 5cbaa697f0 changed power system to transfer power freely in a base and get rid of power lines 
power now is either available or not - there is no "produce X power and save it somewhere" anymore
 2012-02-18 22:50:18 +01:00
David Dormagen 833d5a6f76 SpoutBerryBush: added Place-function to be called on scenario initialization 2012-02-18 22:48:00 +01:00
Günther Brammer 3c4e4ec1fd win32: Installer uses English in non-German locales 
Good thing that one can test this with Wine by changing the LANG environment
variable.
 2012-02-14 22:48:11 +01:00
Günther Brammer 1b5ee016d4 Fix build without OpenGL 2012-02-16 22:58:45 +01:00
Nicolas Hake db9ff85116 Binary mesh loader: Do not reject meshes with multi texturing 
We don't support multi texturing in the rendering code, so emit a warning when
this happens
 2012-02-16 00:45:48 +01:00
Nicolas Hake ac8edd6e20 Binary mesh loader: Support animations without tracks 2012-02-16 00:34:31 +01:00
Armin Burgmeier 8dae8c111d Implement XML loading support for geometry shared between submeshes 
The new OGRE blender exporter (2.6) creates meshes which make use of this
feature.
 2012-02-15 23:04:19 +01:00
Armin Burgmeier c09b24125c linux: Fix a crash when getifaddrs returns NULL for an address (#713) 2012-02-14 21:17:26 +01:00
Armin Burgmeier e52d914638 Read but ignore some more "pass" options in material scripts 
These are the ones that the blender 2.6 exporter sets automatically. We don't
support them yet but we want to be able to load the material script
nevertheless. Many of the additional options are set to their default values
anyway.
 2012-02-13 23:40:47 +01:00
Maikel de Vries b1adfde389 Allow clonk to use tools during wall jumps 2012-02-13 20:13:13 +01:00
Günther Brammer 00a4002711 unix: cmake also links with librt 2012-02-12 22:11:32 +01:00
Günther Brammer 90f4f7f77b Work around crash bug in SDL_mixer 1.2.12 
See http://bugzilla.libsdl.org/show_bug.cgi?id=1418 for details
 2012-02-12 21:28:17 +01:00
Günther Brammer b59ffac51d autotools: sdl.m4 from libsdl 1.2.15 2012-02-12 17:02:15 +01:00
Günther Brammer a9e1af7226 unix: Use clock_gettime(CLOCK_MONOTONIC, ...) instead of gettimeofday 
gettimeofday returns wall clock time, which can jump around, which is bad for
our purposes. clock_gettime(CLOCK_MONOTONIC, ...) does exactly what we need - a
stable measurement of time since an arbitrary point.
 2011-06-27 01:52:39 +02:00