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

2806 Commits (02f54ba1eb2881d9005e8e49ec085d56f025e154)

Author SHA1 Message Date
Sven Eberhardt 2be918dbde Remove superfluous debuglog. 2013-09-23 01:52:52 +02:00
Clonkonaut cd3f535522 Fixed plant reproduction (FindObject using local coords), Added SeedOffset 
The change of FindObject (and similar funcs like ObjectCount) from using always global coords to now use local coords made the search function in the plant library go wrong.
Also, the distance check in the library led to unnecessary removal of new plants. SeedOffset() will give the developer a better way of controling this.
 2013-09-22 22:39:43 +02:00
Sven Eberhardt 3d3f37d6a9 Randomized gem sparkling phases a bit. 
Maikel doesn't like how gems coming from the same explosions would celebrate their common inheritance by sparkling in synchrony.
 2013-09-22 17:56:59 +02:00
Sven Eberhardt a21576a58c Made VolcanoEscapeEXTREME a bit harder by adding ore veins 2013-09-22 17:39:05 +02:00
Sven Eberhardt 8e82548746 VolcanoEscapeEXTREME: Close sides 
When sides are open and the volcano reaches the central mountain, lava tends to flow out of the map while the volcano continues to grow further up. This looks rather stupid.

The current solution may also look a bit weird (as the volcano now grows over the mountain top), but is preferable both visually and from a gameplay perspective.
 2013-09-22 13:52:34 +02:00
Sven Eberhardt 4266617b5a Added rubber-band effect to VolcanoEscapeEXTREME. 
The scenario is now a bit harder (and feels a lot harder) as the volcano speeds up whenever you gain a large distance from it.
 2013-09-21 19:55:14 +02:00
Julius Michaelis b67109df8a Add /screenshot [zoom] to /help 2013-09-21 01:08:12 +02:00
Sven Eberhardt e1b972f960 Added energy radius to power producing buildings. 
See forum discussion on flags / energy distribution.
 2013-09-16 22:39:56 +02:00
Sven Eberhardt af52ef8dca GrappleBow test: Sandbox scenario for using the grapple bow on various landscape shapes. 2013-09-08 13:00:37 +02:00
Sven Eberhardt d3aa2c60ec Experimental pluto's OCTier: Not quite working yet. 2013-09-07 20:26:10 +02:00
Sven Eberhardt 0351eb2cdb Coal dig free ratio decreased (so you get more coal). 
Coal is the most used resource in many scenarios (used both as fuel and for metal) and you run out quite frequently. Let's hope this helps.
 2013-09-02 20:48:14 +02:00
Sven Eberhardt ae2f1e4c00 AcidGoldMine: Clonks and bread can be bought at flagpole. 2013-09-02 20:26:10 +02:00
Nicolas Hake 625a9f47d9 #973: Make FindObject et al. handle object context instead of Find_* 
When people write obj->FindObject(Find_Distance(10)), they expect the
engine to use the distance from obj instead of the distance from the
current object (or from 0,0 if called from outside of object context).

Making the engine handle coordinate offseting at calls to FindObject
(and similar functions) instead of having the C4FO wrappers do it solves
this problem.

Compatibility impact: Code that creates their own criteria structure
instead of using the provided Find_* functions will have to be adapted
if they use any of the location-based criteria.
 2013-09-01 00:46:04 +02:00
Nicolas Hake 7829631f66 Add test case for #973 2013-09-01 00:35:15 +02:00
Nicolas Hake 68e023651a Add very rudimentary C4Script testing framework 2013-09-01 00:32:14 +02:00
Maikel de Vries 682f927fa5 Make butterflies appear with different colors 2013-08-13 21:40:52 +02:00
Maikel de Vries b4a2133f66 Make seaweed Library_Plant for placement function 2013-08-13 21:16:46 +02:00
Sven Eberhardt d607dbb39d MineRescue: Fix adjusted flagpole radius to be used correctly in construction site connectivity preview. 2013-07-02 21:19:14 +02:00
Pyrit 63dc51044b Set grass plane to -1. 
Grass isn't covered by clouds anymore.
 2013-06-24 21:41:15 +02:00
