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

1952 Commits (92ed1537a0e79facded3c81f50f7767962d70d6f)

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
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 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 e9e06263a8 fix shape of basement construction preview and site (#1586) 2016-02-14 13:18:36 +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 ba82f5c3ac Raid: Fix goal descroptions and buckets in Mave's foundry. 2016-01-18 11:00:22 +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
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 82b090c7ca producer library does not request power if producer is not a consumer (#1602) 2016-01-12 22:17:41 +01:00
Sven Eberhardt b29631f003 Make relaunch weapon selection menu unclosable #1577 2016-01-11 22:02:48 -05:00
Sven Eberhardt 62910aaada Remove dummy graphics of interaction menu. 2016-01-11 18:19:01 -05:00
Sven Eberhardt 77180efbdd Move dead clonks from interaction tabs to simple boxes in surrounding #1581 2016-01-11 18:19:01 -05:00
Sven Eberhardt 37f774cfb3 Foundry: Do not show power consumer symbol in construction menu #1580 2016-01-10 22:20:48 -05:00
Sven Eberhardt 7208a3c299 Ignore CarryHeavy for collection limit #1587 
It was always ignored when picking up the CarryHeavy, but not when collecting another item. Now CarryHeavy consistently gives an extra item slot.
 2016-01-10 21:52:44 -05:00
Sven Eberhardt a34912d9c2 Individual stacking and name/desc of source and drain pipes. 2016-01-10 21:34:41 -05:00
Sven Eberhardt e2acb8b9bb Add missing sounds for Grab/UnGrab #1585 2016-01-10 21:17:06 -05:00
Sven Eberhardt bdc0274e3d CommandFailure: Route missing sound effect to failure function playing clonk skin sound. 2016-01-10 21:16:34 -05:00
Sven Eberhardt f54a49d044 Resource goals: Reduce display of available resources by 10% to better match actually mined gems. 
Some material always gets lost on blasting/pickaxing.
 2016-01-10 13:41:04 -05:00
Sven Eberhardt 05b6ee2407 Remove unused library dummy graphics. 2016-01-10 11:59:55 -05:00
Sven Eberhardt 0f2057032f Retain inventory slot order on respawn #1543 2016-01-10 11:10:45 -05:00
Sven Eberhardt 3dad1c6d81 Turn MaxContentsCount and HandObjects into properties instead of callbacks (Possibly fixes #1553) 2016-01-10 10:41:34 -05:00
Sven Eberhardt d56670c7ce Fix pickaxe killing scaling ability permanently if it is used before any local ActMap modifications #1563 2016-01-10 08:46:20 -05:00
Maikel de Vries 092f9846dc ensure showing construction materials for sites at the bottom of the map (#1365) 2016-01-10 14:18:58 +01:00
Sven Eberhardt dcefa516f6 GrappleBow: Pull back in if hook did not stick successfully #1546 2016-01-09 16:33:13 -04:00
Sven Eberhardt e64ec260bb Fix infinite air supply through breathing of own bubbles #1545 2016-01-09 16:15:20 -04:00
Sven Eberhardt fc659584e4 Fix catapult projectile priority when shooting clonk while items are placed in the catapult (typically by the scenario designer) #1547 2016-01-09 15:59:43 -04:00
Maikel de Vries cd30bf8079 fix eating/using the squid and the fish 2016-01-09 20:17:26 +01:00
Sven Eberhardt 3b74ac2929 DarkCastle: Fix nil access in intro. 2016-01-09 11:09:11 -04:00
David Dormagen 0ad1cdbf89 loam: made bridges smoother 
..by continuing the material drawing exactly where it was stopped the last frame. Previously, just some unconnected rectangles were drawn which were often times filled with gaps. Especially on angled bridges.
 2016-01-09 13:53:34 +01:00
Maikel de Vries 96344dfc00 disable climbing when swinging pickaxe 2016-01-08 22:43:46 +01:00
David Dormagen 0c73ae29e7 loam: fixed turning while digging and added some particles 
This were supposed to be two commits. Meh.
Also, I can't really test how the particles looks because everything is black for me - ck? :(
 2016-01-08 21:05:09 +01:00
Maikel de Vries 5da08f2720 prevent bat from getting stuck in material 2016-01-08 20:50:11 +01:00
Maikel de Vries f99db85c97 add more bottom vertices to structures to prevent falling down 2016-01-08 19:46:28 +01:00