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

5997 Commits (cf474e99aa8d654053ab07460a78beb8b91b13d2)
 

Author SHA1 Message Date
Martin Plicht cf474e99aa mac: Rearrange sound toolkit includes and FindAudio.cmake so that sound+music works for OSX 2014-09-21 22:16:54 +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
Sven Eberhardt 37bf5d3bb8 Fix parameter documentation of PV_Sin. 2014-09-12 01:02:10 +02:00
Kevin Zheng e19653b607 Replace CMAKE_REQUIRED_FLAGS with CMAKE_CXX_FLAGS 
This prevents C++ flags from being passed to the C compiler while
running CMake tests.
 2014-09-01 20:07:54 +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
Armin Burgmeier faa9667b66 mape: Add map zoom option 2014-08-24 13:20:23 -04: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 c8f7d2b3cb Revert "Fix CMake so it doesn't search non-static glew32." to make snapshots work until problem is resolved. 
This reverts commit 326d609ddc.
 2014-08-20 18:06:19 +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 d7c59d272b CMake: Add OpenAL to link libraries. 
I need this for my build. Let's hope it doesn't break the snapshots.
 2014-08-14 17:18:29 +02:00
Sven Eberhardt 326d609ddc Fix CMake so it doesn't search non-static glew32. 2014-08-14 17:18:28 +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 0f48e7ef44 Fix simultaneous setting of zoom value and zoom limits in SetPlayerZoom(ByViewRange)() script functions when new zoom value lies outside previous zoom limits. 
Simply fixed by adjusting zoom limits first, then setting the zoom value afterwards.
 2014-08-12 15:27:57 +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 9dd600c26b Add player parameter to SetPlayList (#1084) 2014-08-07 17:33:36 +02:00
Sven Eberhardt 144c8f8388 Implement music volume setting for OpenAL 2014-08-07 17:30:36 +02:00
Sven Eberhardt 271ef8ca09 Implement looping for OpenAL music. 
Also added some error logging.
 2014-08-07 15:51:58 +02:00
Sven Eberhardt cfe242b2b8 Implement ogg file playing for OpenAL-based audio system. (#1096) 2014-08-07 13:46:45 +02:00
Sven Eberhardt 4f1aa7c5cf Destroy single pixels of non-diggable material [ala] 2014-08-05 17:02:20 +02:00