Caesar c90b1e985c Play correct chop animation for trees in front of Clonks 2013-06-24 13:17:51 +02:00
Sven Eberhardt a020cfc867 Fix construction preview of non-flagpole objects 2013-06-22 22:18:31 +02:00
Sven Eberhardt 58a0bf1c24 Flagpole construction: Show arrows pointing to neighboured flags that would be connected if the flagpole were built there. 
Allows the player to build his base more efficiently.
 2013-06-22 20:01:51 +02:00
Sven Eberhardt 27f8647a55 Clonk can consume bubbles while swimming to regain breath. 2013-06-10 19:53:56 +02:00
Tobias Zwick ddd2db94e0 remove debug log and messages 2013-06-04 20:11:09 +02:00
Tobias Zwick e30d5b9ec5 final fixes and refactorings for the pump 2013-06-04 20:10:51 +02:00
Tobias Zwick 416d49db99 adapt pump to use CanInsertMaterial to determine pump height 2013-06-04 20:09:09 +02:00
David Dormagen fec0870133 fixed a message of the pipe to use the correct string-table-entry 2013-05-31 22:35:16 +02:00
David Dormagen 81629cd691 the pump now behaves correctly in regards to the power usage 2013-05-31 22:34:17 +02:00
Tobias Zwick c4c781631f Merge branch 'master' into pumpfix 2013-05-30 22:18:23 +02:00
Tobias Zwick 131ec86b98 refactor pump done. Remaining problem: power system (usage) 2013-05-30 22:11:39 +02:00
Tobias Zwick c4a957a6b1 Merge branch 'master' into pumpstuff 
Conflicts:
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
 2013-05-28 22:47:37 +02:00
Sven Eberhardt c724ce2291 Fix DeadlyGrotto game goal 2013-05-28 13:07:12 +02:00
Tobias Zwick 855ba27d6f tried to refactor pump 2013-05-27 21:51:26 +02:00
Matthias de75275f61 Changed pump to use mesh and script animations 2013-05-27 13:24:42 +02:00
Martin Plicht 71a5b48b63 Make Clonk loadable again 2013-05-26 18:29:26 +02:00
Tobias Zwick d3312cb3c5 convert some textures to jpg 2013-05-26 18:11:51 +02:00
Günther Brammer 030c249f87 Draw the paper dialog background separately from the background wallpaper 
Drop the paper in the player selection dialog entirely, use transparent
black instead. Adjust the widget sizes in the scenario selection dialog
slightly.
 2013-05-26 17:56:42 +02:00
Tobias Zwick 064166d09e make most sound effects mono 2013-05-26 17:42:37 +02:00
Tobias Zwick 8f752d1d9e clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
Clonkonaut d28959a161 Some fixes to the cable cars for possible future development. 2013-05-26 15:25:27 +02:00
David Dormagen de0b22ec1b removed ColorByOwner entry of the flag-marker to suppress warning 2013-05-26 15:21:16 +02:00
David Dormagen 4d7ff01c3b modified loom-material-script to not use unsupported options 2013-05-26 15:20:53 +02:00
Tobias Zwick d5e349ab10 stop and play icons 2013-05-26 13:10:44 +02:00
Martin Plicht a915cdb15f Make Eclipse happy by changing some zeros to nils and stuff 2013-05-26 00:01:08 +02:00
Tobias Zwick d1be5d109c adjust gamma calculation of time 2013-05-25 22:26:41 +02:00
Pyrit 6b8b386658 Added SetGamma() to the time object, so that the whole game gets dark at night, not just the sky. 
Signed-off-by: Tobias Zwick <newton@westnordost.de>
 2013-05-25 20:55:20 +02:00
