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

4688 Commits (19caa65b7b6432605e2ee12cf508680ed2688ca3)

Author SHA1 Message Date
Lukas Werling 19caa65b7b Merge branch 'sdl-gamecontroller' (pull request GH-17) 2016-03-21 16:39:28 +01:00
Maikel de Vries 8d2ab69d03 make GetDefinition work on string parameter 
This can be useful to check if a definition is loaded, ideally the implementation is moved to the engine.
 2016-03-20 09:15:35 +01:00
Lukas Werling b50a059350 Hot Ice: Add a countdown before the round begins 2016-03-18 18:11:17 +01:00
Clonkonaut dc74a2301f Mooq: Fixed mesh rotation. 2016-03-14 12:07:46 +01:00
Maikel de Vries d0ee605728 Merge branch 'hotice-rounds' 2016-03-09 21:47:44 +01:00
Lukas Werling 2236d4fa4a Hot Ice: Allow scrolling while waiting for the next round 2016-03-09 21:29:42 +01:00
Lukas Werling 3b039f8342 Hot Ice: Add scoreboard 2016-03-09 21:08:14 +01:00
Maikel de Vries 21c5f63d44 wipf: dig free is covered with earth (#1703) 2016-03-09 20:54:43 +01:00
Lukas Werling d2836bb70a Hot Ice: Add option for multiple rounds 2016-03-09 00:32:02 +01:00
Maikel de Vries 21cbf97562 fix contact calls and borderbound for mooq 2016-03-06 10:45:02 +01:00
Maikel de Vries d768e9e256 fix playing mooq sounds and move sounds to Sound.ocg 2016-03-06 10:37:29 +01:00
Clonkonaut 5801a2f133 Mooq: Applied Script Guidelines. 2016-03-05 19:02:27 +01:00
jok21 0f1b9c0891 Mooq Particle Change 2016-03-05 19:02:26 +01:00
jok21 a89ee8e51b MooqSounds 2016-03-05 19:02:25 +01:00
jok21 4c4a590ac8 Mooq 2016-03-05 19:02:23 +01:00
Maikel de Vries 9b39f2b18c fix ShuffleArray 
When taking a random element from the copy, also consider the last element.
 2016-03-05 17:27:20 +01:00
Maikel de Vries 1862161708 eject structure contents on destruction 2016-03-05 16:40:33 +01:00
David Dormagen 4465236d1b interaction menu: added contents count to "Inventory" (#1697) 
..I am open to discuss the exact design of this.
 2016-03-04 08:18:20 +01:00
David Dormagen c6dd261d05 Surrounding helper: added ContentsCount overload 
..which is a pre-requisite to showing the current / max. contents count in the interaction menu.
 2016-03-03 10:46:11 +01:00
Nicolas Hake fe91cec2b7 Merge remote-tracking branch 'github/pull/14' 2016-02-29 14:05:45 +01:00
Sven Eberhardt 65d6dd76a3 Meltign Castle: Fix item spawn after 4 minutes; add restart rule. 2016-02-21 17:36:29 -05:00
Sven Eberhardt 5963b9aed3 ItemSpawn: Add reset function to enable re-collection of item. 2016-02-21 16:56:19 -05:00
Sven Eberhardt e87ad1ecc1 MeltingCastle: Rebalance for slightly less rushing. 2016-02-21 16:31:20 -05:00
Lukas Werling 9f69c650d6 Use icons for all controller buttons 
The icons currently only show Xbox 360 controller labeling. The icon set
also includes icons for PlayStation controllers, so we could extend this
in the future.
 2016-02-21 18:27:02 +01:00
Lukas Werling aa42d1deb7 Make controller button strings nicer 
This also removes the controller id from the control definitions,
instead defaulting to 0. This doesn't change anything for now as we only
had definitions for controller 0 anyways.
 2016-02-21 18:27:01 +01:00
Lukas Werling 8dd1450e94 Implement "gamepad stick moved" events for analog input 
Analog moved events are only sent once per control frame.
 2016-02-21 18:26:18 +01:00
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
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
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
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
Sven Eberhardt a69958554f Melting Castle: Add IceWallKit spawn 
To promote more waling attacks and walling defenses.
 2016-02-13 10:43:42 -05: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