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

3264 Commits (91cd68d641dfce5a61570f42691f554a1110a050)

Author SHA1 Message Date
Maikel de Vries 6c1e45519d fixed player spawning in Krakatoa 2014-10-22 16:32:22 +02:00
Maikel de Vries 717ea1a031 reworked Krakatoa landscape, is now map script 2014-10-22 16:23:32 +02:00
Sven Eberhardt aadd8176cb AcidRift: Fix scale precipitation, meteorites and rockfall by map size. 2014-10-21 21:18:10 +02:00
Sven Eberhardt 516cd46c37 AcidRift: Scale precipitation, meteorites and rockfall by map size. 
(in addition to scaling on difficulty)
 2014-10-21 20:48:09 +02:00
Maikel de Vries f05c5a3439 move ownership radius on movement of the flag 2014-10-20 20:27:14 +02:00
Maikel de Vries b2daf0453d power producers which include flag library are not staticback any more 2014-10-20 18:56:13 +02:00
Sven Eberhardt 0a4b941a97 Rockfall dissolves when hitting the ground in acid. 2014-10-19 20:19:47 +02:00
Sven Eberhardt 257cbf1a9f Insane difficulty of Acid Rift tweaked. 2014-10-19 20:01:55 +02:00
Sven Eberhardt 8a7a96a453 More rain in Acid Rift. 2014-10-19 17:12:17 +02:00
Sven Eberhardt 896ea0a875 Make acid a bit less corrosive. 
It currently eats through everything and destroys itself in the process. Maybe this change makes it actually a bit more deadly than before.
 2014-10-19 17:03:19 +02:00