Tobias Zwick c01391725a convert some highres title.pngs to jpegs 2013-05-25 20:48:15 +02:00
Tobias Zwick fe5a29b198 throw out DVORAK keyboard layout (controls are keyboard layout independent now) 2013-05-25 14:41:58 +02:00
Tobias Zwick 2425bb2793 fix wind bag rotation and vertices 2013-05-25 14:36:22 +02:00
Tobias Zwick ba426651ad fix wind bag rename 2013-05-25 14:36:04 +02:00
Tobias Zwick 52a1d5c18e rename jar of winds to windbag 2013-05-25 00:08:54 +02:00
Tobias Zwick f0ea347eb6 new wind jar => wind bag 2013-05-25 00:08:19 +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
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
Tobias Zwick 83935b033a bucket can be spilled also while climbing, swimming etc now 2013-05-23 23:23:58 +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
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
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
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
Andriel fb7e1c2423 sounds for the boompack 2013-04-25 20:35:45 +02:00
Sven Eberhardt fe91c22db7 Experimental maze: Zoom out and allow scrolling when game is over 2013-04-06 20:20:44 +02:00
Sven Eberhardt 9e55847021 Experimental Maze: Fix goal rect 2013-04-06 19:58:26 +02:00
Sven Eberhardt f244efbc86 Experimental maze parkour scenario. Collect a ruby and return it to the start to win. 
Crashes sometimes during map generation. Couldn't reproduce this in a debug build yet :(
 2013-04-06 18:02:56 +02:00
Sven Eberhardt c17c971b40 Fix tiling of sand_smooth texture 2013-04-01 22:13:52 +02:00
Armin Burgmeier f4ae57174c Disable depth_check for coniferous trees 
As suggested by Andriel here:
http://forum.openclonk.org/topic_show.pl?pid=22853#pid22853

This should give a more correct rendering since the faces are ordered
already anyway for correct alpha blending. The problem otherwise is that
faces write to the depth buffer even if they are mostly transparent, and
nothing can go underneath.
 2013-03-31 17:14:13 +02:00
Sven Eberhardt 1d68f736a5 Fix Experimental.ocf German name and description. 2013-03-31 16:20:17 +02:00
Sven Eberhardt 594cb89d91 Added SandDry to main TexMap. 
Having a default material not in the texture map is a bad idea because then it will be at a non-predictable index when used for map drawing.
 2013-03-31 14:56:38 +02:00
