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

5950 Commits (271ef8ca093466060a1d86a1cb34a05f8d5bee80)
 

Author SHA1 Message Date
Sven Eberhardt 271ef8ca09 Implement looping for OpenAL music. 
Also added some error logging.
 2014-08-07 15:51:58 +02:00
Sven Eberhardt cfe242b2b8 Implement ogg file playing for OpenAL-based audio system. (#1096) 2014-08-07 13:46:45 +02:00
Sven Eberhardt 4f1aa7c5cf Destroy single pixels of non-diggable material [ala] 2014-08-05 17:02:20 +02:00
Sven Eberhardt 20558ef7e1 Display dialogue attention marker in front of associated clonk 2014-08-05 17:02:19 +02:00
Sven Eberhardt 46d9162d56 Fix typo in chemical lab ruin name 2014-08-05 17:02:18 +02:00
Armin Burgmeier c6216ddef5 mape: Initialize random number generator (#1094) 2014-08-05 09:30:49 -04:00
Armin Burgmeier 1b425696ac mape: Suppress console window on Windows 2014-08-04 21:58:47 -04:00
Armin Burgmeier dbadd3bcbe mape: Show rendering time in statusbar 2014-08-04 16:27:07 -04:00
Armin Burgmeier 7339f7ae8d mape: Re-initialize script engine between renderings 
Otherwise there are warnings when the user changes the value of a
constant, since it was initialized with a different value at the
time of the previous rendering.
 2014-08-04 16:27:06 -04:00
Armin Burgmeier cee110de34 mape: Set output window size to size of generated map 
This is useful when a Map.c script specifies the size of the map.
 2014-08-04 16:27:06 -04:00
Armin Burgmeier 0c4bbfaf16 mape: Load the Library_Map script 2014-08-04 16:27:06 -04:00
Armin Burgmeier 428046400d mape: Implement minimalist C4DefList 2014-08-04 16:27:06 -04:00
Armin Burgmeier 4267d07616 mape: Also load syntax highlighting from current directory and repository 2014-08-04 16:27:06 -04:00
Armin Burgmeier 08cdf0e301 mape: Initialize script engine only once instead of per-rendering 2014-08-04 16:27:05 -04:00
Armin Burgmeier bac7a89ce1 mape: Make sure error messages from the linker are shown 2014-08-04 16:27:05 -04:00
Armin Burgmeier d32eb98ee1 mape: Fix crash when InitializeMap() returns false 2014-08-04 16:27:05 -04:00
Armin Burgmeier cd388ba178 mape: Add syntax highlighting for Map.c files 2014-08-04 16:27:05 -04:00
Armin Burgmeier afa32381ad mape: Default to the new map generator 
Only use the C4MapCreatorS2, when the file is called "Landscape.txt".
 2014-08-04 13:04:35 -04:00
Armin Burgmeier ade34f5efe mape: Add interface to run the new script map generator 2014-08-04 13:04:35 -04:00
Armin Burgmeier 6143f884f0 Allow MapScript generator to use non-global material and texture maps 2014-08-04 13:04:35 -04:00
Armin Burgmeier f25ec83568 Link C4MapScript into mape 
Remove the two dependencies to ::Game from C4MapScript, so that ::Game
does not need to be linked into mape, which would basically drag the
whole rest of the engine after itself.
 2014-08-04 13:04:35 -04:00
Armin Burgmeier 92720cf490 Allow C4ScriptHost to load a script from memory 
This will allow mape to feed the Map.c that is being edited directly to
the map generator.
 2014-08-04 13:04:34 -04:00
Armin Burgmeier 62f8b75d25 gitignore: Only ignore mape executable, not src/mape directory 2014-08-04 09:34:58 -04:00
Nicolas Hake 72865fe166 Only fallback to natupnp.h on Windows 2014-08-03 21:56:50 +02:00
Nicolas Hake 227d3d760d Ship a fallback natupnp.h 
MinGW doesn't bring a natupnp.h out of the box. Add one to the repository
so MinGW builds also support UPnP/NAT-PMP.
 2014-08-03 21:48:53 +02:00
Armin Burgmeier 42c1826935 mape: Don't hold the GDK thread lock (#1091) 
The lock was from times when the GTK+ widget was updated directly
from the render thread, but this is not the case anymore, so it
can be removed without substitution.
 2014-08-03 12:44:02 -04:00
Nicolas Hake 642ce2eb9c Merge all of the audio provider switches into one 
There's no point in splitting the audio library selection into multiple
CPP macros, since there can always only be one anyway. Merge all of them
into a single macro AUDIO_TK (for "toolkit") and have CMake select one
for the user, instead of making him choose (and potentially failing).
 2014-08-01 23:37:42 +02:00
Sven Eberhardt 474b6e1c31 Add Dlg_*_Init callback to dialogues. To be used e.g. for starting timers of NPC activities. 
Also fix scenario saving of attention state in dialogue object.
 2014-07-31 23:49:15 +02:00
Nicolas Hake 86a0351e09 cmake: Remove USE_APPLE_CLANG option 
The option has been unused for a while, and clang is the default
compiler on OS X.
 2014-07-28 16:46:00 +02:00
Nicolas Hake 5eca6f8f35 cmake: Don't prefer pthreads on win32 
Recent MinGW releases ship a pthread implementation for Windows. So while
CMake is technically correct in finding pthread, we don't want it to, and
instead use the standard Win32 threading.
 2014-07-27 23:05:16 +02:00
Maikel de Vries e98b1bd696 fix GoldRush difficulty 2014-07-27 20:04:16 +02:00
Sven Eberhardt e8ee64fd1f Smoke graphics rework (#1088) 2014-07-22 22:42:33 +02:00
Sven Eberhardt 834566cf5e Make smoke a bit smaller. 
It somehow got really large and weird since the particle changes.

It could still get some polishing, but at least it's a bit less annoying now.
 2014-07-21 17:28:11 +02:00
Sven Eberhardt 620091f80c Fix switch of cinematics target in Dialogue. 2014-07-21 17:26:56 +02:00
Sven Eberhardt fafa97e72b Fix memory leak in particle system. 
Particle chunks were removed from the list (in the particle thread), but never deleted. They must be deleted from the main thread since it will delete GL objects. So simply delete empty chunks in the drawing proc.
 2014-07-20 19:21:00 +02:00
David Dormagen 3600e58198 fish: added a somewhat natural population control 
Fishes will spawn roe at feeding locations. When a fish dies, another fish is spawned if roe is around.
 2014-07-20 15:16:54 +02:00
Maikel de Vries 7ab6b33d6a unify base materials in Worlds.ocf scenario folder 2014-07-14 21:31:22 +02:00
Maikel de Vries 30435782d4 unify knowledge in Worlds.ocf scenario folder 2014-07-14 21:01:14 +02:00
Maikel de Vries a4a57a3dd6 added pump knowledge to golden mountain 2014-07-14 18:51:16 +02:00
Sven Eberhardt bb96406262 Fix scenario saving of clonk skin 2014-07-13 14:37:47 +02:00
Sven Eberhardt f530badbe2 Fix scenario saving of flipped elevator 2014-07-13 14:37:29 +02:00
Sven Eberhardt d1b4e7ceac Added Ding sound 2014-07-13 14:36:59 +02:00
Sven Eberhardt 6f1472e706 Revert pathfinder bug introduced in 086e3e9e10 2014-07-13 14:36:36 +02:00
Sven Eberhardt 7db507921a Added attention symbol to dialogues 2014-07-12 16:03:23 +02:00
Sven Eberhardt 0d17310a7a Ruby and Amethyst material moved to main Material.ocg 2014-07-12 12:33:01 +02:00
Sven Eberhardt 220617655b Merge branch 'underwater' 2014-07-10 23:13:55 +02:00
Sven Eberhardt 32ca09a152 Coral, Fish and Piranha moved from Deep Sea Mining into Objects.ocd 2014-07-10 19:59:39 +02:00
Sven Eberhardt 5857be16d5 Deep Sea Mining moved to missions folder 2014-07-10 19:54:36 +02:00
Julius Michaelis 0476acef4f Fix landscape generation bug introduced by 2c7d9c0549 
<Sven2> Your fix of the parent check for points in the landscape.txt parser. if (!(pToNode->Type() == MCN_Overlay))
<Sven2> It should also allow the poly algo in maps
<Sven2> i.e., make it if (!(pToNode->Type() == MCN_Overlay) && !(pToNode->Type() == MCN_Map))
<Sven2> Actually, better make it if (!pToNode->Overlay())
 2014-07-09 17:02:02 +02:00
Sven Eberhardt c51710a1b7 Deep sea mine: Add lorry to construction plans 2014-07-06 21:59:05 +02:00