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

8826 Commits (eabca223f5e7c237f5d3bb88183d38a41cb9bced)
 

Author SHA1 Message Date
David Dormagen 63655f2763 global func Decay: some cleanups & added 'delay' parameter for decay speed 2016-02-20 17:57:55 +01:00
Armin Schäfer 9dca94a6b8 New Title image overlay. 2016-02-20 17:26:43 +01:00
Armin Schäfer 40016ae586 Replace old Decay methods in some animals. 
# Conflicts:
#	planet/Objects.ocd/Animals.ocd/Bat.ocd/Script.c
 2016-02-20 17:25:48 +01:00
Armin Schäfer 2893b22551 Add Decay function to Objects.ocg\System.ocg 2016-02-20 17:22:51 +01:00
Armin Schäfer 1ab375488f Fix AppendCommand(Jump) without target. 2016-02-20 17:21:31 +01:00
Maikel de Vries 4be356f4d9 diamonds: add option to place them not in groups 2016-02-19 22:13:09 +01:00
Maikel de Vries 46e18f5f9f kill tracing: add test for bomb arrow tumble kill 2016-02-19 22:13:09 +01:00
Maikel de Vries a0a5d98700 teleglove: add callback to reject control 2016-02-19 22:13:09 +01:00
Maikel de Vries 9266157a1e clonk: don't play doubt sound when exit command fails 2016-02-19 22:13:09 +01:00
David Dormagen 3227a43b17 HUD progress bar: fixed type of GUI positioning "Top" property 
The method returns an int and we need a string. It's correct in all other places.
 2016-02-16 19:01:03 +01:00
Julius Michaelis 68851106b4 Add a bit of documentation for the half-sold mask stuff. 2016-02-14 22:32:49 +01:00
Julius Michaelis c6a6b71c3a Specifically run python2 instead of python from the docs Makefile. 
If this breaks anywhere, please revert this commit.
 2016-02-14 22:32:29 +01:00
Maikel de Vries 1b94d0fcc8 reduce javelin damage 
This way it really does what was promised in the last commit (ac8d5934), and not kill someone with 2 good throws.
 2016-02-14 18:31:39 +01:00
Nicolas Hake 25deef7857 Merge fix for AnimationNode deserialization crash 2016-02-13 23:28:09 +01:00
Lukas Werling 937ddaf722 Update key code strings for game controllers 
With the SDL_GameController interface, buttons and axes have actual
names we can refer to. This also allows for advanced mappings using both
sticks (this probably needs script changes) as well as the triggers.
 2016-02-13 23:28:00 +01:00
