Commit Graph

5617 Commits (a51d429611dccca0284f5cb9154830905e0c23e2)
 

Author SHA1 Message Date
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 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
Sven Eberhardt 616945d220 Remove superfluous TODO comment.
I checked it. It does work :-)
2014-01-03 12:43:58 +01:00
Sven Eberhardt f12fe2a24a Call MaxContentsCount using this->MaxContentsCount() to allow runtime overload 2013-12-30 13:46:34 +01:00
Sven Eberhardt 21c132d2cb Fix StaticSaveVar saving to save string, not object pointer. 2013-12-30 12:24:41 +01:00
Sven Eberhardt faeb4efd53 MovingBrick: Ensure only one movement effect is active at a time. 2013-12-30 03:09:44 +01:00
Sven Eberhardt 0db19586c8 Save StaticSaveVar as property in Objects.c
Otherwise, you'd have to re-set it every time you edit objects files in the editor.
2013-12-30 03:09:13 +01:00
Sven Eberhardt 56f985a017 Fix some failsafeties in HUD when controlling non-Clonk crew objects 2013-12-30 02:11:48 +01:00
Sven Eberhardt e157b1b673 Docs: Renamed GetPlrColor to GetPlayerColor. 2013-12-29 22:34:11 +01:00
Sven Eberhardt 74243429c0 Fix Wait-command. 2013-12-29 21:57:26 +01:00
Sven Eberhardt 2f0ea1ec09 Always save direction of Clonks when saving scenarios.
Direction is randomized at creation and there's no good way to find out if the user wanted that specific direction. So just always save it, because that's what scenario designer usually wants.
2013-12-29 17:54:36 +01:00
Sven Eberhardt 4e656912f1 Fix loading of Objects.c when returning to main section from another scenario section 2013-12-29 17:46:45 +01:00
Sven Eberhardt 49b2c75475 Added helper function Particles_Colored - creates a colored version of a base particle. 2013-12-29 15:08:52 +01:00
Sven Eberhardt 649e06039f Fix null pointer in power helper object when power plant is destructed.
The power system isn't written in a very failsafe way when it comes to object destruction. Why are "helper objects" needed now that we have proplists to store such things?
2013-12-29 14:44:14 +01:00
Sven Eberhardt 33d85a145e Fix particle-related crash.
ClearAllParticles deleted the particle lists but never bothered to clear any pointers to them.
2013-12-28 21:30:45 +01:00
Sven Eberhardt a385102c36 Changed GetDefBottom to use bottom vertex to determine object bottom.
Since this is the method also used by CreateObject, GetDefBottom can be used to recreate objects at their proper position.
2013-12-27 17:11:02 +01:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
Nicolas Hake 70ab95021f Remove autotools files
Building OpenClonk with GNU autotools has been broken since early August
at least (9ceb692). Since nobody complained so far, I'm assuming nobody
has used it recently, and opted to remove the broken code.
2013-12-25 22:29:37 +01:00
Nicolas Hake adc50f3b23 Replace ancient README files with a not quite as ancient one
I merged most of the three separate README files into a single one. I
also assumed that people trying to build OpenClonk from source have a
rough idea of how their build system works, so I removed the tutorial
from there. People who are completely new to this should consult the
wiki or ask on IRC.
2013-12-25 22:18:43 +01:00
Nicolas Hake e0dc30c59a Update copyright notices
As discussed in http://forum.openclonk.org/topic_show.pl?tid=2917, I
have merged all copyright notices into a single file and referenced that
merged file from each source file.

For the updated source files, the timeline has been split into three
parts:
 1. Pre-RWD code (before 2001)
 2. RWD code (2001 through 2009)
 3. OpenClonk code (2009 and later)
All pre-RWD copyright notices have been left intact, as have RWD-era
copyright notices where the file did not have a RedWolf design copyright
notice but only individual author ones. All copyright notices of the
OpenClonk era have been replaced by a single notice ranging from the
first recorded year to the current year (2013). Mape code did not get a
OpenClonk Team copyright notice because it is somewhat separate from the
main OpenClonk codebase and has only been touched by Armin Burgmeier.
2013-12-23 13:03:19 +01:00
David Dormagen 921f21e9a6 allocate particle lists for C4Objects lazily
This should fix an error with incorrect particle lists after loading. This is also a cleaner way overall, since only a fraction of all objects will ever have particles attached to them
2013-12-22 18:51:05 +01:00
David Dormagen aeb057a4b1 made C4ParticleChunk uncopyable to prevent double-deletion of OpenGL buffers leading to a crash 2013-12-22 17:23:47 +01:00
David Dormagen b70b195e24 particles: use OpenGL buffer-objects and vertex-arrays-objects for particle drawing
Even though the whole data is (still) transmitted every frame, I get a pretty high (2x) performance increase on my system. I suspect that the graphics card has to allocate less memory every frame.
2013-12-21 14:07:14 +01:00
Martin Plicht a616a1a6cd script: And I forgot to copy-paste a ‘!’, yay 2013-12-21 13:28:36 +01:00
Martin Plicht d699ba80a5 script: Fix some minor nil/0/parameter passing issues, fix some <variable> = <variable> noop issue and convert some while loop into a for loop 2013-12-21 13:23:51 +01:00
Tobias Zwick ac4ac04558 Merge branch 'master' of ssh://git.openclonk.org/openclonk 2013-12-18 12:48:14 +07:00