cbd068cca9
Loom: updated diffuse map
2015-10-08 10:22:23 +02:00
3ec8683d45
Elevator: Use ActMap Speed, Accel, Decel. Implemented wheel animation.
2015-10-07 02:00:35 +02:00
a8c85ff766
Made elevator more usable when swimming.
2015-10-07 01:10:32 +02:00
e1789c3251
Elevator: No more auto movement but called by interaction.
2015-10-06 15:09:14 +02:00
b8ed577c0f
Rotate the OGRE coordinate frame by 90 degrees in X
...
Also rotate all meshes backwards so that everything keeps working. This should
make it more convenient for modellers to create new meshes.
See http://forum.openclonk.org/topic_show.pl?pid=29410#pid29410 .
2015-10-03 11:39:08 -04:00
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
329eaac691
fix foundry collection zone
2015-09-12 22:37:21 +02:00
0df19491e7
Get rid of incorrect sRGB headers in png files.
...
libpng >1.6 keeps nagging because of that.
Quick bash script to do so:
find . -name *.png \
| while read f; do
n=$(pngcrush -ow -rem allb-reduce "$f" 2>&1 | grep -c 'incorrect sRGB');
if [[ $n -gt 0 ]]; then
git add "$f"
else
git checkout "$f"
fi
done
2015-09-12 21:27:53 +09:00
f333df2c73
always show interaction menu for pump & structures in general
...
The HasInteractionMenu callback of the pump was eaten by the merge. I checked.
2015-09-10 18:23:44 +02:00
cc3452bd0d
custom guis: properly scale with font size now
...
Previously, the em <-> pixels conversion was a hardcoded value. Now the GUI scales with the font size that can be selected in the options.
Sadly, all scales were off since the hardcoded value was too low.
2015-09-06 19:02:31 +02:00
ef0e4ea7b7
elevator digging out objects is forwarded to clonk
...
This ensures earth ends up in the bucket and is not dug out.
2015-09-06 10:09:46 +02:00
dd690e62b9
Added anti-clogging mechanism to pump.
...
Now pipes cycle through several offsets before giving up on the pumping.
2015-09-05 13:10:55 -04:00
6357db3b92
sawmill: hide production menu and show helpful tip instead; also saw wooden objects into wood for real now
2015-09-04 17:19:12 +02:00
ac738735b2
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
src/game/C4Game.cpp
src/game/C4GraphicsSystem.cpp
src/gamescript/C4GameScript.cpp
2015-09-02 08:19:34 +02:00
86a68f8d9f
Loom: renamed animation "my_animation" to "Working"
2015-08-28 16:17:56 +02:00
333bb1e771
Loom: Added Model with animations
2015-08-28 13:47:48 +02:00
2d223188cd
Fix sawblade rotation.
2015-08-24 00:10:30 +02:00
36544bd56c
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
planet/System.ocg/FindLocation.c
2015-08-02 19:24:04 +02:00
d2bfdb9d4b
Remove some unnecessary properties when saving free basements in saved scenarios.
...
Width and category were saved even on default values.
2015-07-25 20:38:45 -04:00
0e48f2baaa
New model for the loom. Animation is missing.
2015-07-23 15:09:11 +02:00
609df7df88
Added 3 libraries: Lamp Post, Lamp and Lamp Dummy
...
Reworked the lantern and buildings to use the libraries.
Lamp Post: Included by buildings if lamps should hang outside.
Lamp: Included by lamps!
Lamp Dummy: Included by the dummy object that resembles the (outisde) hanging lamp.
2015-07-18 13:14:31 +02:00
f653d4c70c
Lantern may now be attached to buildings. Simply put it in the building's inventory.
2015-07-02 22:36:32 +02:00
0e4ad1797e
improve double elevator vehicle movement by having a single solid mask
2015-06-08 21:20:38 +02:00
178dce647d
fix flagpole selling
2015-06-07 12:54:40 +02:00
2e0bde2a1c
fixed interaction for construction site and chest
2015-06-07 12:28:22 +02:00
45444c0d6a
block putting non-valuable into the flag, sell the valuables
...
This needs some graphics on the contents side opposing the flag and the functionality is best put in a separate library.
2015-06-07 11:34:32 +02:00
3a6bcaafb6
use new script gui for goal and wealth HUD
2015-06-03 22:36:36 +02:00
196f528201
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
src/game/C4Game.cpp
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
16d8dac26d
wealth icon instead of $ for flagpole buy submenu
2015-06-01 21:58:47 +02:00
aa84f78c03
fixed description of the chest interaction
2015-05-21 22:32:23 +02:00
8a297766b3
fix pump power consumption ( #1309 )
2015-05-13 21:18:15 +02:00
067c4d4e57
Light up target door on remote control by switch ( #1296 ).
2015-05-07 20:26:16 +02:00
21500a81a9
Fix pump to clear the last row of pixels ( #1057 ) and allow pumping from pump without source pipe.
...
ExtractMaterial has been changed to be able to slurp in from the most distant horizontal position rather than the closest to the extraction top center.
Also speed up ExtractMaterial for the common case of no required horizontal shifts.
2015-05-01 18:13:41 +02:00
6ae279d7ac
improve moving objects out of basement on completion
2015-04-08 20:15:23 +02:00
58c1220a19
fix scenario saving of basements
2015-04-07 18:54:29 +02:00
7d2386b7f6
add missing descriptions for chest and gold idol
2015-04-05 17:53:12 +02:00
d077d3343e
reworked bucket & producer library to work with stackable earth objects instead of magic material amounts
2015-03-26 12:27:10 +01:00
a24dd229c4
producer does not depend on partial fuel amounts
2015-03-24 22:39:18 +01:00
ebcc397221
add proper support (inventory & interaction-menu contents) for extra slot library
...
Also fix bug with GuiScriptWindow where scrollbars would not be hidden in some cases (f.e. no-crop parent and negative-top child).
2015-03-19 16:22:06 +01:00
ca04f00a58
add test for underproduction of power
2015-03-09 18:55:18 +01:00
7c08270ff4
make power need call susceptible to proplist function change
2015-03-09 18:40:45 +01:00
33011b91f5
generator wheel has Plane = 1 to not trigger warning
2015-03-06 22:39:52 +01:00
0ed8c2faa5
fix pumping downwards after source emptyness
2015-03-05 20:40:10 +01:00
650447ff19
Fix category of wind generator wheel helper object
2015-03-02 22:35:10 +01:00
6466c6d45b
adapted flagpole to the interaction menu; moved some frequent checks (completion/hostility) to the interaction menu; the flag is no longer static back
2015-03-01 11:20:33 +01:00
f169640713
interaction menu: improved support/updating of custom entries; adapted pump & producer to interaction menu
...
Also fooled around with the layout of the interaction menu. Far from final though.
2015-03-01 10:27:29 +01:00
047bafaa6a
improved support for custom interaction menus; made pump control use the new interaction menu
2015-02-27 11:23:20 +01:00
40e0ea7bfc
fix door control for wooden cabin
2015-02-18 18:25:49 +01:00
6cd3b9775c
fixed power need symbol display for elevator
2015-02-15 09:34:45 +01:00
a5b6066f25
fix removal of ownership on flag movement
2015-02-14 00:16:32 +01:00
WinExploder