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

5841 Commits (b1292a3421876416bf9d317391268215dfdad0f2)
 

Author SHA1 Message Date
Tobias Zwick 37d699c452 fix name and description of spray can 2014-01-26 01:54:17 +07:00
Tobias Zwick f541ab9075 add placeholder graphic for loom 
+ the previous unfinished loom model export seems to be corrupt, there was a loading error
 2014-01-26 01:54:16 +07:00
Tobias Zwick 13537812ef convert mesh of spray can to binary format 2014-01-26 01:54:16 +07:00
Martin Plicht 515aaf656d cmake: Only add StdSchedulerMac.mm when APPLE platform 2014-01-25 16:12:02 +01:00
Tobias Zwick a423a62bb2 Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
Tobias Zwick e1a417bc97 make the story of MineRescue more believable (so the "trapped" clonks can't climb, eh?) 2014-01-25 22:05:11 +07:00
Tobias Zwick 00ada6563c add icon for maze 2014-01-25 22:05:10 +07:00
Martin Plicht bf1f9037a8 Merge branch 'macscheduler' 2014-01-25 16:00:29 +01:00
David Dormagen 425a221aff adjusted some particles (f.e. smoke slightly brighter, foundry more subtle) 
see http://forum.openclonk.org/topic_show.pl?pid=25749#pid25749 for further information
 2014-01-25 15:51:05 +01:00
Tobias Zwick 7420dba41b fix creation of particles when outside for ruby 2014-01-25 17:03:07 +07:00
Tobias Zwick cb32c3f93c maze.ocs: finetune to be more claustrophobic 2014-01-25 17:02:21 +07:00
Tobias Zwick ebd14e2339 fix #1012: Construction removed when all materials available 
+ Add localized error message when the underground changed and thus the construction cannot be created
+ Add a SetPosition to ensure the construction site is really exactly at the given position
 2014-01-25 16:20:27 +07:00
Tobias Zwick b221623b89 less firestone yield from firestone veins (blowing up one vein was too extreme) 2014-01-25 13:50:07 +07:00
Tobias Zwick 07616e1ac7 spraycan now has a model; can only be used up to 50px away from the clonk 2014-01-25 13:49:29 +07:00
Tobias Zwick 41e4121bed replace jar of winds with windbag in scenario description 2014-01-25 01:40:00 +07:00
Tobias Zwick 7023fed02d add a "story" and German description for maze.ocs (now aka Heart of the Mountain) 2014-01-25 01:39:06 +07:00
Tobias Zwick 0c09a3fdfe maze.ocs: add a little turbulence to tunnels and caves 
Enough turbulence to let it look more natural but not so much that it creates more than a few narrow passageways which must be mined through. This is quite a discreet change.
 2014-01-25 00:56:36 +07:00
Tobias Zwick 408f9fca79 maze.ocs: make rubies sparkle even when collected 2014-01-25 00:54:44 +07:00
Tobias Zwick 07536d4ec2 make credits text look less shitty on widescreen resolutions 
Even though the credits only consist of text, the current credits screen is an image. The image was stretched across the full screen, now the aspect ratio is kept at least.
 2014-01-24 22:56:32 +07:00
Tobias Zwick 0b0fda2732 fix invalid material in tutorial 3 2014-01-24 22:32:50 +07:00
Tobias Zwick 8e8653678e install icons of different sizes on linux 2014-01-24 16:54:47 +07:00
Tobias Zwick a51d429611 add icon pngs for linux alongside the windows ICO file 2014-01-24 16:45:31 +07:00
Tobias Zwick d35bfdb7b6 update credits screen 
add some contributors, put the newly formed artist workgroup into <Art and Content>
clean up credits screen dialogue code
 2014-01-24 15:33:47 +07:00
Martin Plicht 130660a544 Merge branch 'master' into macscheduler 2014-01-23 17:53:58 +01:00
Martin Plicht 911c9b7713 C4AbstractApp: ScheduleProcs timeout parameter defaults to 1000/36 instead of -1 so the timeout is not determined to be infinity down the road, leading to mac version not getting out of the poll call anymore 2014-01-23 17:53:40 +01:00
Martin Plicht d504626a40 StdScheduler: Split into StdSchedulerWin32/StdSchedulerPoll/StdSchedulerMac 2014-01-23 17:53:40 +01:00
Martin Plicht 426e6c659a C4Application: Check if pGameTimer exists before removing/deleting 2014-01-23 17:52:53 +01:00
Martin Plicht a4c858f4ee C4Draw::ResetGamma: Implement by applying saved DefRamp (Mac version went all blue using the old implementation) 2014-01-23 17:52:30 +01:00
Martin Plicht 3d9c965ebd mac: C4Particles: glGenVertexArrays fix for Mac OS X 2014-01-23 17:52:19 +01:00
Tobias Zwick 010f8c97eb Make pipe object (aka line kit) only have one vertex (#962) 2014-01-23 20:38:08 +07:00
Tobias Zwick c8037f2c11 add missing DigFree=1 in Firestone definition 2014-01-23 13:18:53 +07:00
Sven Eberhardt 84600bef53 Auto-collect firestones if picked free and there's free space in inventory (same as for shoveling). 2014-01-22 21:46:50 +01:00
Sven Eberhardt 55083802b5 Updated SaveScenarioValueToString to recurse into arrays and allow custom save names for defs/proplists 2014-01-22 20:28:41 +01:00
Sven Eberhardt fef07b324b MineRescue: Convert Game.txt to Objects.c (#1008) 2014-01-22 18:20:26 +01:00
Philipp Kern e151b1de91 move the clonk binary to /usr/games 
The FHS says that game binaries should be stored in /usr/games.
 2014-01-23 00:14:32 +07:00
Tobias Zwick 12ad7d41a6 mark undocumented functions in C4GameScript.cpp 2014-01-22 14:00:37 +07:00
Tobias Zwick 6d98caaa5f fix some documentation bugs 2014-01-22 14:00:05 +07:00
Tobias Zwick 4472ce3243 add documentation for a few undocumented functions 
GetMatAdjust, GetTexture, GetAverageTextureColor
 2014-01-22 13:59:03 +07:00
Tobias Zwick 266540fc76 add documentation for BlastFree 2014-01-22 13:01:45 +07:00
Tobias Zwick f0223442ab make barrels work with every material 
+ replace hardcoded materials the barrels work with with any liquids
+ use SetColor instead of changing mesh materials
+ add a CalcValue function
+ add localization for materials the barrel can be filled with
+ minor refactoring
 2014-01-11 22:32:45 +07:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
Sven Eberhardt 57463b61c4 Rework SolidMasks to be defined in a separate SolidMask.png graphics file instead of the main definition graphics. 2014-01-08 01:55:33 +01:00
Sven Eberhardt 9a5a5432db fix some safety checks 2014-01-08 01:54:13 +01:00
Sven Eberhardt dd0438b55d Added helper function LogCallStack. 
Useful when you need a stack trace but don't want to break execution flow.
 2014-01-04 14:22:41 +01:00
Sven Eberhardt a7fe61bb36 Fix CrewSelector HUD for non-Clonk crew memebers 2014-01-04 14:21:44 +01:00
Sven Eberhardt e52fac76e3 Fix some null pointer errors in power system when objects are destructed. 2014-01-03 19:43:14 +01:00
Sven Eberhardt ca941b8e1e Fix "ParentKeyName" assertion when a script error occurs during scenario object initialization. 2014-01-03 18:59:31 +01:00
Sven Eberhardt fa57eb4ab0 Fix moving SolidMasks. 2014-01-03 17:39:00 +01:00
Sven Eberhardt 50a6ccf009 Fix SolidMasks in editor mode when no viewport is opened. Do not re-put SolidMasks every frame on movable but non-moving objects. 
Selecting a GL context during SolidMask initialization is not a very good solution. But as long as SolidMasks are stored in graphics surface we have no choice.

A better solution would be to generate a dedicated (non-OpengL) surface for SolidMask data on object loading. But then objects that have SolidMasks would need to be tagged somehow.
 2014-01-03 15:13:09 +01:00
Sven Eberhardt 5865042849 Scoreboard library: Add functions to remove rows and columns. 2014-01-03 12:44:36 +01:00