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

9195 Commits (liquid_container)
 

Author SHA1 Message Date
Mark d474b0dd6e Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-05 06:29:54 +02:00
Mark c607e3e4c2 Merge commit '0795d088d1f82e8d4158e4fa859bbe69e0c4c875' into liquid_container 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Stackable.ocd/Script.c

Unit tests still pass!
 2016-04-05 06:29:08 +02:00
Nicolas Hake f9dfcd1f71 Update all copyright notices for 2016 2016-04-05 06:18:43 +02:00
Nicolas Hake 1444d3d778 Rewrite header inclusions to #include "path/to/file.h" style 2016-04-05 06:14:25 +02:00
Nicolas Hake 2ced63de25 Fix mape build 2016-04-05 06:14:11 +02:00
Nicolas Hake 1e1532ef8a Darwin: What the hell does "#import" do anyway? 2016-04-04 23:27:50 +02:00
Maikel de Vries 0795d088d1 stack objects with extra slots in menu iff slot contents can be stacked 2016-04-04 22:23:34 +02:00
Maikel de Vries 1615284bd1 fine tune weapons and items in aerobatics 2016-04-04 22:23:34 +02:00
Maikel de Vries 255429d3e0 make setting loaded public in musket and grenade launcher 2016-04-04 22:23:34 +02:00
Maikel de Vries ca265103bb do not stack loaded weapons with unloaded ones 2016-04-04 22:23:34 +02:00
Nicolas Hake eabca223f5 Update all copyright notices for 2016 2016-04-03 20:24:42 +02:00
Nicolas Hake 493c276126 Rewrite header inclusions to #include "path/to/file.h" style 2016-04-03 20:24:42 +02:00
Nicolas Hake 5134a0a0a4 Fix mape build 2016-04-03 20:24:42 +02:00
Mark 1f303ac331 Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-03 20:16:55 +02:00
Maikel de Vries 202f2c49df fix snowing for cloud 2016-04-03 19:11:00 +02:00
Nicolas Hake 267bb1c3f1 Landscape: Make script-edited maps work again 2016-04-03 17:23:00 +02:00
Nicolas Hake 5c0d8a9ce6 Landscape: Make script-generated maps work again 
...by actually storing the result of the generator somewhere.
 2016-04-03 17:02:41 +02:00
Nicolas Hake ebfacb928d GLSL: Improve line information in error messages 
Instead of making the user count lines from the shader log, we'll now
emit #line directives and a file number->name mapping to make it easier
to figure out which file and line the error message comes from.
 2016-04-03 16:17:39 +02:00
Nicolas Hake 3641509462 Mesh rotation: Keep rendered mesh inside shape 2016-04-03 13:37:04 +02:00
Nicolas Hake de1d00eb68 Meshes: Enable reload for custom material shaders 2016-04-03 13:37:03 +02:00
Nicolas Hake ccadd2bec3 C4Object: Remove some unimplemented func declarations 2016-04-03 13:24:28 +02:00
Nicolas Hake 0537df5f23 C4Object: Move C4Def.h dep out of header 
C4Def is only ever used as a pointer inside C4Object.h, so we don't need
to include C4Def.h from it.
 2016-04-03 13:24:26 +02:00
Nicolas Hake 735f9cc06b C4Landscape: Pull everything private out of the header 
Since LTCG is enabled now, we don't have to define every function inside
the headers for ~xXx super speed xXx~, which means we can strip the
headers down to their bare minimum and reduce interdependencies and
therefore recompilation times by a lot.
 2016-04-03 13:24:24 +02:00
Nicolas Hake 9e9c5d0c06 CMake/MSVC: Interpolate the right variable into CMAKE_CXX_FLAGS_DEBUG 
Instead of discarding all previous debug CXXFLAGS and replacing them
with generic ones, actually interpolate CMAKE_CXX_FLAGS_DEBUG into a
value to assign to CMAKE_CXX_FLAGS_DEBUG.
 2016-04-02 02:41:50 +02:00
Nicolas Hake 893d4e295b C4Landscape: Set dynamic mode when map was successfully generated 
...instead of when it failed to generate.
 2016-04-01 14:38:47 +02:00
Nicolas Hake 0c6fee1442 CMake: Enable LTCG/LTO 2016-03-31 23:05:00 +02:00
Nicolas Hake d3d41721f0 CMake: Disable plain "Release" builds 
Having a build type that's called "Release" makes people thing they
should use it when they want optimized builds. They shouldn't. They
should be using RelWithDebInfo instead, so at least trying to debug
errors isn't entirely futile.
 2016-03-31 23:01:37 +02:00
