Commit Graph

3797 Commits (6dddb26b8e1fd540ee4351d1d720438e2ed494bd)
 

Author SHA1 Message Date
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
Tobias Zwick 07fbe84af6 fix docs header 2012-02-01 20:10:17 +01:00
Armin Burgmeier de4a93cfc5 win32: Actually use the new delay when the timer delay is updated
Instead of just re-creating the timer with the old value. This fixes using
/speed to make the game faster than the default.
2012-02-12 15:54:36 +01:00
Armin Burgmeier 70a67204cb win32: Scheduler runs timeouted procs also when flooded by event inputs (#256) 2012-02-12 15:15:03 +01:00
Nicolas Hake 08d71bcd74 Drop PIF_HasRes flag from player info read from replays
C4PlayerInfo stores the PIF_HasRes flag for savegames and network synch. The
resource system isn't used in replays however, so the flag is wrong there. Clear
it when loading a replay, so a later assertion in the cleanup code doesn't fail.
2012-02-12 14:01:12 +01:00
Armin Burgmeier f349a97919 Correctly honor game speed if delay is below MaxRefreshDelay (#260) 2012-02-12 13:49:02 +01:00
Armin Burgmeier 06dc47cb09 Make sure sector list order always matches main list order
So actually be29346165d6 turned out to be an incorrect fix. The actual
problem is much more subtle: the ordering of objects within the same
plane by their ID could cause the sector list order to not match the
main list order anymore. This has been fixed by re-arranging the code in
question.

I hope this really fixes #711.
2012-02-12 04:26:33 +01:00
Armin Burgmeier b16fc0ccf3 Ignore Status==0 objects in C4ObjectList::CheckSort 2012-02-12 04:21:42 +01:00
Armin Burgmeier 612f14016e Also check order of last list entry in C4ObjectList::CheckCategorySort 2012-02-12 04:21:18 +01:00
David Dormagen 5749053687 docs updated for the DrawMap/DrawDefMap change 2012-02-11 23:25:37 +01:00
David Dormagen b359373f5d clearing of landscape is now done in C4Landscape::MapToLandscape instead of MapToSurface 2012-02-11 23:24:53 +01:00
David Dormagen 2a53b55a45 added parameter for DrawMap and DrawDefMap to retain old material if sky is drawn 2012-02-10 21:48:48 +01:00
Armin Burgmeier cd8becb577 Remove executable bits of non-executable files 2012-02-10 01:18:15 +01:00
Felix Wagner a1ab572fe4 New wheat graphic from Nachtfalter 2012-02-09 01:29:50 +00:00
Günther Brammer 286a32f47d Remove C4GroupEntryCore::(Has)CRC, calculate the CRC on demand
The CRC was basically only used to decide which files to include in update
groups, but calculated for every group and then stored in the file on disc.
And for some unknown reason, updates themself didn't produce the right
numbers in the file.

This means that c4groups with this change cannot reproduce groups written
by older c4groups and vice versa, but this isn't necessary for updates, and
reading is compatible both ways.

Except for the ways that C4Update fails to remove the CRCs.
2012-02-08 00:12:44 +01:00
Felix Wagner 3211605f40 Tweaks for the lift tower. 2012-02-08 01:28:22 +00:00
Günther Brammer 4fb3007690 win32: Fix out-of-tree setup build 2012-02-05 21:43:55 +01:00
Armin Burgmeier 2092baaa18 Fix possible double close when attempting to open uncompressed files 2012-02-05 20:00:47 +01:00
Armin Burgmeier fb27b9c1c3 Reset Unsorted flag only after sorting has been fully finished
This not only seems more correct but might also fix #711
2012-02-05 17:28:55 +01:00
Nicolas Hake fd4540d573 cmake: Read Mercurial revision from .hg_archival.txt if available
This way cmake will generate a correct C4Version.h from source tarballs
generated by hg archive.
2012-02-05 02:08:45 +01:00
Felix Wagner 32028fd903 Fixed elevator picture 2012-02-04 23:17:02 +00:00
Armin Burgmeier f50ebf6441 Update C4Group packing order
This speeds up loading of packed files significantly. It's not optimal,
though, because the order in which textures are loaded by the engine
is not known by c4group (it depends on their occurence in the Scene.material
file). This could be fixed by specifying custom packing orders for every
object we have. But then again maybe switching to a different format which
allows for random access might be more worth it.
2012-02-04 22:08:38 +01:00
Armin Burgmeier 8e5b9262df Fix a possible file leak in CStdFile::Open
This happened if open() worked but c4_gzdopen failed. This bug prevented
Objects.ocd being packed because of "Too many files open."
2012-02-04 21:28:17 +01:00
Maikel de Vries 121f3092b2 Add lorry for real to GoldRush and IronPeak 2012-02-04 18:19:13 +01:00
David Dormagen e5746dd407 Sprout Berries should look less like plastic 2012-02-04 15:03:39 +01:00
Armin Burgmeier 139184c540 Set system data path to exepath for binaries with automatic updates
Updates work only when the game data is at the same location as the binary.
If this is not the case then the game was probably installed differently,
for example via the distribution or with make install. In this case we
cannot do automatic updates but we also want to use a different system path.

This fixes the linux development snapshots and release tarballs. They were
broken in the sense that they didn't find their game data.
2012-02-03 23:43:18 +01:00
Armin Burgmeier 6da98a26b5 Generate packed groups only at make install or make setup
But not for regular make when just compiling the source code.
2012-02-03 22:22:25 +01:00