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

4553 Commits (c4fa92a6d2d36ef547a28270d874820b64ae6be4)

Author SHA1 Message Date
Maikel de Vries c4fa92a6d2 Aerobatics: use jet streams, fix item spawn and restart rule 2016-01-24 18:18:12 +01:00
Maikel de Vries ab9330180f add an object for jet stream control (fast winds) 2016-01-24 18:17:10 +01:00
Maikel de Vries e5a9dd934f add option to respawn rule to keep contents 2016-01-24 18:05:06 +01:00
Sven Eberhardt d9b8de9ea2 Win32: Fix file deletion from scenario selection dialogue 2016-01-24 00:43:09 -05:00
Sven Eberhardt 28e794654c Add network option to disable UPnP. 
Also add some more UPnP failure messages to log.
 2016-01-24 00:11:14 -05:00
Sven Eberhardt f2e99ced16 HotIce: Reduce Fire arrow stack count in chests 
Fire arrows were dominating the game too much. This should put more emphasize on the other weapons.
 2016-01-23 23:27:08 -05:00
Sven Eberhardt 79e26a3f64 HotIce: Fix division by zero when starting with one player. 2016-01-23 23:25:48 -05:00
Sven Eberhardt 7b7b791442 Add [Game] Mode to parkour and arena scenarios to fix league evaluation. 2016-01-23 21:26:13 -05:00
Maikel de Vries 6a3eaa2716 Aerobatics: new game mode and small improvements 2016-01-24 00:20:04 +01:00
Maikel de Vries 93c20b19a0 improve parkour scoreboard column descriptions 2016-01-23 18:24:30 +01:00
Maikel de Vries d7d2f8f39f fix showing description in the playground item spawn menu 2016-01-23 16:42:37 +01:00
Maikel de Vries 84218d1cbc merge UsageHelp into Description 
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
 2016-01-23 16:28:02 +01:00
