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

3657 Commits (b032b6c3e30d682aa8b4b1095018e0774e2f6c2e)
 

Author SHA1 Message Date
Armin Burgmeier b032b6c3e3 Use std::sort again instead of a custom implemantion for debugging purposes 
This was committed accidentally. I blame hg for having a crappy ui.
Fixes the display of trees again.
 2012-01-28 21:48:07 +01:00
David Dormagen 35f0cc6c73 Sprout Berry Bushes now have darker color 2012-01-28 21:43:18 +01:00
Armin Burgmeier 86bc3ac417 Don't print an error message for ERROR_PATH_NOT_FOUND in DirectoryIterator::Read 
We do the same already for ERROR_FILE_NOT_FOUND. This fixes a harmless warning
when running the engine in a release directory where there is no planet/
directory.
 2012-01-28 18:15:51 +01:00
Armin Burgmeier a1370c2954 Rename our custom gz* functions to avoid conflicts with zlib.dll 
This fixes the build with native mingw for me.
 2012-01-28 17:02:37 +01:00
Armin Burgmeier f4bc45c4a3 Don't do wildcard matching and other fancy stuff in C4DefList::Load 
Instead just attempt to load the filename given. This function is only
used from two places: C4Game::InitDefs and C4Game::DropFile. In both
cases segments and wildcard matching is neither needed nor desired.

This fixes a problem with loading definitions when the Clonk installation
resides in a directory with paretheses, such as C:\Program Files (x86)\.
This might well fix the problem in http://forum.openclonk.org/topic_show.pl?tid=905.
 2012-01-28 00:33:28 +01:00
Armin Burgmeier b2e26700cf Win32: Allow forward slash as separator when loading local definitions 
This leads to an obscure error otherwise where local definitions are skipped
from loading when running the scenario as clonk.exe Tutorial.ocf/Tutorial01.ocs.
The scenario loads fine as such but some definitions are missing and therefore
it doesn't work properly. See also http://forum.openclonk.org/topic_show.pl?tid=905.
 2012-01-27 23:21:03 +01:00
David Dormagen 42e5c6cbec The mass mover clears its data when loading fails 
Happened in some cases when changing a scenario section.
 2011-07-16 21:57:14 +00:00
Günther Brammer a667e0beb6 Remove duplicated functions from GetXVal.c 2012-01-25 00:36:52 +01:00
Günther Brammer e432f5bc42 Endeavour.ttf update 2012-01-12 01:35:19 +01:00
Günther Brammer 7e8deec201 autotools: UPnP 2012-01-27 01:42:37 +01:00
Julius Michaelis 597f928ec6 Update docs on arrays 
Add some German translation strings
 2012-01-25 23:25:32 +01:00
Felix Wagner 9c82958fa1 Little tweaks for the player options dialogue 2012-01-25 04:53:59 +00:00
Peter Wortmann 790b9d6af6 Ensure that even with workarounds #version is always first directive in shader 
This fixes workarounds for some drivers. Most notably mine. Now if only
it wouldn't fail silently...
 2012-01-24 00:17:37 +00:00
