Mark
2a045a097b
Renamed folder
2018-12-27 21:33:45 +01:00
Mark
a8c475d212
Renamed pipe control internals
2018-12-27 21:31:36 +01:00
Mark
00b1b37787
Renamed Library_Tank to Library_PipeControl
...
The library did not depend on the Library_LiquidContainer script at all,
removed that include and added it to the previous includers.
Removed the IsLiquidTank() identifier, because it was unused.
2018-12-27 21:21:53 +01:00
Mark
94e200f201
Fix smoke and gravity issue
...
Smoke used to fly higher with gravity 40 than with gravity 10. Fixed
this by using a start value. At default gravity, light smoke will fly
rise a little higher now, and heavy smoke behaves the same.
With higher gravity the smoke may fall to the ground now.
2018-12-27 20:30:58 +01:00
Mark
d0756e3b1c
Producer: Allow overloading where the producer takes components from
2018-12-27 19:51:19 +01:00
Mark
68bb07f162
Allow more options for customization in the resource selection icons
2018-12-27 17:45:32 +01:00
Mark
3f2ee5080d
Limit liquid input to the maximum available amount
2018-12-25 16:53:47 +01:00
Mark
1c9164b4be
Collect cut pipes to Clonk inventory, if possible
2018-12-25 15:53:51 +01:00
Mark
f5b1279cce
Formatted code
2018-12-25 15:16:38 +01:00
Mark
431456d1fa
Use new library in pump
2018-12-25 11:13:01 +01:00
Mark
8a26454f3c
Library: Resource selection
...
The resource/material selection from the pump was practical, maybe even
applicable for cable cars and the like. Extracted a separate library for
that.
2018-12-25 11:11:44 +01:00
Mark
bab1b7ee90
Extracted actual producer logic||Certain external projects have different systems and want to just use the logic on their own, without copy & paste of the file contents.
2018-12-21 21:29:45 +01:00
Mark
286d4d6a5b
Added version info to the docu
2018-12-21 21:15:11 +01:00
Mark
cf7469043d
Simplified logic for substitutes
...
The production cost method returns an array of material cost arrays, but
their format has changed. Instead of
[<default resource>, <cost>, <substitute(s)>]
it now returns an array of proplists
[{Resource = optionA, Amount = costA}, {Resource = optionB, Amount =
costB}]
so that there are fewer cases to keep in mind: No "are there
substitutes?", but you can simply check all variants and pick the best.
This also allows different substitutions, for example "2 earth or 3
sand" is now possible.
2018-12-21 16:54:43 +01:00
Mark
36dbbd27e1
Formatted code
2018-12-21 14:26:24 +01:00
Mark
c6254c2512
Added more producer tests
2018-12-21 14:05:30 +01:00
Mark
2ed69b96a5
Added producer test for substitute components
2018-12-21 11:57:39 +01:00
Mark
b73169616b
Fix producer test
...
Updating the values for substitutions was forgotten in 808e7fa
, leading
to a failing test 5.
2018-12-21 11:49:56 +01:00
Mark
6bdb4275f7
Formatted code, no change in functionality
...
Brackets, protected/private func => func, whitespaces
2018-12-21 11:25:19 +01:00
Mark
d9bc1d9142
Added callback for production progress
2018-12-21 11:08:10 +01:00
Mark
9deab8e6a9
Fix the logic again
...
Otherwise you can exit containers without an entrance area.
2018-12-21 09:56:19 +01:00
Mark
b35a58a7fc
Removed unused constants
...
This was a weird menu thing that I added about 2 years ago, and it is
not very useable, and not used :)
2018-12-21 09:10:33 +01:00
Mark
ed514b7716
Added option for ignoring contents in the interaction menu
...
Also ignore Clonks as "inventory items" if they are contained.
2018-12-21 09:01:20 +01:00
Mark
fcf2af1937
Fix not being able to exit a structure
...
It seems that the default structures have the entrance close to the
offset, so that there is an overlap and can_be_entered is true even
inside the structure.
In my case the structure offset and entrance area do not overlap, so you
could unfortunately not leave the structure.
2018-12-20 23:49:39 +01:00
Mark
6351fe7a66
GetEnergy() offers exact energy value optionally (Bug #2043 )
2018-12-20 08:40:04 +01:00
Nicolas Hake
11cfcdd910
Appveyor: Stop depending on specific Qt build for building too
2018-11-18 10:15:28 +01:00
Nicolas Hake
5808ca8047
Appveyor: Stop depending on specific Qt build
...
AppVeyor occasionally updates platform images without really
versioning them, so in order to have a higher chance of not being
broken by those, we'll just use 5.11 instead of specifying 5.11.1
explicitly.
2018-11-18 10:02:11 +01:00
Nicolas Hake
f90e424f4a
Appveyor: Bundle C4Group
...
Users have requested that C4Group is bundled with the snapshots, and
the file itself is fairly small, so it should be fine to ship it as
well.
2018-11-14 20:03:52 +01:00
Lukas Werling
34d89adf47
Fix build on gcc 4.x
2018-10-15 21:01:15 +02:00
Clonkonaut
c6d5c5044f
Rework interaction menu into a new style. Also, style overloads are easily possible.
...
Because I did this in the test scenario first, it wasn't really possible to encapsulate different steps, sorry!
2018-10-15 17:38:22 +02:00
Lukas Werling
952cfef497
Add missing C4Include include in C4ConsoleQtShapes
...
Qt's moc generates another source file that includes this header without
including C4Include.h first. The generates source file thus doesn't
compile. It is unclear to me why this isn't an issue with our current
build setup (it is an issue with a meson-based build).
2018-10-14 23:19:32 +02:00
Lukas Werling
a73e5fc871
undef "s" macro in C4Config
...
Necessary for unity builds, but also has a high conflict probability in
general.
2018-10-14 23:16:59 +02:00
Lukas Werling
ca11d86893
Add missing include guards
...
These are necessary for unity builds.
2018-10-14 23:15:01 +02:00
Lukas Werling
7273b87b01
StdAdaptors: Replace array size macros with templates
2018-10-14 23:07:23 +02:00
Clonkonaut
2d3914b33b
Fresh repository, fresh build on Windows, VS created these folders. Hope it's cool to put them on ignore.
2018-10-10 01:43:58 +02:00
Nicolas Hake
a65dd5874f
Appveyor: Fix library bundling path
2018-10-08 20:57:39 +02:00
Nicolas Hake
ca2ba96969
Appveyor: Generate package and upload it if credentials are set
2018-10-07 20:21:17 +02:00
Nicolas Hake
6dcaaa7af5
Appveyor: Inject Google Test location
2018-10-07 20:21:17 +02:00
Nicolas Hake
9691c1e41a
Appveyor: Build on Visual Studio 2017 x64 only
...
There is no pre-built binary package of Qt for 32 bit Visual Studio
2017, so we'll drop it for now.
2018-10-07 20:21:17 +02:00
Nicolas Hake
354b6be1c6
CI: Use AppVeyor to build MSVC binaries
2018-10-07 20:21:17 +02:00
Julius Michaelis
0d7738dce5
Drop broken GCC precompiled header support
2018-10-04 08:33:31 +02:00
Lukas Werling
04535b5438
Travis: Add update information for AppImage snapshots
2018-10-03 23:45:45 +02:00
Lukas Werling
55c34ecbd7
Add git branch to C4Version.h
...
The branch information is necessary for upcoming automatically-updating
snapshots. For Travis, cmake will also pick up the branch name from the
C4REVISION_BRANCH environment variable.
2018-10-03 23:44:35 +02:00
Lukas Werling
7616fa81be
Travis: Update dependencies for AppImage snapshot
2018-09-25 20:02:51 +02:00
Lukas Werling
950ad4cf2f
Fix C4ScriptLibrary destruction
...
C4PropListStaticMember must be deleted manually.
2018-09-25 20:02:51 +02:00
Lukas Werling
05e3648495
Travis: Skip TCP bind test because of missing IPv6 support
2018-09-25 20:02:51 +02:00
Lukas Werling
82feac4ccb
Remove broken assert()
2018-09-25 20:02:51 +02:00
Lukas Werling
8aeef938fc
Travis: Build and upload AppImage snapshot
2018-09-25 20:01:16 +02:00
Lukas Werling
8df71d3f32
Prevent parallel groups packing with ninja
...
For some reason, generating the groups in parallel fails frequently.
2018-09-24 19:22:32 +02:00
Lukas Werling
5395a8dc84
Add WITH_APPDIR_INSTALLATION configuration option
...
With this option enabled, `make install` will install the files in an
AppDir-compatible directory structure suitable for creating an AppImage.
2018-09-24 19:22:32 +02:00