Maikel de Vries b5a84eba87 move TransposeArray to System.ocg functions 2014-10-19 10:49:12 +02:00
Maikel de Vries c6d87151d4 allow to cut the pump's source and drain (#1144) 2014-10-18 19:12:55 +02:00
Maikel de Vries 406821f92a correct difficulty for acid rift 2014-10-18 18:42:30 +02:00
Maikel de Vries 85646c7a8e removed cloud vertices 2014-10-18 18:41:56 +02:00
Maikel de Vries 13ab324603 improved smoke for some structures 2014-10-18 15:49:44 +02:00
Maikel de Vries d72338f167 add test scenario for power system 2014-10-18 15:41:49 +02:00
Maikel de Vries 83930ee27f fixed cloud movement in ironpeak(#1149) 2014-10-18 12:52:06 +02:00
Maikel de Vries 1d34c12431 fixed underwater dropping of second hand item (#1155) 2014-10-18 12:00:49 +02:00
Maikel de Vries 18ee7b0496 increased chest content count and make cabin non-enterable (#1159) 2014-10-18 11:47:23 +02:00
Maikel de Vries 46c4b8df5c added object name to menu item tooltips (#1146) 2014-10-18 09:57:49 +02:00
Sven Eberhardt d80ef4ae5e Fix nil pointer if a dragged object is deleted between control creation and control execution. 2014-10-18 01:22:47 +02:00
Sven Eberhardt 1f3c53cec1 New world: Acid Rift. 2014-10-18 01:19:21 +02:00
Sven Eberhardt ea65a24ec6 Make gems non-corrodable. 
It's annoying in acid gem mining scenarios.
 2014-10-18 01:19:21 +02:00
Sven Eberhardt 0e8e20fa5c Add explosive mode for rockfall. 
Makes it a bit more deadly by blasting through rock and granite.
 2014-10-18 01:19:18 +02:00
Tobias Zwick 848b844424 add commented shader part for debugging light directions 2014-10-12 21:01:47 +02:00
Maikel de Vries 9142faff36 more loam for Chine on normal difficulty 2014-10-12 16:56:34 +02:00
Armin Burgmeier e5d1182cce Add the Anim_RDir AVP 2014-10-09 17:11:13 -04:00
Armin Burgmeier e4ad7ddc2d Rename Anim_RDir to Anim_AbsRDir 2014-10-09 17:07:52 -04:00
Armin Burgmeier 9fb0cdbdef Add a min_rdir parameter to Anim_RDir 2014-10-09 17:05:24 -04:00
Armin Burgmeier cbdc6040e7 Add the Anim_Dist AVP 2014-10-09 17:00:26 -04:00
Sven Eberhardt ca64fad8b5 Fix lobby team distribution settings hotkeys (#1133) 2014-10-09 20:40:01 +02:00
Armin Burgmeier af6163b797 Add test scenario for many lava PXS and smoke particles 2014-10-08 18:33:46 -04:00
Tobias Zwick b11e8d5d7a Merge branch 'master' into lights 
Conflicts:
	planet/Graphics.ocg/LandscapeShader.c
	src/graphics/C4DrawGLMesh.cpp
	src/graphics/C4DrawGL.cpp
	src/landscape/C4Landscape.cpp
	src/landscape/C4Landscape.h
	src/landscape/C4LandscapeRender.cpp
	src/landscape/C4Scenario.cpp
	src/landscape/C4Scenario.h
 2014-10-06 23:27:16 +02:00
Nicolas Hake 67c0deae38 Remove leading + from IDS_MSG_AUTOFRAMESKIP DE translation (Github #2) 2014-10-06 16:03:11 +02:00
Tobias Zwick d662d5001e DarkCastle: correct German translation of game goal 2014-10-04 23:23:52 +02:00
Sven Eberhardt 5c72ed090d DarkCastle map rework. 
Make it harder to get into the castle.
 2014-10-04 22:57:50 +02:00
Sven Eberhardt d3ac2789cb DarkCastle intro sequence added. 2014-10-04 22:40:17 +02:00
Sven Eberhardt 57ddbf9fa6 Fix initial speed of airplane on StartInstantFlight call. 2014-10-04 19:39:06 +02:00
Sven Eberhardt 885f240e54 AI ignores contained enemies. 2014-10-04 19:39:06 +02:00
Maikel de Vries d5cb53b952 title images for the worlds 2014-10-04 13:12:29 +02:00
Sven Eberhardt 77f4170b5a Raid made more failsafe: Wood barrel respawn and removed a deadly gap in the landscape. 2014-10-04 11:33:45 +02:00
Sven Eberhardt 91e285a39d Fix typo in Deep Sea Mining intro 2014-10-04 11:24:58 +02:00
Sven Eberhardt 5d81d27669 Fix outro in Deep Sea Mining. 
The Crystal Communicator didn't even start D:
 2014-10-04 11:24:58 +02:00
Sven Eberhardt 0b0fb55b0f Fix NextMission buttons in missions folder. 2014-10-04 11:24:53 +02:00
Maikel de Vries 8d5d4715fe remove physical documentation 2014-10-04 09:22:10 +02:00
Armin Burgmeier 6d0daba7b6 Fix another typo in Raid.ocs 2014-10-04 00:03:15 -04:00
Sven Eberhardt b0af163c24 Better wheat placement in Crash Landing. 2014-10-04 00:59:24 +02:00
Clonkonaut f98514efdc Merge branch 'master' of ssh://git.openclonk.org/openclonk 2014-10-04 00:48:28 +02:00
Clonkonaut 8ffe3fadb7 Merge branch 'master' of ssh://git.openclonk.org/openclonk 2014-10-04 00:47:13 +02:00
Tobias Zwick c271ccc564 fix some typos in Raid.ocs, convert to utf8 2014-10-04 00:47:05 +02:00
Clonkonaut ada55add31 Wheat no longer creates 'stalk' objects. 2014-10-04 00:47:03 +02:00
Sven Eberhardt 8edf98a74e Limit wheat reproduction (#1064). 2014-10-04 00:42:18 +02:00
Sven Eberhardt fe59448c5d Reset cursor view on UnGrab control. 
This is to reset the view e.g. after controlling a switch.
 2014-10-03 22:34:35 +02:00
Sven Eberhardt d4eb45f6b2 Set titles for a few scenarios in Tests.ocf. 
So you can distinguish between them in the startup menu.
 2014-10-03 21:58:33 +02:00
Sven Eberhardt 3fb86e9ea9 Fix null pointer exception when objects are removed in response to a hit callback. 2014-10-03 21:57:38 +02:00
Sven Eberhardt 6d3bbcfee1 FightForGidl star achievement added. 
In the future, we might want to have different achievements for different waves reached.
 2014-10-03 19:59:28 +02:00
Sven Eberhardt 54e47cdcf3 FightForGidl difficulty adjusted. 
So it's not on top of the list.
 2014-10-03 19:59:28 +02:00
Tobias Zwick 797c2c3baa remove "Beyond the Rocks" subtitle 2014-10-03 18:54:58 +02:00
Tobias Zwick 600e02f6b4 update credits 2014-10-03 18:54:57 +02:00
Maikel de Vries 7153b17812 achievements for worlds inside .ocf 2014-10-03 18:48:25 +02:00
Sven Eberhardt 257840893a Moved FightForGidl to missions. 2014-10-03 18:33:18 +02:00
Maikel de Vries f5ca7a443b make cannon fit in the elevator 2014-10-03 16:23:19 +02:00
Maikel de Vries 411c34fb5c league param settings for worlds 2014-10-03 14:58:48 +02:00
Maikel de Vries 9e0304cd5a rockfall as disaster 2014-10-03 14:37:44 +02:00
Sven Eberhardt 2d07ca1891 Add achievements for finishing tutorials. 2014-10-03 14:37:31 +02:00
Sven Eberhardt f3e3d54909 Fix map in tutorial 5. 
Contained some SolidMask pixels
 2014-10-03 14:36:50 +02:00
Maikel de Vries 672b5c2d1f moved disasters to their own subfolder 2014-10-03 13:36:05 +02:00
Sven Eberhardt f71b465adf Move "Done" achievement from individual missions to parent folder. 
Conflicts:
	planet/Missions.ocf/ParameterDefs.txt
	planet/Missions.ocf/StringTblDE.txt
 2014-10-03 13:30:07 +02:00
Sven Eberhardt 7513045d6c Move "Done" achievement from individual missions to parent folder. 2014-10-03 12:17:58 +02:00
Sven Eberhardt 005f484771 Fix bomb drop sound played as music in Rais.ocs. 2014-10-03 00:50:27 +02:00
Sven Eberhardt f919c31c9b Treasure hunt: Fixes and achievements. 
* Music fix (#1115)
* Some string fixes
* Disallow gold bar production
* Add gold bar achievement for side goal
 2014-10-03 00:49:03 +02:00
Armin Burgmeier ac3fbc1a6a Raid.ocs: Fix a typo 2014-10-02 17:24:19 -04:00
Sven Eberhardt 8b322a23b5 Added German translation for IronPeak. 2014-10-02 22:15:27 +02:00
Sven Eberhardt f87f115ef4 Added German translation for GoldRush. 2014-10-02 22:15:27 +02:00
Sven Eberhardt 23c39216dd Added German translation for GemGrabbers. 2014-10-02 22:15:27 +02:00
Sven Eberhardt c991f156b6 Added German translation for FloodedVeins. 2014-10-02 22:15:27 +02:00
Sven Eberhardt 03cb37eb12 Added German translation for Chine. 2014-10-02 22:15:26 +02:00
Maikel de Vries f761aab26d make coconut less lethal 2014-10-02 20:37:34 +02:00
Sven Eberhardt 4e23a49d78 Add K-Pone to credits screen 2014-09-29 22:15:28 +02:00
Maikel de Vries 6dbff6313f added new song TheSkylands by K-Pone 2014-09-29 21:50:56 +02:00
Maikel de Vries d24ae4eb46 allow for infinite gunpowder in the powder keg 2014-09-29 20:10:58 +02:00
Maikel de Vries 72a26d029a better difficulty levels for FloodedVeins 2014-09-28 17:06:13 +02:00
Maikel de Vries aa0528c95f improved Chine map 2014-09-28 10:56:32 +02:00
Maikel de Vries ef6930414f removed a few unused variables in Worlds.ocf 2014-09-27 15:29:34 +02:00
Sven Eberhardt 701e28b7fa Chine icon changed to cannon. 2014-09-27 01:08:35 +02:00
Maikel de Vries 10dc7ff78d made achievement stars bronze, silver, gold 2014-09-26 22:58:14 +02:00
Sven Eberhardt 3308503381 Improve parameter test scenario 2014-09-26 22:11:11 +02:00
Maikel de Vries 3ed341c342 added intro sequence for Chine 2014-09-26 22:08:19 +02:00
Maikel de Vries 6f7b8027f0 implemented lobby options for GemGrabbers 2014-09-26 21:50:03 +02:00
Maikel de Vries 7d5f2effb4 implemented lobby options for Chine 2014-09-26 19:33:19 +02:00
Maikel de Vries dfef8992be implemented lobby options for FloodedVeins 2014-09-26 19:33:19 +02:00
Maikel de Vries e93e6b8eab implemented lobby options for IronPeak 2014-09-26 19:33:19 +02:00
Maikel de Vries 908ebb3a63 implemented lobby options for GoldRush 2014-09-26 19:05:42 +02:00
Sven Eberhardt 5a2edc425d Raid: Fix dialogue and effects. 2014-09-25 15:26:30 +02:00
Sven Eberhardt cde41733f8 Add "Done"-achievement to all missions. 2014-09-25 15:25:33 +02:00
Sven Eberhardt abab7be591 Added scenario achievements displayed as small symbols beside the scenario name in the startup selection screen. 
They can be used e.g. to show that you have finished a scenario on different difficulty levels.
 2014-09-24 23:08:40 +02:00
Sven Eberhardt 378bda5546 Added custom scenario parameters (SCENPAR_*). 
Can currently only be set in network games in the lobby. In the future, maybe we can find a place somewhere in the scenario selection dialogue.
 2014-09-23 23:02:52 +02:00
Maikel de Vries ee7caaac2c Chine.ocs: improved map and added description 2014-09-23 19:48:30 +02:00
Maikel de Vries 7f6bf8c359 Chine.ocs: golden cannon with infinite ammo 2014-09-23 19:44:51 +02:00
Sven Eberhardt 14168fb5a5 Implement Rule_BaseRespawn rule for missions: Crash Landing, Dark Castle, Deep Sea Mining, The Raid, Treasure Hunt. 2014-09-22 19:52:34 +02:00
Sven Eberhardt e7ac00de4b Added BaseRespawn rule and neutral flagpoles to be used for consistent respawn handling in all missions. 
Also changed clonk destruction process to always kill player clonks before removal. This simplifies handling of death e.g. when clonks are contained in an object that falls out of the map.

BaseRespawn adapted from Maikel's base melee repository.
 2014-09-22 19:21:28 +02:00
Sven Eberhardt 2a698bb2d9 Fix scenario saving of NoPowerNeed effect 2014-09-22 19:21:28 +02:00
Sven Eberhardt b899e8944c Base variable naming in scenario saving on saved object count of same type name instead of object number. 
This should yield shorter, more predictable names reducing changeset size when an Objects.c file is updated.
 2014-09-22 19:21:25 +02:00
Maikel de Vries 35c9aa9a78 new goal for Chine.ocs 2014-09-22 19:20:32 +02:00
Sven Eberhardt b730a045f7 Shorter firestone fuse sound. Also avoid playing if the firestone explodes directly after hit. 2014-09-22 13:50:47 +02:00
Sven Eberhardt 84cc072405 TreasureHunt storyline integration: Intro, Outro, NPCs 2014-09-21 21:49:03 +02:00
Maikel de Vries 059a704f55 added new World: Chine.ocs 2014-09-21 18:37:48 +02:00
Maikel de Vries 77be7b01c2 fixed intro sequences for GoldRush and FloodedVeins 2014-09-21 16:53:39 +02:00
Sven Eberhardt dfa6050cd0 Put missions above worlds in scenario selection 2014-09-21 16:39:07 +02:00
Sven Eberhardt 4d36f3a2d2 Some missions fixes/adjustments 
* Plane with same color in all missions
* Sequence multiplayer fix
* Heavy smoke is a particle parameter
* Goal graphics fix
* Fix rocky pick direction after dialogue initiation from left
* Dialogue supports sections
* Hat moved to decoration for other missions
 2014-09-21 16:36:05 +02:00
Maikel de Vries de52ad2d4c fixed IronPeak intro 2014-09-21 16:29:57 +02:00
Sven Eberhardt 6766ac1526 Prevent NPCs from accidentally collecting things. 2014-09-21 16:18:43 +02:00
Sven Eberhardt 54dc25947f Fix construction site name. 
It was always "Construction Site: %s" without the %s filled in.
 2014-09-21 16:18:09 +02:00
Sven Eberhardt 86bf3dcea0 Tweaked VolcanoEscapeEx: A bit harder in the end. Volcano doesn't leave as many gaps. 2014-09-19 21:35:46 +02:00
Maikel de Vries 03c88c34a3 removed WebCode from league string 2014-09-19 20:55:11 +02:00
Sven Eberhardt ca582692d4 Missions storyline expanded to Deep Sea Mining. Added short intro in extra section. 
Also adjusted icons, NextMission and MissionAccess in some scenarios and added a split marker between missions within and missions outside the connected storyline.
 2014-09-12 01:02:13 +02:00
Sven Eberhardt 31febf7a40 Fix HUD Adapter recreation on section change 2014-09-12 01:02:13 +02:00
Pyrit f49458c569 In the settlement tutorial tell players to keep holding down the mouse button to chop trees. 2014-08-29 20:48:18 +02:00
Maikel de Vries 2d186b6cf0 improved Flooded Veins map 2014-08-28 11:53:21 +02:00
Maikel de Vries 5274bf9d3e new world: Flooded Veins as replacement for Ruby Cave 2014-08-27 16:18:10 +02:00
Maikel de Vries d071ee3f7f fixed gravestone interaction 2014-08-27 15:33:39 +02:00
Sven Eberhardt addac19062 Crash landing intro/dialogues/outro improved for storyline integration. 2014-08-26 16:07:30 +02:00
Maikel de Vries f9f41b6e79 added intro sequence for Gold Rush 2014-08-23 22:47:47 +02:00
Maikel de Vries 46d3cd2a54 improve Iron Peak intro sequence 2014-08-23 21:20:37 +02:00
Maikel de Vries 47fec3c2e2 created intro sequence for Iron Peak 2014-08-23 18:44:28 +02:00
Maikel de Vries ae1b0ca383 make cave mushrooms look frozen 2014-08-23 18:43:05 +02:00
Maikel de Vries 4dfc9f181a fixed saving of resource goal 2014-08-23 11:32:35 +02:00
Maikel de Vries 46386e9644 fixed some typos in Raid.ocs dialoges 2014-08-22 17:15:03 +02:00
Sven Eberhardt 887f85862a Sequence object: Ensure all players have a cursor at sequence end. 2014-08-22 14:11:01 +02:00
Sven Eberhardt a91332f42e Crash landing tweaked to serve as followup mission for raid. 
Pilot name and color, mission access.
 2014-08-21 21:01:11 +02:00
Sven Eberhardt 0966404db7 Raid: Fix multiplayer balloon deployment and remove balloons after intro. 
The balloons serve no purpose here and the scenario should be kept as simple as possible.
 2014-08-21 21:00:08 +02:00
Sven Eberhardt 6569a47e37 Change MessageWindow (i.e. the default goal messages) to use decorated messages instead of menus. 
Currently, it opens a small window in the bottom right corner which blocks all player control and is not intuitive how to close. Now it's a message that will automatically disappear after a while (If the player hasn't finished reading, he can just click the goal icon again).
 2014-08-21 19:55:32 +02:00
Sven Eberhardt 78d2f71843 Minor Raid mission improvements. 
* More loam below lava lakes
* Grass
* Dora and Pyrit give hints to ask Newton for oil (Newton will point the player to Mave)
* Some typos fixed
 2014-08-21 15:27:58 +02:00
Sven Eberhardt 5955ab146e Add new mission "raid". 2014-08-20 18:06:20 +02:00
Sven Eberhardt e6fc0b1a1d Minor dialogue improvements 
* Dialogue is blocked for a short time after it was stopped, so players don't restart it accidentally
* Broadcasting option to all players for important dialogues
* Speakers face each other
* add_attention parameter for SetDialogueProgress
 2014-08-20 18:06:19 +02:00
Sven Eberhardt 764f0aedd0 Fix goal graphics in HUD if goal is using multiple graphics and SetGraphics. 
We don't have a GetGraphics() function at the moment, so use a small workaround.
 2014-08-20 18:06:18 +02:00
Maikel de Vries 573ca24e8e decrease lag caused by expansion goal 2014-08-17 16:36:33 +02:00
Sven Eberhardt 94e1316205 Extend Dialogue and Sequence object with some message and viewport functions for upcoming missions. 2014-08-14 17:18:28 +02:00
Sven Eberhardt cbb321307f Scenario saving fixes: Layers, fishes, sproutberries. 
Do not save sprout berries that are still attached to sprouts. Omit some unnecessary properties for fishes.
 2014-08-14 17:18:26 +02:00
Sven Eberhardt 308f248421 Library_Tree: Make ChopDown overloadable at runtime. 2014-08-12 19:00:16 +02:00
Sven Eberhardt 8f5b685016 Fix typo in comment in deployed balloon script. 2014-08-12 15:29:20 +02:00
Sven Eberhardt b1db0c7918 (Re)implement text completion in dialogue text windows as an async control. Default to Space, i.e. MenuOK. 2014-08-10 20:58:26 +02:00
Sven Eberhardt 4f1aa7c5cf Destroy single pixels of non-diggable material [ala] 2014-08-05 17:02:20 +02:00
Sven Eberhardt 20558ef7e1 Display dialogue attention marker in front of associated clonk 2014-08-05 17:02:19 +02:00
Sven Eberhardt 46d9162d56 Fix typo in chemical lab ruin name 2014-08-05 17:02:18 +02:00
Sven Eberhardt 474b6e1c31 Add Dlg_*_Init callback to dialogues. To be used e.g. for starting timers of NPC activities. 
Also fix scenario saving of attention state in dialogue object.
 2014-07-31 23:49:15 +02:00
Maikel de Vries e98b1bd696 fix GoldRush difficulty 2014-07-27 20:04:16 +02:00
Sven Eberhardt e8ee64fd1f Smoke graphics rework (#1088) 2014-07-22 22:42:33 +02:00
Sven Eberhardt 834566cf5e Make smoke a bit smaller. 
It somehow got really large and weird since the particle changes.

It could still get some polishing, but at least it's a bit less annoying now.
 2014-07-21 17:28:11 +02:00
Sven Eberhardt 620091f80c Fix switch of cinematics target in Dialogue. 2014-07-21 17:26:56 +02:00