Sven Eberhardt a41ffc617f Jar of Winds does not blow away base markers (#947). 2013-03-30 16:02:42 +01:00
Sven Eberhardt 1322391f5f Implemented C4S.Landscape.BottomOpen=2: Bottom is closed iff corresponding map pixel in bottom row has tunnel background. 2013-03-30 14:54:51 +01:00
Sven Eberhardt 749ddb09aa Updated local scenario material densities 2013-03-30 13:59:04 +01:00
Sven Eberhardt 44e23f78c6 Tree trunks can be chopped down to gain wood (#939). 2013-03-29 17:50:11 +01:00
Sven Eberhardt c14e9aab21 Fix chopping of trees when partially blocked by other trees (#909). 
Fixed duplication of tree variable in axe and chop effect to fix some potential null pointer errors.
 2013-03-29 16:32:45 +01:00
Sven Eberhardt 88cf5efbb4 Grass placement 3px higher (#892) 2013-03-29 16:20:18 +01:00
Sven Eberhardt c3424e7365 LargeCaveMushroom placement respects rectangle parameter. Also renamed settings.teraform to settings.tgerraform. 2013-03-29 16:19:52 +01:00
Sven Eberhardt 38fcd04e5a Fix mushrooms growing after chopped down (#940). Also reduced their growth speed a bit (it's still pretty fast). 2013-03-29 15:51:54 +01:00
Sven Eberhardt 924b0b46fc Fix parkour checkpoint count display in scoreboard title (#941) 2013-03-29 15:45:14 +01:00
Sven Eberhardt 92fa6408e7 EvilCastle: Added Dragonclonk's deco objects 2013-03-28 19:10:22 +01:00
Sven Eberhardt d2da1310f5 GoldenMountain: Rubies/Amethysts give only 5 gold per gem 2013-03-28 00:09:02 +01:00
Sven Eberhardt a7f94e0683 Fixed some script errors in burning GrappleBow. Also made incomplete bow unusable and color burned bow so the player knows what's up. 
Changed GrappleBow to no longer burn on contact (e.g.: Clonk diving in lava), which was incredibly annoying when jumping through lava caves. Also, it doesn't look like it had many wooden parts that burn easily.
 2013-03-27 21:36:11 +01:00
Sven Eberhardt 46a4db0409 Added callback Extinguishing (analogous to Incineration) when fire is extinguished on an object. 2013-03-27 21:33:33 +01:00
Sven Eberhardt 84163cefd1 GoldenMountain: More stuff can be bought. 
Gold is still not very useful here, but at least you can get some more stuff now.
 2013-03-26 22:28:02 +01:00
Sven Eberhardt 243070ca64 Some GoldenMountain balancing 2013-03-26 22:21:28 +01:00
Sven Eberhardt d2037caef7 GoldenMountain starting conditions rework 2013-03-26 10:53:20 +01:00
Sven Eberhardt e387c7cdb9 Added new settlement scenario "Golden Mountain" to Experimental.ocf 2013-03-26 00:48:22 +01:00
Sven Eberhardt c60220be27 Added some helper functions to Library_Map 2013-03-26 00:46:50 +01:00
Sven Eberhardt c115fbfaa0 FnBlastFree: Added max_density parameter. 
Also updated material densities and added attribute MaxPickDensity to pickaxe, so it's now possible to define a pickaxe that cannot go through granite.
 2013-03-26 00:45:44 +01:00
Sven Eberhardt eeb6436f89 FrostySummit: Fixed some scenario properties. 2013-03-22 21:49:01 +01:00
Sven Eberhardt eeac0f7c98 Fixed MinPlayer in some experimental scenarios 2013-03-22 21:46:09 +01:00
Sven Eberhardt 0801209a34 New experimental scenario: Frosty Summit. 
At the moment, the round is a bit too short I think :)
 2013-03-22 21:35:14 +01:00
Sven Eberhardt fcddb56b04 Some Library_Map extensions 2013-03-22 21:31:56 +01:00
Sven Eberhardt 5101147b5f Test scenario: Local defs only 2013-03-19 19:29:50 +01:00
Sven Eberhardt aeeedcd770 Fix script errors in scenarios that don't load Objects.ocd 2013-03-19 19:27:19 +01:00
Sven Eberhardt 57e63a5275 Added support for scripted maps (Map.c) and documentation. 2013-03-19 00:36:06 +01:00
Armin Burgmeier e0b977c88d MineRescue: Goal checks whether elevator can move, not whether it does move 2013-03-16 16:59:18 +01:00
Armin Burgmeier 6d688f8d23 Add new experimental scenario Mine Rescue 2013-03-16 14:11:39 +01:00
Sven Eberhardt d505c8a760 DeadlyGrotto fix DuroLava and statue head vertices 2013-03-07 22:23:27 +01:00
Sven Eberhardt 44f45a8e06 New settlement scenario in Experimental.ocf: Deadly Grotto. 2013-03-07 01:09:38 +01:00
Sven Eberhardt e5ecf33455 Experimental ruby cave: Icon and knowledge. 2013-03-07 01:09:37 +01:00
Sven Eberhardt cc299bd799 New experimental settlement scenario: Ruby cave 2013-03-03 17:09:49 +01:00
Sven Eberhardt 8f429dc50f GoldSeller checks more frequently 2013-03-03 17:05:53 +01:00
Sven Eberhardt 7ddba1e2c2 Experimental WallKit moved to definition folder. 
I need it in another scenario
 2013-03-03 14:25:52 +01:00
Sven Eberhardt b8753d64f6 Fix flag ownership change to allies when original owner dies. 
Change OnOwnerRemoved engine callback to also pass the ally selected as successor for the dead player.

The flag had a callback OnOwnerChange implemented. However, we already have OnOwnerChanged in the engine to do the same thing.
 2013-03-02 23:38:29 +01:00
Sven Eberhardt d0933e71c7 Fix GoldSeller interval adjustment 2013-03-02 23:07:48 +01:00
Sven Eberhardt 11438f7e02 Pump cannot destroy materials any more. 
Before this patch, you could destroy materials by pumping them into earth (like you could in CR). This made scenario with acid/lava obstacles rather easy.
 2013-03-02 22:33:56 +01:00
Sven Eberhardt 6bd3646a35 Experimental BigVolcano: Some gfx+sound effects 2013-02-27 00:21:30 +01:00
Sven Eberhardt f727c2eca0 New experimental scenario: Volcano Escape EXTREME! 2013-02-25 21:47:55 +01:00
Sven Eberhardt b02676a6e7 Auto-collect fragile objects (i.e.: Firestones) when digging. 
See http://www.clonkspot.org/comic/1
 2013-02-20 21:12:50 +01:00
Sven Eberhardt cae188a5d8 Experimental scenario tweaks [ala] 2013-02-19 00:53:07 +01:00
Sven Eberhardt 2693db2189 Experimental AcidGoldMine landscape tweaks 2013-02-17 18:00:53 +01:00
Günther Brammer 1cf1be1c6d Hold a reference to the temporary proplist used in case of script errors 
The parser does not know whether the constant proplist it is about to fill
is missing because it was overwritten by a later local/constant, or because
the preparser was interrupted by a script error and didn't store its
proplist. Thus, the parser cannot simply give up at that point, and in
order to keep things simple it creates a throwaway proplist. This proplist
was thrown away too soon, though.

Thanks to Zapper for the testcase.
 2013-02-12 01:11:31 +01:00
Sven Eberhardt 13ead95b05 Cleanup main texture map. Remove unused and duplicate entries. Added Earth-earth. 
Only one scenario (Arena.ocf\Ruins.ocs) was using any of the duplicate entries.

The missing earth definition caused earth borders to liquid to be rectangular sometimes.
 2013-02-11 21:21:31 +01:00
Sven Eberhardt 2a05f16a73 Experimental AcidGoldMine landscape rework 2013-02-11 21:01:19 +01:00
Sven Eberhardt 8974355760 Experimental acid gold mine: Difficulty tweaked. 2013-02-10 19:15:56 +01:00
Sven Eberhardt af0b44a5ab Experimental AcidGoldMine minor stuff 2013-02-10 12:47:38 +01:00
Sven Eberhardt 377d709465 Experimental AcidGoldMine: Made a bit easier. 2013-02-09 16:47:24 +01:00
Sven Eberhardt 5bd634b02a Experimental AcidGoldMine: Gold mine in hostile environment. 2013-02-09 15:31:41 +01:00
Sven Eberhardt 8fde966ee5 LibraryStackable supports infinite stack counts for tutorials, AI enemies, etc. 
Also renamed internal Update() function to avoid name collisions with other scripts/libraries.
 2013-02-09 13:35:17 +01:00
Sven Eberhardt 31b87ef814 Optimize global func Sign. New version is between 10% and 50% faster! 2013-02-09 01:56:06 +01:00
Sven Eberhardt 7d12dff8dc Experimental: VolcanoEscape. Relatively hard, cooperative race. 2013-02-06 01:18:32 +01:00
Sven Eberhardt fef5605217 Parkour goal: Added function to disable respawn. 2013-02-06 01:11:08 +01:00
Sven Eberhardt f650eb8010 Ashes material is now instable. 2013-02-06 01:10:34 +01:00
Sven Eberhardt 6669e965a2 Fix Loc_Material without texture parameter 2013-02-05 00:35:04 +01:00
Oliver Schneider 3d98775701 Fixed a typo in Tutorial01 2013-02-04 23:50:17 +01:00