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
Maikel de Vries
69fb0e52e6
fixed GoldRush descriptions
2014-07-06 18:28:20 +02:00
Maikel de Vries
4967b07a39
Iron Peak game goal is now metal production and expansion
2014-07-06 18:13:09 +02:00
Maikel de Vries
a08b5bcdb8
added construct gold idol goal to GoldRush.ocs
2014-07-06 17:27:03 +02:00
Maikel de Vries
aa4d34549d
added construction goal
2014-07-06 17:24:30 +02:00
Sven Eberhardt
6b614e49c9
Deep Sea Mining: Intro and outro dialogs.
...
Also make gems unsellable. Selling your only gems is a stupid way to lose.
2014-07-05 16:47:34 +02:00
Sven Eberhardt
ac395ba65f
Increase display time of global messages.
...
Global messages are usually important and contain story elements, game goals, etc. So they should stay for a bit longer than e.g. object status messages.
2014-07-05 16:44:48 +02:00
Sven Eberhardt
5cd9b915b0
Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics.
...
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
2014-07-05 15:25:30 +02:00
Sven Eberhardt
28ba0ca4c5
DeepSeaMining scenario and game goal reworked.
...
* Goal is now construction of a communication structure
* Map size halved
* Do not respawn fish in player view range
Constructor: Added some callbacks for custom construction sites
Rubies: Store used graphics in local variable
ContentsMenuController: Added safety checks when host object is deleted in callback
2014-07-03 21:22:37 +02:00
Sven Eberhardt
4556cb4890
Add particle value provider function PV_Sin
2014-06-30 01:00:15 +02:00
Sven Eberhardt
49327c40a7
Construction site: Added function to disallow site cancellation. Added callback to structure for custom build preview.
2014-06-29 00:08:51 +02:00
Sven Eberhardt
187b469094
Fix amethyst name and description.
...
Was inherited from ruby.
2014-06-29 00:05:14 +02:00
Sven Eberhardt
48fadf13ce
Experimental Deep see mining scenario tweaks.
...
* Horizontal map size halved; gems and goal adjusted accordingly
* Knowledge/BaseMaterial/Wealth updated
* Fish can be eaten when dead to regain energy
* Different piranha munch sound
* Tree respawn ignores chopped trees
* Added hint to preserve coal
2014-06-28 17:35:24 +02:00
Sven Eberhardt
31bcd04063
Added new settlement scenario to experimental folder: Deep sea mining.
...
A gem sale scenario using fixed versions of Zapper's fish from the underwater branch.
2014-06-28 13:20:23 +02:00
Sven Eberhardt
8a705cd599
Update fight for Gidl Icon
2014-06-28 13:18:40 +02:00
Sven Eberhardt
7b93a72b4b
Updated .gitignore to include packed group files generated by cmake install
...
Also added *.nohg* as a pattern for files you don't want to commit yet
2014-06-28 09:33:27 +02:00
Maikel de Vries
01d30e5c62
fixed a typo in FightForGidl goal message
2014-06-27 20:55:37 +02:00
David Dormagen
6217a84f0b
added GetSurfaceVector() to Math.c which can be used to get informations about the surface of the landscape at some point (f.e. for bouncing projectiles)
2014-06-27 20:46:48 +02:00
David Dormagen
fe04a0fe79
added Place()-function to sea weed
2014-06-27 20:39:03 +02:00
David Dormagen
fb1ee2f88f
the Trans_* mesh-transformation-functions are now implemented in the Engine instead of System.ocg
2014-06-27 20:36:47 +02:00
David Dormagen
ad1c2760b0
added callback IsPrey() to the Clonk so that future evil predators can only search for IsPrey and will attack both Clonks and cute little animals
2014-06-27 20:25:21 +02:00
Sven Eberhardt
6d19569963
Added experimental scenario: Fight for Gidl
2014-06-22 16:47:21 +02:00
Sven Eberhardt
30ccb5ef84
Update object fade rule to use !GBackSolid() instead of !Stuck() as removal condition for garbage objects.
...
The condition was meant to avoid removal of earth materials. However, it also left around lots of other objects (like arrows sticking in walls).
2014-06-22 16:41:51 +02:00
Sven Eberhardt
6744ed942a
Fix PlaceObjects material parameter description and example. ( #1083 )
2014-06-14 11:01:01 +02:00