Peter Wortmann 70de47bc1c Cap material store once objects can't be collect any more 
This means that if the Clonk digs Earth but has a full inventory at the time
(so we can't generate Earth chunks), digging another material later can never
yield more than one Earth chunk.
 2012-01-21 17:33:00 +00:00
David Dormagen a09a2c55ad removed unneeded mesh-file from the berry bush 2012-01-22 02:13:30 +01:00
David Dormagen d6b90bdaa7 Sprout Berry Bush added 2012-01-22 00:20:16 +01:00
Nicolas Hake 6979657962 cmake: Add required libixml to UPnP libraries 
Earlier versions of ld(1) would attempt to implicitly satisfy link requirements
by checking the dependencies of linked-in libraries. Current versions don't do
this anymore, so we need to explicitly spell out all dependent libraries on the
linker command line.
 2012-01-21 14:05:44 +01:00
Armin Burgmeier 23d54ea2c9 Implement UPnP for Linux using libupnp 2012-01-21 02:04:14 +01:00
Felix Wagner a059f0f64a DisregardsKnowledge -> IgnoreKnowledge, NeedsRawMaterial -> NeedRawMaterial 2012-01-19 22:31:05 +00:00
Felix Wagner 48dd87ef6b License change for FanLoop and Munch2 2012-01-19 19:19:56 +00:00
Felix Wagner 1116e4a752 Replaced cash sound, now CC BY 3.0 2012-01-19 17:55:53 +00:00
Felix Wagner 93e70838ee Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
Felix Wagner 72bf39f915 ProducerLib: Production costs include need for fuel, power and liquids 2012-01-19 16:18:24 +00:00
Felix Wagner 4cc20755fe Production/ConstructionMenu: Show components when hovering instead of rightclick 2012-01-19 15:04:22 +00:00
Felix Wagner d8f852b56a Fixed throwing on backpack closing 2012-01-19 14:03:36 +00:00
Felix Wagner 54b97e8b0a Weird code tweak. How could this not provoke an error? 2012-01-17 22:40:26 +00:00
Felix Wagner 0aefa9cdb0 bugfix 2012-01-17 22:39:10 +00:00
Felix Wagner 058c476bfc Changed knowledge regarding tools 2012-01-16 23:33:08 +00:00
Felix Wagner 0937b60ad6 Set foundry, sawmill and windmill to disregard knowledge (every product available) 2012-01-16 23:32:46 +00:00
Felix Wagner f76a41da66 Producer will by default only display those products in the owner's knowledge 
(everything if NO_OWNER)
 2012-01-16 23:32:19 +00:00
Felix Wagner 7aadaf4d33 Removed WoodenCabin from GoldRush (what the heck?) 2012-01-16 00:22:24 +00:00
Nicolas Hake 3738069ecd MinGW: Define UPnPNAT CLSID/IID values 2012-01-15 23:22:01 +01:00
Nicolas Hake 33b8fa83d3 Correct file path capitalization 2012-01-15 22:45:04 +01:00
Nicolas Hake cca86151fd Move #include to .h to avoid defining a function with an incomplete type parameter 2012-01-15 22:36:27 +01:00
Nicolas Hake 067456d213 Remove superfluous includes 2012-01-15 22:35:22 +01:00
Nicolas Hake 683800c33c win32: Add UPnP port mapping support 2012-01-15 21:27:16 +01:00
Armin Burgmeier 687c1f4920 Print the location of the mesh in the error message when failing to load a mesh 2012-01-13 23:44:05 +01:00
Maikel de Vries a675400f8a Loam can be produced at the foundry with water 
still need to display water needs
 2012-01-12 19:23:35 +01:00
Armin Burgmeier c46f406943 Smoother movements on objects on moving solidmasks 
The behavior is still not perfect yet since the attachment of the object
to the SolidMask may re-position the object by 1 pixel. I am not sure
this can be solved correctly since there are three coordinates involved
who can be (and, generally, are) different on a sub-pixel level. These
are the object's position itself the position of the solidmask object
and the position of the solidmask (which is constrained to pixel boundaries).
However, the attachment code only knows the object and the solidmask, not
the solidmask object, so it possibly cannot properly account for this.
 2012-01-12 00:49:12 +01:00
Tobias Zwick 955a321885 another license update 2012-01-11 19:46:29 +01:00
Tobias Zwick 6540aa9efb replaced airplane propeller sound 2012-01-11 19:43:53 +01:00
Tobias Zwick da36f29023 license updates 2012-01-10 19:13:24 +01:00
Felix Wagner 34a99fb15d Added elevator to GoldRush 2012-01-11 02:06:12 +00:00
Felix Wagner 1cc5f78171 No more messages from burning objects 2012-01-11 02:03:09 +00:00
Felix Wagner cc37156db7 + Library_ElevatorControl, for all vehicle to be snatched by the elevator case 2012-01-11 02:02:59 +00:00
Armin Burgmeier 6afadc6397 Allow mesh graphics images in messages 2012-01-10 22:40:46 +01:00
Maikel de Vries feafa4da2f Fixed team account 2012-01-10 21:01:53 +01:00
Maikel de Vries e6546bf776 Objects: Added team account rule 
This still needs some improvements
 2012-01-10 18:33:24 +01:00
Maikel de Vries bf5a441244 Objects: Added money goal for GoldRush 2012-01-10 18:32:45 +01:00
Felix Wagner 2078e47558 Elevator in cable lorries, testing purpose 2012-01-10 16:50:16 +00:00