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

10692 Commits (e5b15a494c6377958baca028bb32c3ff8c1916a7)
 

Author SHA1 Message Date
Maikel de Vries 968c5b9e68 clarify how to use hammer in tutorial 3 (#1888) 2017-06-17 21:16:38 +02:00
Maikel de Vries 48c17c1e54 clarify tutorial 2 loam message (#1887) 2017-06-17 21:08:45 +02:00
Maikel de Vries 6bfd967f40 add wealth display to tutorial 1 2017-06-17 20:56:03 +02:00
Nicolas Hake 8aea4cc360 Merge pull request GH-48 from Fulgen301/PR 
- Remove StringToInteger function

Closes GH-48.
 2017-06-14 21:13:21 +02:00
Fulgen301 73b52a15ce Remove StringToInteger function 2017-06-14 21:11:39 +02:00
Lukas Werling f44aaf6ff7 Merge pull request GH-45 2017-06-13 20:03:23 +02:00
Nicolas Hake 9020f3c0ec Merge parts of pull request GH-46 from tusharpm/cmake 
- get year from CMake directly
 2017-06-12 08:37:28 +02:00
Tushar Maheshwari 8fef67378d get year from CMake directly 2017-06-12 08:36:43 +02:00
Maikel de Vries bfe9449256 lava core: only have solid mask when frozen 
This causes less lag.
 2017-06-11 14:50:35 +02:00
Mark 16c2fd80d5 Animations: Rolling when hitting the landscape as a separate function 
The logic for rolling can now be overloaded. Runtime overload is not intended yet.
 2017-06-09 21:43:35 +02:00
Mark a4ad791969 Add help message to editor 
Still no idea why it was added to the list twice.
 2017-06-08 22:28:18 +02:00
Mark d252e839b5 Remove references to AI 
the basic AI should not be referenced in its components, so that they are independent of each other
 2017-06-08 21:58:37 +02:00
Mark df0a43a46b Stricter calls 
This is completely optional, as the calls do now cause an error and not just log a warning
 2017-06-08 21:44:32 +02:00
Mark c64670c7d5 Replace .control references 
Same argument as renaming the control effect. Is optional, though
 2017-06-08 21:35:04 +02:00
Mark 6440b16387 Minor script formatting 2017-06-08 21:25:11 +02:00
Mark a87eed5de1 Replace FxAI-references 
The hardcoded references make renaming the effect later a huge problem.
 2017-06-08 21:15:31 +02:00
Mark f204b959e7 Port from AI library project 
It seems that the vehicle AI is broken.
 2017-06-08 20:54:54 +02:00
Mark 8b149a5433 Preparation: Move files to a different folder 2017-06-08 20:32:36 +02:00
Maikel de Vries 7b4ba0245b fix script error on basement attachment to scaffold (#1917) 2017-06-03 15:41:03 +02:00
Maikel de Vries 2b88e77254 adapt System.ocg headers to style guidelines and small clean ups 2017-06-02 17:15:08 +02:00
Maikel de Vries f3cadedff1 add effects to block damage and fire 2017-06-02 17:15:08 +02:00
Mark b19e083495 Fixed a typo 2017-05-31 21:59:04 +02:00
Nicolas Hake 9d6d873156 Merge GH-43 from Fulgen301/OCMilestoneProject 
Torch: Add new mesh
  Torch: Emits light when held, remove DoKneel() animation
 2017-05-31 18:13:39 +02:00
Linus Heckemann 5e8ad9c8e6 nix expression: add readline 2017-05-30 09:02:43 +01:00
Linus Heckemann 03cb5f9881 nix expression: move pkgconfig to nativeBuildInputs 2017-05-30 09:02:43 +01:00
Linus Heckemann ef3e59890c Add expression for building with nix package manager 2017-05-30 09:02:43 +01:00
Mark 3f9687c1a0 Assert: New assertion for definition context 2017-05-29 21:56:06 +02:00
Sven Eberhardt 04ec41b54c Hide Wearable and RangedWeapon libraries in object creator 2017-05-27 16:34:33 +09:00
Sven Eberhardt 9c2fa297ca Move LavaChunk from volcano to items/resources 
This simplifies editor placement
 2017-05-27 16:33:22 +09:00
Sven Eberhardt a2d6b65668 Add Title.txt for group folders in Objects.ocd and Decoration.ocd 2017-05-27 16:31:46 +09:00
Sven Eberhardt a74dcc5450 Editor: Support localized definition group folder names (from Title.txt) 2017-05-27 16:30:59 +09:00
Sven Eberhardt cb86124d78 Ladder: Add editor handles to drag length 2017-05-22 12:15:45 -04:00
Nicolas Hake 233d7edba4 Merge PR GH-44 from tusharpm/clangtidy 
Automatic fixes using clang-tidy for header files
 2017-05-15 13:48:51 +02:00
Tushar Maheshwari a661eab867 Automatic fixes using clang-tidy for header files 
A follow-up on a previous PR GH-41. The discussion in the forum can be
viewed at http://forum.openclonk.org/topic_show.pl?pid=33086.
Run clang-tidy (without auto, pass-by-value and using checks) to fix the
header files not modified in the previous PR.

Summary of the changes:

 - C++11 member initialization.
 - nullptr instead of 0 for pointers.
 - override for functions declared virtual in base class.
 - default trivial special member functions
 2017-05-15 13:46:46 +02:00
Nicolas Hake 903be585c8 Merge PR GH-42 from tusharpm/includes 
Consolidate the include statements scattered across the code in accordance
with this comment in C4Include.h. The advantages are listed in the same
comment.

Furthermore, it follows llvm-include-order which is the logical
extrapolation of the project's style guideline wherever possible
(C4Include.h being the most-frequent exception).

Summarizing the changes:

 - Remove the files included in C4Include.h from all other files.
 - Reorder the include directives in the cpp files
   - C4Include.h
   - main module header
   - other headers (lexicographical order)
 - Remove repeated include statements (easy to spot after sorting)

Tested the local Windows build and Travis builds succeeded for Linux.

Note: this was not all automated, the manual steps may have introduced
some errors in sorting.
 2017-05-15 13:26:26 +02:00
Tushar Maheshwari 3a4f49ad90 Revisit #includes 
Consolidate the include statements scattered across the code in accordance
with the comment in C4Include.h. The advantages are listed in the same
comment.
Furthermore, it follows llvm-include-order which is the logical
extrapolation of the project's style guideline wherever possible
(C4Include.h being the most-frequent exception).
 2017-05-15 13:24:59 +02:00
Maikel de Vries 0ed4d484fc prevent kill logs rule from creating the relaunch rule 2017-05-15 12:17:17 +02:00
Maikel de Vries 9e9e664581 only show entering interaction if actually standing at the entrance of an object 2017-05-13 15:04:02 +02:00
Maikel de Vries 496c73a50f add a method to calculate the area to the shape library 2017-05-13 14:59:14 +02:00
Maikel de Vries fd734330d6 first try to enter pushed vehicle when entering objects 
There was no possibility to enter vehicles into yet, so this would be my first attempt to solve this, we can evaluate this and improve if needed.
 2017-05-12 14:38:36 +02:00
Mark 70a89ce4f8 GUI: More robust calculation 2017-05-11 21:52:20 +02:00
Mark 1362494790 Fixed accidental redeclaration existing constant 2017-05-11 21:19:47 +02:00
Sven Eberhardt 9abf0d156e Add editor drag handle to extend tunnel support decoration 2017-05-10 18:42:56 -04:00
Sven Eberhardt 041e562542 Add HorizontalFix and VerticalFix support for "point" editor property delegate 2017-05-10 18:42:56 -04:00
Lukas Werling 15e5857689 Change alut includes to <AL/alut.h> 
Alut's pkg-config definition only adds the top-level include directory
containing the AL directory to the include paths. This works on most
platforms because OpenAL adds that AL directory. However, with nix,
these two directories are distinct and the build fails.
 2017-05-10 23:23:09 +02:00
Mark 739ddc2be3 Additional GUI layout 
I found it a lot easier to create GUIs with these functions, so I decided to add them. If something can be simplified, please tell me so.
 2017-05-10 22:33:38 +02:00
Mark 631c239717 Merge function for proplists 2017-05-10 22:03:57 +02:00
Mark 03dc2cb84f Some common assertions 
An attempt in reducing duplicate code :)
 2017-05-10 21:52:54 +02:00
Sven Eberhardt 1b4fd9abe3 Editor: Add translation overview table (Tools menu) 2017-05-09 22:43:56 -04:00
Sven Eberhardt 3289068ee0 Move C4PropertyPath class into its own files 2017-05-09 22:43:06 -04:00