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

7499 Commits (f0030e33e04ef29ae4e35084ef9f66166dce7aa8)
 

Author SHA1 Message Date
Peter Wortmann f0030e33e0 Warning fixes 
Actually pretty sure a few of them were bugs. Hopefully no new
ones were introduced here.
 2015-10-03 15:32:39 +01:00
David Dormagen 619fc0b65a new animal: puka 
Currently only walks around and randomly electrocutes you.
 2015-10-03 13:54:19 +02:00
Julius Michaelis 6fe58fd878 Add warning about old gcc when !HAVE_WORKING_REGEX 
Related to ee859d8.
 2015-10-03 13:42:46 +02:00
Julius Michaelis 2ad045f8d6 Replace strtod with stringstreams in C4ScriptGuiWindow::SetPositionStringProperties to avoid locale problems (second attempt) 
Also added warnings and fixed a few whitespacing errors.
 2015-10-03 13:17:17 +02:00
Sven Eberhardt 7211ee171f Follow view of dead clonk for two seconds before respawning with base respawner (#1390). 2015-10-03 02:23:35 -04:00
David Dormagen 910aa4efaa squid: updated behavior & added angry squid 
The default squid is still friendly (with a new texture now). Setting friendly=false during Place()ment creates red, angry squids.
Being in an ink blot drains a Clonk's breath faster now (because of the panic and increased heart-rate of course).

The friendly squid texture was created by Matthi as well.
 2015-10-02 18:34:48 +02:00
David Dormagen 38397aacaa bubble: fix category 
The bubble is definitely not a vehicle.
 2015-10-02 17:59:45 +02:00
David Dormagen c1bb8ef34d diamond: fixed graphics file name in material file 2015-10-02 17:16:59 +02:00
Sven Eberhardt 664798af39 Add fireflies to Crash Landing. 2015-10-01 23:28:15 -04:00
Sven Eberhardt c678c07c40 Add squid to The Raid. 
Just so we show it off somewhere.
 2015-10-01 23:22:57 -04:00
Sven Eberhardt 69b3b21766 Remove erroneous IsInteractable from windmill. 
It doesn't seem to have an interaction. Pressing [Space] in front of the windmill would just cause a script error.
 2015-10-01 23:21:24 -04:00
Sven Eberhardt bffc08c314 Diamonds: More bling when dug out and placement in arbitrary areas. 
It was a bit weird when they just "appeared" so now there's also a sound.

Also added a forward for placement directly on Diamond, since sockets are their "natural" placement method.
 2015-10-01 22:45:13 -04:00
Sven Eberhardt 5b47a26d30 Perform DugOut callback also on non-collectibles and on objects not created through Dig2Object mechanism. 2015-10-01 22:43:01 -04:00
Nicolas Hake c8e1a38950 Revert "Replace strtod with strtof_l ..." 
This reverts commit 139dee9874.

The commit introduced a memory leak on glibc, and broke the build on all
other platforms.
 2015-10-01 20:50:40 +02:00
Julius Michaelis 139dee9874 Replace strtod with strtof_l in C4ScriptGuiWindow::SetPositionStringProperties to avoid locale problems 
(That function could still use some more love, though: Error messages and not accepting ridiculous things when parsing.)
 2015-10-01 19:50:05 +02:00
Armin 5a2bfe40a6 Docs: Map.c examples: Replace DrawSulphur with DrawFirestone. 2015-10-01 18:46:35 +02:00
Armin 895d5f1b0e Add german Flooden Veins description and correct some mistakes. 2015-10-01 18:46:35 +02:00
Randrian45 8076075c5b added firefly and test scenario for it 
squashed:
adjusted fireflies to style guidelines
* fireflys emmit light
+ added firefly and test scenario for it
 2015-10-01 18:40:14 +02:00
David Dormagen e6e4f06c92 added diamond item 2015-10-01 16:35:58 +02:00
Sven Eberhardt b5fe6ea02a Fix mac build. 2015-10-01 00:22:43 -04:00
Sven Eberhardt 3d7d848eea When fading from running songs, fade out and then start new songs directly instead of fading into them. 
For songs that start abruptly, fading into them often ruins the beginning.
 2015-10-01 00:08:35 -04:00
Sven Eberhardt 17e0e2f423 Add breaks between music. 2015-09-30 22:50:18 -04:00
David Dormagen a8943f88d5 added squid 
Model and texture by Matthi.
 2015-09-30 18:31:44 +02:00
Julius Michaelis 9a7d57c0d2 Fix assertion firing in C4ConsoleGUI::SetInputFunctions introduced by 9e771ac 2015-09-30 14:35:50 +02:00
Clonkonaut bfd0bd035d Added magic energy support for 3rd party devs. 2015-09-30 10:20:20 +02:00
Clonkonaut 178e904fdd HUD redesign. Beware! 
Added interaction icon to help knowing when interaction is possible.
Limited crew portraits and information to two clonks.
Added additional warnings texts for further clonks (crew count > 2).
Moved inventory from bottom to top.
 2015-09-30 10:11:43 +02:00
Sven Eberhardt fc7d16b2aa Fix mac build (I hope). 2015-09-29 21:31:13 -04:00
Sven Eberhardt 737b1fd8fd Save screenshots in background thread (#998, #1104). 
Also ensure music keeps streaming while collecting data for full map screenshot.
 2015-09-29 20:48:34 -04:00
Sven Eberhardt 3159793dfc MSVC build fix 2015-09-29 20:38:15 -04:00
Julius Michaelis ee859d85e0 Remove boost any usage of boost libraries 2015-09-30 00:16:12 +02:00
Julius Michaelis 0d1a0241f9 Fix umlauts and typo in GoldRush dialogue 2015-09-29 21:30:57 +02:00
David Dormagen 6756db2768 C4ScriptGuiWindow: fix copyright header 
The remaining old header has now been adjusted to the new one.
See e0dc30c59a for details.
 2015-09-29 19:13:12 +02:00
Sven Eberhardt 62c3d13ece Document InitializeAmbience. 2015-09-28 20:20:57 -04:00
Sven Eberhardt 8614ce46c4 Create default ambience controller in all scenarios. 
Can be overloaded by providing a custom function InitializeAmbience either globally or in the Scenario proplist.
 2015-09-28 20:20:31 -04:00
Sven Eberhardt 59d7c761fc Screenshot fixes and optimizations. 
* There was an off-by-one-error causing a blank line at the screen upper screen border.
* Remove ApplyGamma. It is always applied because Gamma is just part of the drawing shaders now.
* Save by copying rows instead of pixels for whole map screenshots.
 2015-09-28 18:54:34 -04:00
Sven Eberhardt f1970c5bc1 Add day/night cycle to The Raid. 
It looks really cool and the first mission should show that feature.
 2015-09-28 17:01:03 -04:00
Sven Eberhardt aff87890e7 Fix initial ambience and music setting in sequences without cursor. 2015-09-28 16:53:14 -04:00
Sven Eberhardt edf66783aa Announce the name of each music piece only once. 2015-09-28 16:29:36 -04:00
Sven Eberhardt d6f16a0890 Change music switch due to playlist change to prefer to resume pieces that were recently played. 2015-09-28 16:29:36 -04:00
David Dormagen 2346745fe8 chippie finetuning 
- do not attack things when under water
- can catch fire now
- reduce normal (random) chance of laying eggs, still the same amount of eggs when leeching HP
- can grow to oversize when sucking on a Clonk (large chippies look cool)
 2015-09-28 19:56:12 +02:00
Sven Eberhardt 6da62d9220 Enable music resume in ambience music switcher. 2015-09-27 20:58:55 -04:00
Sven Eberhardt 3f6cacade4 Add parameters to Music and SetPlayList to resume a piece from where it was last interrupted. 2015-09-27 20:58:37 -04:00
Sven Eberhardt 766cd3e7d6 Fix default map zoom in docs (#1409). 2015-09-27 16:12:17 -04:00
Sven Eberhardt 9e771acfd1 Editor: Add most recently entered script lines to dropdown list. 
This also enables easier auto-completion via arrow-down.
 2015-09-27 15:28:17 -04:00
David Dormagen 052e0358d9 script guis: document and give example for names starting with underscores 2015-09-27 18:34:18 +02:00
Sven Eberhardt 0afc12a3f0 Fix treasure hunt goal messages. 2015-09-26 20:36:35 -04:00
Sven Eberhardt d3ee2fac57 Fix sorting of script and engine functions in dropdown menu in editor. 2015-09-26 20:10:55 -04:00
Sven Eberhardt 8073fb3c07 Drop some fused and connected items on death when respawning with inventory. 2015-09-26 17:56:36 -04:00
Sven Eberhardt 14eea60e64 Fix fuse ignition when dynamite igniter or box falls into lava. 
The delayed explosion effect introduced some bugs here.
 2015-09-26 17:38:17 -04:00
Sven Eberhardt 7edf197246 Fix script error when EnemyAI on chippie tries to jump 2015-09-26 17:20:07 -04:00