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

2684 Commits (6681a2cd7daf5c65effdc64985651dddfea47538)

Author SHA1 Message Date
David Dormagen 6681a2cd7d Throwing on right-click, alt-use (temporarily) on Shift+Left 2013-05-24 23:26:00 +02:00
David Dormagen 00382611be fixed wrapping the hand position around when scrolling to the item before your first item 2013-05-24 23:24:33 +02:00
David Dormagen 2bf88cea5f Clonks' max contents count reduced from 7 to 5 2013-05-24 23:22:16 +02:00
David Dormagen cf4f85f9cf Merge branch 'master' into Controls 2013-05-24 21:31:29 +02:00
Clonkonaut 75cb0f2030 Added grenade launcher 
!!!!!!!!!!
 2013-05-24 21:21:07 +02:00
David Dormagen ae0a364587 Musket shots now exit at the correct position 
Launch() of the bullet now has offset parameters
LaunchProjectile() now only calculates own offset if none was passed to the function
 2013-05-24 20:45:32 +02:00
David Dormagen 086257b5f5 fixed callback name in musket 2013-05-24 20:09:42 +02:00
David Dormagen 04c8ad1cac removed CON_Collect (now collects only into empty slots) 
fixed inventory shifting
 2013-05-24 20:09:19 +02:00
Clonkonaut a61d4b4aa1 crlf -> lf 2013-05-24 19:16:49 +02:00
David Dormagen 76482ef645 Merge branch 'master' into Controls 2013-05-24 18:20:20 +02:00
David Dormagen d18d8c65c9 Merge branch 'Menus' into Controls 2013-05-24 01:24:57 +02:00
Tobias Zwick a28e441b51 wallkit preview only visible to owner 2013-05-24 01:00:12 +02:00
Tobias Zwick 8500400864 make bucket green and change picture when filled/not filled 2013-05-24 00:27:34 +02:00
David Dormagen 6c861f9165 removed the hold-number-and-click-mouse controls 2013-05-24 00:00:18 +02:00
David Dormagen 6c64963f1f hammer (Library_Constructor) now uses correct interface 2013-05-23 23:59:50 +02:00
Tobias Zwick 83935b033a bucket can be spilled also while climbing, swimming etc now 2013-05-23 23:23:58 +02:00
David Dormagen c1d27bc3e9 mouse-wheel now scrolls through inventory (zoom is on shift+mouse-wheel) 2013-05-23 22:46:23 +02:00
Tobias Zwick d4db0008f7 git is weird 2013-05-23 18:37:01 +02:00
Tobias Zwick fbcd419af2 adapt zoom defaults, set default view lock to true 2013-05-23 18:35:23 +02:00
Tobias Zwick 18975576ce fix steam engine object collection 2013-05-23 18:35:22 +02:00
Clonkonaut ecaf311dc6 WindGenerator in RubyCave will fail only 1 of 10 million times (est) 2013-05-23 18:34:12 +02:00
David Dormagen 20bfab48b6 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c
 2013-05-23 17:53:41 +02:00
Clonkonaut 0709351ffd Play & Stop icons (used by the pump). GRAPHICS MISSING 2013-05-23 17:50:15 +02:00
Clonkonaut d3fc01abd5 Clonks hold breath for 20 seconds 2013-05-23 17:25:13 +02:00
Tobias Zwick 50b42572aa make tree mushroom a bit lighter - smaller texture 2013-05-23 16:49:04 +02:00
Tobias Zwick a09f78cf02 ruby cave: chest instead of lorry 2013-05-23 16:36:59 +02:00
Tobias Zwick 2c7c97e9f1 chest can contain more stuff 2013-05-23 16:23:30 +02:00
Tobias Zwick 4ebde230ab add missing description for mushrooms 2013-05-23 16:12:46 +02:00
Maikel de Vries d5dec949b2 Fixed position of the flag in CTFs 2013-05-23 14:36:21 +02:00
Pyrit 5b634c84d9 Small changes for Windmill.ocs 
- arrow is in front of windmills
 - bullet doesn't try to remove itself after it is already removed
 - wind generators don't show light bulbs anymore
 2013-05-23 14:19:56 +02:00
Pyrit 3198045185 Bow and musket work again in Windmill.ocs 2013-05-23 14:19:56 +02:00
Sven Eberhardt 0fee226a2e Golden mountain, Dark castle scenario descriptions 2013-05-17 15:27:24 +02:00
Sven Eberhardt 77e498af17 Updated some settlement scenario names and descriptions 2013-05-17 13:45:10 +02:00
Sven Eberhardt 6d97dec15a EvilCastle.ocs renamed to DarkCastle.ocs 2013-05-16 20:32:48 +02:00
Sven Eberhardt 127ee8b46c Settlement scenario difficulties updated 2013-05-16 20:31:18 +02:00
Sven Eberhardt 3937fcd3b1 Sorted all playable scenarios from experimental folder into settlement/parkour/arena folders 2013-05-16 19:33:10 +02:00
Sven Eberhardt 359b5df806 Moved from experimental scenarios to main objects: Wall kit, gems, gem goals, reduced pickaxe strength (can't pick granite) 2013-05-16 16:50:34 +02:00
Sven Eberhardt 225683fbda Experimental maze: Added paint spray can (with placeholder graphics) 2013-05-10 09:38:09 +02:00
Sven Eberhardt 170d5ab21f Acid drilling: Goal check fixes and one more hint in the description 2013-05-09 21:59:13 +02:00
Sven Eberhardt d2509d173e AcidDrilling map update 2013-05-09 20:09:52 +02:00
David Dormagen 337126fcb9 renamed MenuWindow to GuiWindow 
added HP-Bar-test to MenuTest.ocs
bugfix
 2013-05-09 13:28:45 +02:00
Sven Eberhardt c98ad23ccb Added some hints to AcidGoldMine and GoldenMountain scenarios 2013-05-09 13:23:54 +02:00
Sven Eberhardt 121ef7d130 Added experimental settlement scenario AcidDrilling 2013-05-09 12:04:02 +02:00
David Dormagen dd851fbea2 Merge branch 'master' into Menus 2013-04-28 17:07:56 +02:00
David Dormagen 792ea0809c draw Decoration border outside of window rectangle (this is probably what the user would expect) 2013-04-28 17:03:32 +02:00
Sven Eberhardt 24264a04e1 Tests: Pumps 2013-04-28 14:03:24 +02:00
Sven Eberhardt c944935563 Pump: Fix update of vertical pump distance after each 200 material pixels pumped 2013-04-28 14:02:57 +02:00
Sven Eberhardt 53b38165ee Pump produces power when pumping downwards. 2013-04-28 13:57:53 +02:00
Sven Eberhardt aa79205da3 Fix power update when sleeping consumer changes consumed amount. 2013-04-28 13:57:53 +02:00
Andriel 8858c06b05 some highres title images for settlement scenarios 2013-04-25 20:47:34 +02:00