Maikel de Vries 7d46ab9f26 add new parkour aerobatics (sky race) (#1550) 2016-01-23 14:46:33 +01:00
Nicolas Hake 4b68d82380 planet: Remove Array(Min,Max) in favor of Min,Max 
Since the native functions now accept array parameters, we don't need a
C4Script implementation anymore.
 2016-01-23 13:49:11 +01:00
Maikel de Vries a32cfc2072 Parkour goal: methods to get the number of checkpoints a player completed 2016-01-22 20:55:06 +01:00
Maikel de Vries cfe8008f32 Array.c: add functions to get minimum and maximum of an array (with ints) 2016-01-22 20:54:18 +01:00
Maikel de Vries 5b04eef7f2 fix handling of parkour respawn for removed players 2016-01-22 00:43:33 +01:00
Maikel de Vries 70f74626b9 add option to transfer contents on parkour relaunch 2016-01-22 00:14:59 +01:00
Maikel de Vries 686b37660d fix script errors for wrong parameter types in tele glove 2016-01-22 00:14:59 +01:00
Sven Eberhardt b3c0afd521 Add missing string table entries for CON_FallThrough(_Desc). 2016-01-20 21:35:37 -05:00
Sven Eberhardt 2ce3daf84a Add missing sound for snapping line #1644 
Sound original from CosmicEmbers (http://freesound.org/people/CosmicEmbers/sounds/161650/); cropped and pitch adjusted.
 2016-01-20 21:24:05 -05:00
Maikel de Vries 8cabf67845 clean up tests: remove Teams.txt fix some titles 2016-01-20 19:44:28 +01:00
Maikel de Vries db9e3aa133 remove grapple bow test 
Seems to be outdated and can be tested in rope test
 2016-01-20 19:30:33 +01:00
Maikel de Vries ac122e4aa3 remove pump test scenario 
Does not do anything and the pump is sufficiently tested in the power test.
 2016-01-20 19:23:12 +01:00
Clonkonaut 7538a5bd12 Added simple testing scenario for permeable solid masks. 
In there, it's also activated for basements and bridges.
 2016-01-20 19:17:45 +01:00
Julius Michaelis 711df05e1a Add button X to fade through half solidmasks. 
Enabled on the elevator case for testing.
 2016-01-20 18:58:11 +01:00
Maikel de Vries d9dccd01ad fix construction previewer showing green in front of existing sites 2016-01-20 16:32:05 +01:00
Maikel de Vries d500218a02 fix shape of basement construction preview and site (#1586) 2016-01-20 15:40:19 +01:00
Maikel de Vries 4114738b45 add power information to interaction menu for flagpole (#1579) 2016-01-20 13:21:02 +01:00
Maikel de Vries d23328f2c7 power library: methods to for storage information and balance updates 2016-01-20 13:19:37 +01:00
Maikel de Vries 775746d78d fix power system tests (due to object changes) 2016-01-20 12:07:46 +01:00
David Dormagen 5f25baa058 producers: show progress of current product (#1549) 
This is solved via another entry in the production menu (below the products), which is updated by an effect, that is being told the menu ID/target by the interaction menu through a callback.
This setup allows for very intrusive changes to the interaction menu with only few lines of code!
 2016-01-20 10:36:50 +01:00
Matthias Rottländer 3810937867 Merge branch 'master' of ssh://git.openclonk.org/openclonk 2016-01-20 00:25:00 +01:00
Matthias Rottländer 7be85cf9d4 + modified rock_smooth to fit other textures a little bit better 2016-01-20 00:23:36 +01:00
David Dormagen a7b674f662 tutorial guide: use full width for text when not showing buttons (related to #1612) 
A little rant about why I 'hardcoded' the value 2.9em:
If you are using constants to specify some positions, please give the meaningful names so that other people can work with them. E.g. calling something "menu_height" and then using it to adjust the X position AND the Y position of a BUTTON probably means it's not the "menu_height"...
I believe that the current "dynamic layout" will terribly break if someone would e.g. decide that the menu should be one line higher (because hey, then everything else would also move).

The real solution is to rewrite the layout of the menu to be dynamic and use constants (because currently it isn't and doesn't, it just tries to.).
 2016-01-19 20:39:39 +01:00
Maikel de Vries 91e7da6fbd update license of Sky.jpg in Clonkomotive to cc-by 3.0 2016-01-19 19:11:13 +01:00
Clonkonaut ce7d8014ec Clonkomotive: German translation (#1632). 
I also took the liberty of renaming "HeavyCrumb" to "Boulder". I have never heard the word 'crumb' used in this context.
 2016-01-19 18:17:03 +01:00
Sven Eberhardt 29f439a508 Fight for Gidl: Fix script error on statue death #1610 2016-01-18 23:49:38 -05:00
Sven Eberhardt d9f1c90b47 TreasureHunt: Some map simplification and adjustments for ShapeMaps. More torches, food and weapons. Pyrit skin fix #1296 2016-01-18 23:45:21 -05:00
David Dormagen cd57e47493 script GUIs: fixed text clipping and scrolling (#1605, related to #1612) 
Previously, text windows would just change their own size and leave cropping and scrolling to their parent. This made the code easier, but was apparently unintuitive for scripters.
Now text windows do not change their size but show a scrollbar themselves (unless GUI_FitChildren or GUI_NoCrop of course).

This implied some other changes, because now parents without a scroll bar need to clip, too. (Or the clipping needs to be moved to the child window. But then it would have to be made sure that menu decoration can still go out of the bounds.)
And this also needed some script fixes where scripters assumed the text windows would not scroll (and thus made them smaller than 1em).

related to https://git.openclonk.org/openclonk.git/commit/46ad28ea652fad34814a866f3b9c305aa7cc6faa
 2016-01-18 21:39:54 +01:00
Sven Eberhardt e6a153f5d5 DeepSeaMining: Fix construction plans for players joining during intro 2016-01-17 23:36:19 -05:00
Sven Eberhardt 38dad0dd9d Prevent jump action during crew creation to avoid command failure sounds in intro sequences with contained clonks. 2016-01-17 23:01:57 -05:00
Sven Eberhardt 2c834e6993 DeepSeaMining: Clonks tumble in intro when falling from sky after section change 2016-01-17 22:38:50 -05:00
Sven Eberhardt 62dd3aafd6 Activate wealth display in scenarios with Rule_BuyAtFlagpole. 
Most missions with home base were missing the display.
 2016-01-17 22:28:57 -05:00
Sven Eberhardt eb333bd8db Fix extra slot object check in object interaction menu 2016-01-17 22:15:23 -05:00
Sven Eberhardt f6583ee754 Fix nil pointer in interaction menu when object transfer removes target container. 2016-01-17 22:09:27 -05:00
Sven Eberhardt af5d9903bd Fix Pyrit falling out of plane in some mission sequences. 2016-01-17 22:01:03 -05:00
Tobias Zwick 240815bc7c correct Philipp Kern's name in the credit screen 2016-01-17 23:10:35 +01:00
Armin Burgmeier aef7538aa1 Switch shader code to OpenGL 3 style 2016-01-17 11:37:17 -08:00
Armin Burgmeier bc8db0589e Make the mesh material properties uniform variables 
Instead of relying on the obsolete glMaterial call.
 2016-01-17 11:37:17 -08:00