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

11259 Commits (master)
 

Author SHA1 Message Date
Mark b12e54ef21 New coal texture 2018-04-01 20:29:54 +02:00
Lukas Werling 1382478774 Extract Goal_MultiRoundMelee from HotIce 
There are currently multiple multi-round scenarios in development that
all copy most of HotIce's >500-line scenario script for the multi-round
logic. This commit isolates that logic in a goal with an easy-to-use
interface.
 2018-03-31 16:08:29 +02:00
Maikel de Vries 07e66279be cable cars: scenario saving for cable car 2018-03-31 11:33:08 +02:00
Maikel de Vries 816754a3de cable cars: improve tests and script clean up 2018-03-31 11:32:42 +02:00
Maikel de Vries c629661af2 cable reel: fix connecting, max cable length, ensure straight cables 2018-03-31 10:44:36 +02:00
Maikel de Vries a28b3b9ca1 cable cars: fix network recreation when cable has broken 2018-03-30 10:54:41 +02:00
Maikel de Vries d8736a56ac cable cars: improve network deletion and recreation + clean up 
This is a rather chaotic commit and does not solve all problems of network creation yet, but is an improvement over the old system where deletion of a cable line would fail the network. However, we probably need a cleaner method to construct a network properly.
 2018-03-29 21:28:07 +02:00
Maikel de Vries 49d03e52c6 improve cable car test scenario 2018-03-29 21:28:07 +02:00
Maikel de Vries 2b9c96de30 make hoist target move more fluently 2018-03-29 21:28:07 +02:00
Maikel de Vries ff21dc3cfa improve destination selection menu a bit 2018-03-29 21:28:07 +02:00
Maikel de Vries 330e275b3d cable hoist: new type effect, prevent interactions when attached, complete menu texts 2018-03-29 21:28:07 +02:00
Maikel de Vries 85f1c714f7 add material costs to cable car components 2018-03-29 21:28:07 +02:00
Maikel de Vries 7768e6c992 fix script error when accessing non-initialized cable request queue 2018-03-29 21:28:07 +02:00
Maikel de Vries abfeb86e30 add cable cars test scenario 2018-03-29 21:28:07 +02:00
Maikel de Vries d7e3a4acd6 cable car: not ready for a new delivery if currently doing one 2018-03-29 21:28:07 +02:00
Maikel de Vries b1d1079d88 prevent script error in cable station if other station could not be found 2018-03-29 21:28:07 +02:00
Maikel de Vries e603bce240 add interaction menu tooltip and description for disengaging a cable car 2018-03-29 21:28:07 +02:00
Maikel de Vries 2a344b4543 fix hide in editor for cable car objects 2018-03-29 21:28:07 +02:00
Nicolas Hake 18b23d3d1e Merge pull request from ckanibal:slashfix 
Slashfix (GH-68)
 2018-03-29 14:48:45 +02:00
Nicolas Hake b0336bc1a6 Merge pull request from ronnystandtke:patch-1 
Update openclonk.desktop (GH-67)
 2018-03-29 14:46:35 +02:00
