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

4504 Commits (stable-7)

Author SHA1 Message Date
Maikel de Vries 4b01f51337 only structures should have Exclusive=1 
Otherwise these objects would block new constructions
 2016-02-14 13:37:24 +01:00
Maikel de Vries 488ec4d318 shovel: symmetrize dig angle limits 2016-02-14 13:36:39 +01:00
Maikel de Vries 8d63ddfdef fix additional preview overlay after combining with other structure 
This caused an overlay warning in the previewer object when constructing an elevetor and combining it with another elevator and detaching it again.
 2016-02-14 13:35:56 +01:00
Maikel de Vries c0382ceb7f correctly place/preview basement for elevator (#1534) 2016-02-14 13:35:45 +01:00
Sven Eberhardt b4919fb1ec Fight for Gidl: Fix script error on statue death #1610 2016-02-14 13:31:56 +01:00
Maikel de Vries 6978bbe646 fix script errors for wrong parameter types in tele glove 2016-02-14 13:30:23 +01:00
Sven Eberhardt 675740c8dd Add missing sound for snapping line #1644 
Sound original from CosmicEmbers (http://freesound.org/people/CosmicEmbers/sounds/161650/); cropped and pitch adjusted.
 2016-02-14 13:29:21 +01:00
David Dormagen 8aec2eadd2 pickaxe: removed debug message 
introduced in https://git.openclonk.org/openclonk.git/commitdiff/796aa7d7c62c5348417d584c9637da61297736d4
 2016-02-14 13:27:39 +01:00
Sven Eberhardt a52a4335fc Maze: Fix error sound when trying to cheat 2016-02-14 13:26:58 +01:00
Sven Eberhardt c097c6eb35 Fix shovel shoveling in the wrong direction sometimes #1626 2016-02-14 13:26:35 +01:00
Sven Eberhardt d8f9ab5232 Fix pickaxe picking in the wrong direction sometimes #1626 2016-02-14 13:26:27 +01:00
Maikel de Vries 60c5fb99a2 add power information to interaction menu for flagpole (#1579) 2016-02-14 13:24:25 +01:00
Maikel de Vries 79146dac9b power library: methods to for storage information and balance updates 2016-02-14 13:24:15 +01:00
David Dormagen 4c8d4ef18d producers: show progress of current product (#1549) 
This is solved via another entry in the production menu (below the products), which is updated by an effect, that is being told the menu ID/target by the interaction menu through a callback.
This setup allows for very intrusive changes to the interaction menu with only few lines of code!
 2016-02-14 13:24:04 +01:00
Maikel de Vries b49f89d31c move mime skin/portrait from boomshire to decoration folder 
This makes it available for multiple rounds.
 2016-02-14 13:19:26 +01:00
Maikel de Vries e9e06263a8 fix shape of basement construction preview and site (#1586) 2016-02-14 13:18:36 +01:00
Maikel de Vries 2e2450ee77 update license of Sky.jpg in Clonkomotive to cc-by 3.0 2016-02-14 13:18:16 +01:00
Clonkonaut e486712934 Clonkomotive: German translation (#1632). 
I also took the liberty of renaming "HeavyCrumb" to "Boulder". I have never heard the word 'crumb' used in this context.
 2016-02-14 13:16:55 +01:00
Clonkonaut 47820691d0 Elevator construction preview shows placement of the case (#1534). 
Structures can use the definition call ConstructionPreview(Previewer Object, Overlay, Direction) to add any overlay to the previewer. It will be coloured accordingly.
 2016-02-14 13:08:19 +01:00
David Dormagen 684b0d0682 contents menu: fixed possible "use after deletion" error 2016-02-14 13:03:26 +01:00
David Dormagen 546ae30928 cannon: fix possible nil pointer access 
In boomshire, the cannons are automatically filled with boompacks (and then fired). That means that there is no Clonk to be passed.
 2016-02-14 13:03:05 +01:00
Sven Eberhardt 1bba764219 Extinguish transferred contents on respawn 2016-01-18 11:02:00 +01:00
Sven Eberhardt 21390f4c29 Crash landing: Fix post-intro plane placement so it cannot slide into the lava #1615 2016-01-18 11:00:55 +01:00
Sven Eberhardt ba82f5c3ac Raid: Fix goal descroptions and buckets in Mave's foundry. 2016-01-18 11:00:22 +01:00
Sven Eberhardt b0ae8fae84 DarkCastle: Minor objects+text fixes 2016-01-18 11:00:07 +01:00
Sven Eberhardt 193dd6adf4 Hot Ice: Spawn and map improvements in "small islands" mode #1623 2016-01-18 10:56:50 +01:00
Tobias Zwick 0cf9473280 correct Philipp Kern's name in the credit screen 2016-01-18 10:54:52 +01:00
Maikel de Vries 75ab7e0f00 tutorials: hide guide message while in a dialogue (#1593) 2016-01-18 10:48:25 +01:00
Maikel de Vries 6d95c83196 fix dialogue stopping and waiting time (#1597) 
First stop the dialogue properly and then wait for 30 frames to start a new one.
 2016-01-18 10:48:25 +01:00
Maikel de Vries 6655fdf8c7 tutorial 3: lumberjack directs to other villagers when needed (#1596) 2016-01-18 10:48:25 +01:00
Maikel de Vries dbc21d8431 make sawmill site uncancellable in tutorial 3 (#1617) 2016-01-18 10:48:25 +01:00
Sven Eberhardt 082373d6e6 Maze: Fix possible spray line to last position or (0,0) landscape corner #1624 2016-01-16 22:35:46 -05:00
Clonkonaut c54d917f7e Deactivate cheats in Gidl/Guardians. 
We didn't forget!!!
 2016-01-15 21:56:57 +01:00
Clonkonaut 675b9ee050 Fix weapons not buyable in Gidl/Guardians (#1611). 
Switch2Items() is probably broken but luckily not used.
 2016-01-15 21:56:37 +01:00
Sven Eberhardt 44f913d0e5 Do not display grab interaction when swimming (unless clonk returns true on CanGrabUnderwater callback) 2016-01-15 08:54:50 -05:00
Sven Eberhardt c8a76ce450 Use less annoying swim sounds when swimming on the surface. 
The "splash" sounded more like the clonk was jumping into the water.
 2016-01-14 22:32:54 -05:00
Sven Eberhardt 71b96bc5de Fix nil pointer access when recovering from over-full inventory 2016-01-14 22:30:55 -05:00
Sven Eberhardt 27f5cdc461 Fix black waves when swim timer is executed in same frame as clonk leaves the water. 2016-01-14 21:51:30 -05:00
David Dormagen 4493bfc3ab interaction menu: disallow interaction with outside world when contained (#1541) 
The interaction with IsContainer objects is still flawed in a way: when a lorry is inside a (IsContainer-)hut, you can take the lorry into your hands. Since we don't have that possibility in the normal game, I leave it unchanged for now.

However, it is now possible to add a Chest (or a cupboard!) into a WoodenCabin and then store stuff inside of it.
 2016-01-14 13:03:18 +01:00
Maikel de Vries 4357004dbf prevent picking up heavy objects when on grapple rope and draw in rope when picking up heavy object (#1521) 
Maybe there are other places where the controls libraries should make callbacks to control effects. But that is for the future.
 2016-01-13 23:13:44 +01:00
Maikel de Vries 2ce04aa485 tell player to park airship a bit higher in tutorial 7 (#1598) 2016-01-12 23:25:30 +01:00
David Dormagen 46ad28ea65 tutorial guide: don't scroll portrait with text 
..by putting the text into another subwindow. Might be good to "fix" (it's intended but possibly not wise) that in the engine, but not right now before the release, because it could introduce new bugs.
 2016-01-12 23:17:49 +01:00
Maikel de Vries a7da208d85 fix next mission for tutorials 5 and 8 2016-01-12 23:07:36 +01:00
Maikel de Vries aec5184cf2 locomotive in clonkomotive accepts metal barrels as well 2016-01-12 22:43:35 +01:00
Maikel de Vries 82b090c7ca producer library does not request power if producer is not a consumer (#1602) 2016-01-12 22:17:41 +01:00
Clonkonaut f0a03b303b Fixed ownership of buildings. 
I must be mad. This script failed a lot of times. I had to add those brackets. Even then, the first run failed, the buildings were still ownerless. What is this sorcery.
 2016-01-12 22:01:47 +01:00
Clonkonaut 05b714a758 Tutorial 8: German translation. 2016-01-12 20:35:12 +01:00
Clonkonaut b30fea4f7d Tutorial 7: German translation. 2016-01-12 20:35:02 +01:00
Clonkonaut 4f7688810b Tutorial 3: Used the title from Title.txt. 2016-01-12 20:34:49 +01:00
Clonkonaut 07e912bac6 Tutorial 5: German translation. 2016-01-12 19:51:29 +01:00