Nicolas Hake ad01c2e48f Fix NULL deref when deserializing CustomNode AnimationNodes (GH #13) 2016-02-13 23:22:21 +01:00
Günther Brammer c9c8b0c408 Move modifier key masks to the keycode definitions 2016-02-13 22:36:41 +01:00
Günther Brammer 544c1cbb4b CMake: Remove unused HAVE_X11_KEYSYM_H 2016-02-13 22:36:41 +01:00
Nicolas Hake ec0055f260 Link to terminfo or one of its compat libraries in add'n to readline 
Unmodified readline relies on, but doesn't link to, a termcap library.
Several Linux distributions patch this, but others don't; to avoid build
failures, we'll just link to a library that provides termcap symbols
even though we don't use them ourselves. Fixes Github #15.
 2016-02-13 22:15:35 +01:00
Nicolas Hake acafce33b0 CMake: Use target_compile_definitions instead of setting the property 2016-02-13 21:56:34 +01:00
Lukas Werling bd3f020068 Replace Joystick controls with SDL GameController 2016-02-13 21:03:19 +01:00
Lukas Werling 9c840724f2 Re-enable gamepad controls 2016-02-13 18:42:23 +01:00
Sven Eberhardt a69958554f Melting Castle: Add IceWallKit spawn 
To promote more waling attacks and walling defenses.
 2016-02-13 10:43:42 -05:00
Lukas Werling 97f06fd0cd Fix openclonk-server build 2016-02-12 22:40:55 +01:00
Günther Brammer c332fe940b Merge branch 'sdl-mouse' 2016-02-12 21:11:21 +01:00
Lukas Werling 24ef8b43af Grab the mouse while in-game (#1637) 
This only implements this for the SDL port for now.
 2016-02-12 21:09:40 +01:00
Günther Brammer 92217e51e0 GLX: Use gdk instead of XLib to make glXCreateContextAttribsARB not exit 2016-02-12 20:39:39 +01:00
Günther Brammer 0c0c64642a Remove unused #define in C4AulParse 2016-02-12 17:15:46 +01:00
Lukas Werling f505b31032 SDL: Fix mouse button handling 
- The right mouse button didn't work at all.

 - The left mouse button stopped working when clicking multiple times
   without moving the cursor.
 2016-02-11 22:29:10 +01:00
Lukas Werling 392b7bab72 SDL: Add support for the mouse wheel 
Fixes #0001682
 2016-02-11 22:17:42 +01:00
Mark 5224eb5b18 Goal Resource: Variable amounts of exploitation 
It is possible to set the amount of resources to be extracted with an additional parameter in SetResource() now. The default amount to be extracted is 95 percent, which is the same behaviour as before the changes.
 2016-02-11 22:16:19 +01:00
Mark 3993a41cea Goal Resource: Code comments 
Some more fine tuning, code comments.
 2016-02-11 22:04:22 +01:00
Mark 03d4662811 Goal Resource: Readability 
Made the lines more readable.
 2016-02-11 21:56:14 +01:00
Mark f122346241 Goal Resource: exploitable_units 
Renamed mat_cnt. Will make the lines more readable in the next commit.
 2016-02-11 21:50:50 +01:00
Mark 9fa4632a48 Goal Resource: ExploitableObjectCount() 
Extracted the division by blast_ratio to a function. This should help again when expanding to diggable materials.
 2016-02-11 21:42:19 +01:00
Mark a4d2edd0d2 Goal Resource: ObjectCount2MaterialCount() 
Deciphered what some of the functions are good for, since the original code is kind of cryptic. This should help again when expanding to diggable materials.
 2016-02-11 21:35:59 +01:00
Mark 50b4d6bae8 Goal Resource: AvailableObjectCount() 
Replaced the ObjectCount() calls with a function. This should make it easier to expand the script to diggable materials later.
 2016-02-11 21:20:13 +01:00
Mark d9e75aaaba Goal Resource: Improved variable names 
Renamed indices, removed unused variables.
 2016-02-11 21:06:38 +01:00
Mark 5c2dcf41a3 Goal Resource: Improved variable names 
Extracted functions that were used multiple times and use consistend naming for material.
 2016-02-11 21:02:16 +01:00
Maikel de Vries b7766780c5 fix plane for several C4D_None objects which where C4D_Structure before 2016-02-10 22:40:44 +01:00
David Dormagen 77bdc8e841 disallow collection via shift when contained (#1677) 2016-02-10 18:12:09 +01:00
Lukas Werling 29491ec3b7 Replace lots of empty parameters with proplist for Sound() 2016-02-10 13:31:16 +01:00
Lukas Werling 4ca5d2bb40 Add variants of Sound(At) taking a proplist for options 2016-02-10 13:14:06 +01:00
Nicolas Hake 5f895c14fc Materials: Fix misspelling of "Incendiary" (#1680) 
The wrong spelling will still be accepted as a material value, as long
as no value with the correct spelling exists.
 2016-02-09 23:45:02 +01:00
Nicolas Hake 6f669e7b49 Merge remote-tracking branch 'github/pull/11' 2016-02-09 22:18:49 +01:00
David Dormagen 91391c64af draw global particles on plane 900 
Previously, global particles would be drawn even in front of Plane 1000+ (GUI) objects. Additionally, it was impossible to specify particles that were supposed to always be in front of all other particles (e.g. fog, clouds, emulated FoW, ...).
Now, you can attach particles to an object on plane 901+ and have them be in front of everything else.
 2016-02-09 20:43:23 +01:00
Maikel de Vries 99d5a7c8c9 lorry: play a sound when dumping contents 2016-02-09 19:33:30 +01:00
Armin Burgmeier 582cba01ed Build Fix 2016-02-08 21:28:44 -08:00
Nicolas Hake 43aa11623a Fix off-by-one error in FoW renderer (#1678) 
The FoW renderer would try drawing to texture coordinates one pixel
too high (i.e. if the texture was 256 pixels high, it would draw to
pixels with 1 <= y <= 256 instead of 0..255).
 2016-02-08 22:58:18 +01:00
Nicolas Hake a204439f80 C4FontLoader: Stop manually managing memory 
Instead of implementing a dynamically growable array with new and delete
and memcpy like cavemen, we'll use a vector of smart pointers.
 2016-02-08 22:58:17 +01:00