Nicolas Hake 3922e7c5ee CMake: Stop the OC_*_FLAGS song and dance 
CMake handles adding un-cached flags properly, so we don't have to force
flags into the cache.
 2016-03-31 23:01:36 +02:00
Nicolas Hake 0abef8dac5 Remove "High-res landscape" option 
We're requiring shaders for everything else we render, so there's no
point in having a shader-free landscape renderer around.
 2016-03-31 19:22:17 +02:00
Nicolas Hake 33b8d404a5 GL: Add "frameCounter" uniform 
Add the current frame counter as a uniform variable to the shaders, so
people can use it to do time-based animation.
 2016-03-31 01:44:44 +02:00
Nicolas Hake cd0032ccf0 Do mesh rotation outside of DrawTransform 
Mesh rotation needs to happen as part of the MeshTransform so lighting
is applied correctly. DrawTransform applies after lighting which made
rotated meshes look weird.
 2016-03-31 01:19:58 +02:00
Clonkonaut fe4132309a Added a few more interaction menu buttons to the cable cars, animation to the station. 2016-03-30 00:55:49 +02:00
Mark b00290f5f7 Vendor: Added parameter for the base that is selling the object. 
This way the barrel can sell its contents, leaving behind an empty barrel.
 2016-03-29 20:11:41 +02:00
Mark bc9538200c Merge branch 'master' into liquid_container 2016-03-29 20:06:14 +02:00
Mark 7e74baac55 Refactoring: Construction site takes materials, not the constructor 
The functionality of taking construction materials from a clonk and lorries was extracted to a separate function and moved from the constructor to the construction site. This is a little bit of an esthetic decision, but it is also useful for my project that has a spacebar-interaction which takes construction materials from the clonk without the need to open the inventory menu.
 2016-03-29 18:56:10 +02:00
Clonkonaut fb761fbd58 Removed parentheses after 'this'. 2016-03-29 18:17:05 +02:00
Mark 7110882813 Vendor: Extracted functions for ejection of contents 
In certain overloads of the object I want to be able to not eject contents, or eject only certain objects. The default behaviour of ejecting ALL contents whenever someone buys something is annoying in certain structures, such as a marketplace.
 2016-03-28 22:33:58 +02:00
Mark 44b643d1e3 Fix error when opening resource goal description 2016-03-28 22:33:48 +02:00
Clonkonaut e6093ee2fc Fixed possible access of a removed zap (#1665). 2016-03-28 19:21:29 +02:00
Maikel de Vries 6bdbc5b5c7 add InsertVertex script function to insert a vertex at arbitrary position 2016-03-28 17:36:00 +02:00
Maikel de Vries 12ae155015 GetVertex: return nil for invalid vertex index and improve documentation 2016-03-28 17:36:00 +02:00
Mark f0cfeeaf09 Merge remote-tracking branch 'origin/master' into liquid_container 2016-03-26 13:16:50 +01:00
Clonkonaut 2db254b948 Updates cable cars / lorries with new graphics by pluto. Made everything work again. Integrated control into the interaction menu. 
Still needs a lot of work but I'm getting there.
 2016-03-26 00:14:20 +01:00
Mark 96c84a5bcd Deleted outdated Library_BarrelFiller 
Barrels get filled by liquid objects now, you just have to insert liquid objects into the container.
 2016-03-25 20:01:38 +01:00
Mark ab5d92117a Refactoring: Added parameter for container in CreateLiquid() 2016-03-25 19:44:36 +01:00
Mark 52542d7977 Refactoring: Liquids: Removed GetLiquidID() and changed CreateLiquid() 
CreateLiquid() can be called from definition context now, to create a certain amount of liquid.
 2016-03-25 19:34:36 +01:00
Mark 1c1ea38efa Renamed the liquids IDs 
Omitted the prefix "Liquid_".
 2016-03-25 19:11:55 +01:00
Mark ed75112715 Move liquids to the folder Items\Resources 2016-03-25 19:11:34 +01:00
Mark af2e4de6a1 Improved display of the connection status of pipes 2016-03-25 18:55:22 +01:00
Mark 96468023cf Fix line not updating on disconnect 2016-03-25 18:51:18 +01:00