Lukas Werling 8d6090e607 Fix documentation of OverlayType 
Bit 3 (C4MatOv_Monochrome) was removed in fc5c38468 ("Material: Remove
color field, use textures as is", 2009), but was still mentioned in the
documentation.
 2018-03-27 19:20:21 +02:00
Nicolas Hake c73b8b3ece Warn on assignments where an expression is expected 
This introduces a new diagnostic (suspicious_assignment) which
issues when an the compiler finds an assignment either where a
condition is expected or as the parameter to return.
 2018-03-27 08:12:21 +02:00
Lukas Werling 99c14b5547 docs: Drop major version part from <version>s 
The actual release names dropped the 5.x.x scheme long ago, so there is
no reason to keep it in the docs. It's extra confusing there because the
version is given as a two-part version (e.g. 5.1) most of the time, so
it looks like everything happened in OC 5.x, even though the change was
actually in OC x.0.
 2018-03-24 23:13:08 +01:00
Lukas Werling 8e17d7fd7b docs: Fix case-sensitivity in search 2018-03-24 22:19:58 +01:00
Lukas Werling f4c854b651 docs: Implement client-side search 
Search is now performed with a pre-computed index file. This commit
removes the old PHP-based search.
 2018-03-23 21:23:38 +01:00
Mark 6aa72c1bdd Fix axe 2018-03-22 22:12:00 +01:00
Nicolas Hake b12792dddb Merge branch 'blake2-no-sse2' 2018-03-21 13:04:15 +01:00
Nicolas Hake e0850947bf BLAKE2: Fall back to plain C implementation on non-amd64 platforms 
While amd64 always supports the SSE2 instruction set extension,
other architectures don't (including 32 bit x86). For the platforms
that don't, we'll use the reference C implementation by default, but
allow users to override it with the BLAKE2_USE_SSE2 option.
 2018-03-21 13:00:40 +01:00
Nicolas Hake 570ba7a8ad Merge branch 'blake2-no-sse2' 
This adds the BLAKE2 reference C implementation as a fallback for
architectures that don't guarantee SSE2 support out of the box.

Closes GH-69.
 2018-03-21 07:58:56 +01:00
Nicolas Hake 1dd7cbb04a BLAKE2: Fall back to plain C implementation on non-amd64 platforms 
While amd64 always supports the SSE2 instruction set extension,
other architectures don't (including 32 bit x86). For the platforms
that don't, we'll use the reference C implementation by default, but
allow users to override it with the BLAKE2_USE_SSE2 option.
 2018-03-21 07:51:52 +01:00
Lukas Werling 69a08605cb docs: Change http:// links to https 2018-03-20 21:59:47 +01:00
Mark 21102bb4ef Melee Weapons: Code formatted for remaining melee weapons 
No actual changes, just added spaces and brackets for improved readability
 2018-03-20 21:13:45 +01:00
Mark 69d6b2e8d2 Melee Weapons: Code formatted 
No actual changes, just added spaces and brackets for improved readability
 2018-03-19 20:51:29 +01:00
Nicolas Hake 288e9f339b Merge commit '9493ed1277ef924c3005a9ff51f194d1cda87947' as 'thirdparty/blake2' 2018-03-19 13:50:17 +01:00
Nicolas Hake c39d1b8679 Merge commit '9493ed1277ef924c3005a9ff51f194d1cda87947' as 'thirdparty/blake2' 2018-03-19 13:50:17 +01:00
Nicolas Hake 9493ed1277 Squashed 'thirdparty/blake2/' content from commit beb75f451 
git-subtree-dir: thirdparty/blake2
git-subtree-split: beb75f4512223e6a3a03a48992345256c5ef393a
 2018-03-19 13:50:17 +01:00
Nicolas Hake ae0baf587d Remove BLAKE2b implementation requiring SSE2 2018-03-19 13:47:01 +01:00
Mark aea27f8758 Construction site: Take missing materials as interaction 2018-03-18 19:53:57 +01:00
Clonkonaut 4199a4060e Documentation: fixed example for GetRGBaValue(). 2018-03-18 13:41:23 +01:00
Clonkonaut 6f521a0805 Tutorial 8: fix in German language dialogue (#2009). 2018-03-17 17:21:18 +01:00
Clonkonaut 80b3a08770 Removed my stupid debug log. 2018-03-17 16:41:27 +01:00
Clonkonaut 4b0bca3c0d Tutorial 2: Tell the player about Roger a bit earlier (when entering the junction), so you do not miss him and mess up the scenario. 2018-03-17 16:31:43 +01:00
Maikel de Vries 52d8fdbafd warn about deprecated use of base respawn rule 2018-03-16 18:16:05 +01:00
Maikel de Vries 81b060ffb3 fix king of the hill graphics in editor mode 2018-03-16 14:00:04 +01:00
Maikel de Vries ffbda90130 convert paths to backslashes for Scenario.txt Definition entries 2018-03-16 13:54:52 +01:00
Kanibal f24d685a47 win32: fix handling of forward slashes 2018-03-15 23:49:00 +01:00
Maikel de Vries 3da209462e moving brick: fix movement graph saving 
Did not test all corner cases but this improves the situation for sure.
 2018-03-14 17:54:25 +01:00
Maikel de Vries 6efb292fa7 flame: option to make eternal for editor mode 2018-03-14 16:50:57 +01:00
Maikel de Vries f81d41ba84 correctly update active fire effect when NoBurnDecay changes 2018-03-14 16:38:33 +01:00
Maikel de Vries 017960cbc2 do not show compensator burning battery in editor creation list 2018-03-14 16:35:11 +01:00