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

547 Commits (3b0891ba89f7a75f832032036a6aefa2573e325d)

Author SHA1 Message Date
Armin Burgmeier e4ad7ddc2d Rename Anim_RDir to Anim_AbsRDir 2014-10-09 17:07:52 -04:00
Armin Burgmeier 9fb0cdbdef Add a min_rdir parameter to Anim_RDir 2014-10-09 17:05:24 -04:00
Armin Burgmeier cbdc6040e7 Add the Anim_Dist AVP 2014-10-09 17:00:26 -04:00
Sven Eberhardt ca64fad8b5 Fix lobby team distribution settings hotkeys (#1133) 2014-10-09 20:40:01 +02:00
Nicolas Hake 67c0deae38 Remove leading + from IDS_MSG_AUTOFRAMESKIP DE translation (Github #2) 2014-10-06 16:03:11 +02:00
Sven Eberhardt 3fb86e9ea9 Fix null pointer exception when objects are removed in response to a hit callback. 2014-10-03 21:57:38 +02:00
David Dormagen 952f06b173 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
 2014-09-29 11:47:09 +02:00
Sven Eberhardt b899e8944c Base variable naming in scenario saving on saved object count of same type name instead of object number. 
This should yield shorter, more predictable names reducing changeset size when an Objects.c file is updated.
 2014-09-22 19:21:25 +02:00
Sven Eberhardt 4d36f3a2d2 Some missions fixes/adjustments 
* Plane with same color in all missions
* Sequence multiplayer fix
* Heavy smoke is a particle parameter
* Goal graphics fix
* Fix rocky pick direction after dialogue initiation from left
* Dialogue supports sections
* Hat moved to decoration for other missions
 2014-09-21 16:36:05 +02:00
Maikel de Vries 03c88c34a3 removed WebCode from league string 2014-09-19 20:55:11 +02:00
Sven Eberhardt 6569a47e37 Change MessageWindow (i.e. the default goal messages) to use decorated messages instead of menus. 
Currently, it opens a small window in the bottom right corner which blocks all player control and is not intuitive how to close. Now it's a message that will automatically disappear after a while (If the player hasn't finished reading, he can just click the goal icon again).
 2014-08-21 19:55:32 +02:00
Sven Eberhardt cbb321307f Scenario saving fixes: Layers, fishes, sproutberries. 
Do not save sprout berries that are still attached to sprouts. Omit some unnecessary properties for fishes.
 2014-08-14 17:18:26 +02:00
David Dormagen 5722339e83 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/gui/C4Gui.h
	src/gui/C4GuiDialogs.cpp
	src/gui/C4GuiWindow.cpp
 2014-08-13 11:52:41 +02:00
Sven Eberhardt b1db0c7918 (Re)implement text completion in dialogue text windows as an async control. Default to Space, i.e. MenuOK. 2014-08-10 20:58:26 +02:00
Sven Eberhardt 834566cf5e Make smoke a bit smaller. 
It somehow got really large and weird since the particle changes.

It could still get some polishing, but at least it's a bit less annoying now.
 2014-07-21 17:28:11 +02:00
Sven Eberhardt 5cd9b915b0 Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics. 
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
 2014-07-05 15:25:30 +02:00
David Dormagen 6217a84f0b added GetSurfaceVector() to Math.c which can be used to get informations about the surface of the landscape at some point (f.e. for bouncing projectiles) 2014-06-27 20:46:48 +02:00
David Dormagen fb1ee2f88f the Trans_* mesh-transformation-functions are now implemented in the Engine instead of System.ocg 2014-06-27 20:36:47 +02:00
Maikel de Vries 7737759ffb fix ShuffleArray() function 2014-05-19 20:20:20 +02:00
Sven Eberhardt 91c2d49d2a Remember league login name and password token. 
Also removed some CUID/Webcode authentification code from engine.
 2014-05-18 15:10:00 +02:00
Sven Eberhardt 45f69abb6e Revert engine-side league localization 
The engine cannot know about all future league strings. Instead, localize server-side using language id from http request.
 2014-04-27 15:42:47 +02:00
Sven Eberhardt 50a5862b7a Store modified mesh material assignments in saved scenarios. 2014-04-18 14:20:10 +02:00
Maikel de Vries c70c44387f Fix some DoDamage issues 
Fire.c use correct number of parameters
Axe.c implemented FX_Call_DmgChop according to documentation
 2014-04-06 17:15:13 +02:00
Julius Michaelis e5b7ef5b80 AutoFrameSkip: Graphics option to reduce lag by slow 
Skips drawing every second frame if drawing the previous frame was too slow
Setting is controlled by game host
Default: on

Imported from Clonk Rage

From e6e680f49ac50a352e9a051ee21622e7f00648b6 Mon Sep 17 00:00:00 2001
From: sven2 <sven2@786b8e90-9c09-0410-89a9-bccc6ef1e79b>
Date: Sat, 21 Sep 2013 21:34:44 +0000
Subject: [PATCH] + AutoFrameSkip: Graphics option to reduce lag by slow
 clients in network games

git-svn-id: https://www.clonk.de:83/svn/clonk/stable@14501 786b8e90-9c09-0410-89a9-bccc6ef1e79b
 2014-04-03 14:53:12 +02:00
David Dormagen 5c17b48bc2 Merge branch 'master' into Controls 2014-03-26 23:58:24 +01:00
Julius Michaelis c49bc99efe Options/Graphics: tidy up 
Remove Config.Graphics.ShowAllResolutions
 2014-03-17 22:29:39 +01:00
Nicolas Hake 01d5507c22 lang/de: Don't use 'ü' as accelerator 
Taking over a player had the 'ü' key assigned as accelerator. Since that
doesn't work anyway, switch to a more conservative 'n'.
 2014-03-11 00:30:34 +01:00
Nicolas Hake 7a65ebade8 Warn on unsupported accelerator keys 
Chars outside the basic latin alphabet don't actually work as
accelerator keys. Emit a warning when encountering them.
 2014-03-11 00:26:13 +01:00
David Dormagen 537846d76d menus: fixed two possible null-reference errors 2014-02-28 22:39:14 +01:00
David Dormagen 0da9293686 allow Clonk::SetMenu to also take a custom GUI ID; cleaned up some menu-related mess (like not handling unclosable menus correctly) 2014-02-26 12:03:27 +01:00
David Dormagen 4346da8e4e custom GUIs: replace position properties X/Y/Wdt/Hgt with Left/Right/Top/Bottom that take strings instead of arrays, also change absolute unit from pixels to em 
Before you'd define the X coordinate of the top-left corner of a window with X = [500, -40], now you do Left = "50%-4em". The em values currently do not scale with font-size yet, but it is important to do the formal change as early as possible to not have to do all work twice. Scaling of font and thus menus can be implemented later.
 2014-02-17 15:46:36 +01:00
David Dormagen fa4638d6c0 custom GUIs: change order of arguments of GuiAction_SetTag from (target, id, tag) to (tag, id, target) 2014-02-16 17:18:34 +01:00
Tobias Zwick 3a8c8d7c3b selecting the clonks via hotkey was all backwards (#1031) 
e.g. pressing ctrl+3 selected 1st clonk if there are 3 in the crew
 2014-02-16 13:15:07 +07:00
David Dormagen a0a76c051d custom GUI: removed "CreateCustomMenu" which was only a wrapper for "CreateObject" - use "CreateObject" now 
This should reduce the confusion about why the function behaves so differently from Gui_Open: the style objects only provide an interface for those easy GUIs, they are not really part of the GUI system.
 2014-02-15 18:59:33 +01:00
David Dormagen 06ac00ace8 Merge branch 'master' into Controls 
Conflicts:
	CMakeLists.txt
	Makefile.am
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	src/control/C4Control.cpp
	src/control/C4Control.h
	src/gamescript/C4GameScript.cpp
 2014-02-15 14:44:57 +01:00
David Dormagen a91d62f36a renamed Menus.c to CustomGUIs.c to be consistent with the other (already renamed) parts 2014-02-15 14:40:10 +01:00
Tobias Zwick e1cff59418 fix statistics in player selection dialogues ignore linebreaks (#1027) 
I was unable to find the original commit that might have caused this, so I passed the constructor of the TextWindow an extra parameter to treat "|" as linebreaks and changed the translation files.
 2014-02-03 01:11:05 +07:00
Tobias Zwick 1e359bddf9 fix typo in english translation 2014-02-01 19:51:42 +07:00
David Dormagen 425a221aff adjusted some particles (f.e. smoke slightly brighter, foundry more subtle) 
see http://forum.openclonk.org/topic_show.pl?pid=25749#pid25749 for further information
 2014-01-25 15:51:05 +01:00
Sven Eberhardt 55083802b5 Updated SaveScenarioValueToString to recurse into arrays and allow custom save names for defs/proplists 2014-01-22 20:28:41 +01:00
Sven Eberhardt 21c132d2cb Fix StaticSaveVar saving to save string, not object pointer. 2013-12-30 12:24:41 +01:00
Sven Eberhardt 0db19586c8 Save StaticSaveVar as property in Objects.c 
Otherwise, you'd have to re-set it every time you edit objects files in the editor.
 2013-12-30 03:09:13 +01:00
Sven Eberhardt 49b2c75475 Added helper function Particles_Colored - creates a colored version of a base particle. 2013-12-29 15:08:52 +01:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
Tobias Zwick ac4ac04558 Merge branch 'master' of ssh://git.openclonk.org/openclonk 2013-12-18 12:48:14 +07:00
Tobias Zwick db6a31cc7a add localized error for each player that could not be loaded (#693) 2013-12-18 12:47:08 +07:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
Tobias Zwick 666a51b3d9 update documentation around DefCore, remove some obsolete fields 2013-11-30 14:14:18 +07:00
David Dormagen 54fdb2cec1 updated some remainers of the old particle system to use the new one 2013-11-28 23:38:26 +01:00
David Dormagen 0b346d67ff made pretty fireworks (with new particle system) 2013-11-28 23:28:33 +01:00
David Dormagen 6844cbbc71 changed DrawParticleLine to use the new particle system 2013-11-28 23:27:56 +01:00
David Dormagen defe1f7525 updated Grass particle and usages to new particle system 2013-11-28 23:25:30 +01:00
David Dormagen ee4b5832e2 added Smoke() function that uses the new particle system 2013-11-26 21:25:06 +01:00
David Dormagen f032dea85e adapted smoke-trail-effect to use the new particle system 2013-11-26 21:25:04 +01:00
David Dormagen 0aeb38f137 adapted MuzzleFlash particle and usages to new particle system 2013-11-26 21:25:04 +01:00
David Dormagen 241ea62d0f added new explosion effect based on Matthi's explosion with the new particle system 2013-11-26 21:25:03 +01:00
David Dormagen 1a7cd51bab changed Boompack to use the new particle system 2013-11-26 21:25:03 +01:00
David Dormagen 913f746ffe adjusted WoodChip particle and usages to new particle system and moved WoodChip particle to proper place (not only used by the axe..) 2013-11-26 21:25:00 +01:00
David Dormagen 40b84704fe adapted Trajectory particle and occurences to new particle system 2013-11-26 21:24:59 +01:00
David Dormagen ced4734035 removed the MaterialParticle and added missing Particles.c to System.ocg 2013-11-26 21:24:58 +01:00
Tobias Zwick 6b164fba97 add localization for communication with the league 2013-11-06 15:08:39 +07:00
Tobias Zwick 8da7c6b20f add internationalization for responses from the masterserver/league server 2013-11-06 13:35:27 +07:00
Maikel de Vries 994f45f521 Fix a runtime error in DarkCastle 2013-10-25 17:32:53 +02:00
Maikel de Vries b2ac11c326 Fixed Loc_Wall behavior in FindLocation.c 2013-10-04 20:58:47 +02:00
Maikel de Vries be354a99d2 Fix FindLocation for Find_Not and others acting on Find_InRect 2013-09-30 20:35:57 +02:00
Julius Michaelis b67109df8a Add /screenshot [zoom] to /help 2013-09-21 01:08:12 +02:00
Nicolas Hake 625a9f47d9 #973: Make FindObject et al. handle object context instead of Find_* 
When people write obj->FindObject(Find_Distance(10)), they expect the
engine to use the distance from obj instead of the distance from the
current object (or from 0,0 if called from outside of object context).

Making the engine handle coordinate offseting at calls to FindObject
(and similar functions) instead of having the C4FO wrappers do it solves
this problem.

Compatibility impact: Code that creates their own criteria structure
instead of using the provided Find_* functions will have to be adapted
if they use any of the location-based criteria.
 2013-09-01 00:46:04 +02:00
Tobias Zwick 9027544c37 Merge branch 'master' into Controls 2013-06-04 20:13:35 +02:00
Tobias Zwick 131ec86b98 refactor pump done. Remaining problem: power system (usage) 2013-05-30 22:11:39 +02:00
David Dormagen 7eaef70af1 Merge branch 'master' into Controls 
Conflicts:
	planet/System.ocg/PlayerControls.txt
 2013-05-26 18:19:51 +02:00
David Dormagen 0c23d1b9a6 reimplemented the action bar to use the custom GUIs 
action bar now only shows shortly after hitting Interact
 2013-05-26 14:59:19 +02:00
Tobias Zwick fe5a29b198 throw out DVORAK keyboard layout (controls are keyboard layout independent now) 2013-05-25 14:41:58 +02:00
David Dormagen 6681a2cd7d Throwing on right-click, alt-use (temporarily) on Shift+Left 2013-05-24 23:26:00 +02:00
David Dormagen cf4f85f9cf Merge branch 'master' into Controls 2013-05-24 21:31:29 +02:00
David Dormagen ae0a364587 Musket shots now exit at the correct position 
Launch() of the bullet now has offset parameters
LaunchProjectile() now only calculates own offset if none was passed to the function
 2013-05-24 20:45:32 +02:00
David Dormagen 04c8ad1cac removed CON_Collect (now collects only into empty slots) 
fixed inventory shifting
 2013-05-24 20:09:19 +02:00
Clonkonaut a61d4b4aa1 crlf -> lf 2013-05-24 19:16:49 +02:00
David Dormagen d18d8c65c9 Merge branch 'Menus' into Controls 2013-05-24 01:24:57 +02:00
David Dormagen 6c861f9165 removed the hold-number-and-click-mouse controls 2013-05-24 00:00:18 +02:00
David Dormagen c1d27bc3e9 mouse-wheel now scrolls through inventory (zoom is on shift+mouse-wheel) 2013-05-23 22:46:23 +02:00
David Dormagen 20bfab48b6 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c
 2013-05-23 17:53:41 +02:00
David Dormagen 337126fcb9 renamed MenuWindow to GuiWindow 
added HP-Bar-test to MenuTest.ocs
bugfix
 2013-05-09 13:28:45 +02:00
David Dormagen 9ad9a67939 Merge branch 'master' into Menus 
Conflicts:
	src/script/C4StringTable.cpp
	src/script/C4StringTable.h
 2013-04-07 23:02:36 +02:00
David Dormagen 1c05f22d41 added OnClose callback 
more tests
minor fixes
 2013-04-07 22:52:45 +02:00
David Dormagen c2ba7e65d7 improved menu functionality; added test scenario and helper objects 2013-04-04 18:36:27 +02:00
Sven Eberhardt 46a4db0409 Added callback Extinguishing (analogous to Incineration) when fire is extinguished on an object. 2013-03-27 21:33:33 +01:00
Sven Eberhardt aeeedcd770 Fix script errors in scenarios that don't load Objects.ocd 2013-03-19 19:27:19 +01:00
Sven Eberhardt 31b87ef814 Optimize global func Sign. New version is between 10% and 50% faster! 2013-02-09 01:56:06 +01:00
Sven Eberhardt 6669e965a2 Fix Loc_Material without texture parameter 2013-02-05 00:35:04 +01:00
David Dormagen 34fc771911 merged master into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
 2013-01-30 21:37:31 +01:00
David Dormagen e6487533c2 added first version of object information dialogue on right-click 2013-01-30 21:27:09 +01:00
Günther Brammer a62e556b63 Script: Reimplement GameCall in C4Script 2013-01-23 21:36:21 +01:00
David Dormagen 8970913fc7 added System.ocg/EnergyBar.c which provides AddEnergyBar() to show an energy bar over any object, adjusted Tutorial04 to use that 2013-01-22 18:44:29 +01:00
David Dormagen 38bdfd296d FindLocation: added parameters, improved documentation, now uses Par(i) 2013-01-14 10:41:10 +01:00
Nicolas Hake 016f626cbe planet: Normalize line endings 2013-01-13 19:00:12 +01:00
Tobias Zwick 28e2bdbb92 fix #724: revers the order in which GetCrew(plr,index) returns the crew 2013-01-13 15:45:51 +01:00
David Dormagen 7ba10ca3cf added IsPointInRectangle(point, rectangle) to System.ocg/Math.c 2013-01-12 18:15:51 +01:00
David Dormagen 1cd7ffec6a added a FindLocation function in System.ocg/FindLocation.c 2013-01-12 18:15:50 +01:00
Sven Eberhardt 58ea47a4fd Added support for function pointers to ScheduleCall/AddTimer/ClearScheduleCall/RemoveTimer 2013-01-02 00:50:01 +01:00
David Dormagen 6ba993bc37 fixed/adjusted ShiftContents for objects that use Library_Inventory 2012-12-29 18:42:56 +01:00
David Dormagen 299cc7e478 when not able to execute an Use-command (f.e. shield when not walking), the command is remembered and executed when possible 2012-12-29 18:42:19 +01:00
David Dormagen 80ac9a9503 more one-hand cleanups 2012-12-29 14:08:53 +01:00
David Dormagen bc4fd5f9ed merged master into Controls 2012-12-23 15:17:23 +01:00
David Dormagen 4dcc784d35 do not pass controls to disabled cursor anymore (i.e. via SetCrewEnabled) 2012-12-22 17:11:06 +01:00
Charles Spurrill 6ea36b5efb GetObjAlpha function added, to be consistent with SetObjAlpha 2012-11-11 12:43:20 -08:00
Charles Spurrill 9f867db1dc added global functions FadeOut(int time, bool del) and FadeIn(int time) 2012-11-11 11:44:03 -08:00
Bernhard Bonigl 1011c858cc Introduce QuickSwitch on Q (or Apostrophe for Dvorak) 
QuickSwitch changes the current selection of the Inventory to the last selected one.
 2012-10-07 15:44:01 +02:00
Tobias Zwick 28e30294b1 adapted some strings for open clonk 2012-10-05 00:09:33 +02:00
Tobias Zwick b5d0af513a remove splash video and option for it 2012-10-02 23:02:52 +02:00
Julius Michaelis 023aa90c0e Add config option for automatic windowed/fullscreen switching 2012-09-29 23:49:30 +02:00
Günther Brammer cc25878ba6 Default to not changing the resolution 
1. We receive bugreports that changing the resolution doesn't work, but
can't reproduce that
2. Flat screens look best at their natural resolution
 2012-08-19 20:59:01 +02:00
Nicolas Hake faf0006a6f Win32: Improve error reporting when changing resolution 2012-08-28 00:00:29 +02:00
David Dormagen 70bdc02ad4 burning objects do not incinerate in or into containers anymore; adjusted fire spreading a bit 2012-10-24 00:42:05 +02:00
Russell 5782557a34 Clonk. Now with 65% better grammar. 2012-10-22 18:35:06 +01:00
Maikel de Vries c6dfd21172 Fixed a few C4Script runtime errors 2012-10-22 20:24:57 +02:00
Tobias Zwick eb1d2e6e18 remove description from goal in the game over dialog 2012-10-20 18:07:43 +02:00
Armin Burgmeier b4aafdd874 Remove build number aka C4XVER4 2012-10-18 23:54:50 +02:00
David Dormagen 2631e05daa added burned graphics for the Coniferous 2012-10-14 21:51:21 +02:00
Julius Michaelis 8d2c6ca599 Fix language strings for IDS_MSG_FULLSCREEN_DESC 2012-10-14 19:13:02 +02:00
Felix Wagner b71efe70b3 Moved FindHeight to System.ocg/Math.c 2012-10-14 15:45:20 +02:00
Tobias Zwick 63fcec3e8c fix controls: interact + down = ungrab doesn't work as intended: 
confusing situations can arise, e.g. while shoving a tree, one can use the foundry
 2012-10-14 13:26:30 +02:00
Tobias Zwick 2a228b11ed remove non-existing control def 2012-10-14 01:20:52 +02:00
Tobias Zwick c51ffb5a26 fix descriptions in control dialog 2012-10-14 01:04:49 +02:00
Maikel de Vries 3be05409de Change the forest creation in GoldRush a bit 2012-10-13 18:57:02 +02:00
Tobias Zwick 48a7fc7968 make highres landscape default 2012-10-13 18:41:25 +02:00
Armin Burgmeier cf159068b3 Fix warning about undefined backspace key on Linux 2012-10-13 16:15:01 +02:00
Tobias Zwick 8c5005bef9 I hate Mercurial 2012-10-10 23:47:30 +02:00
Tobias Zwick d46840c90f player controls cleaned up + localization 2012-10-10 23:33:51 +02:00
Bernhard Bonigl 9a91a4dfca Reduce Collect-Priority by 1. This fixes collecting when jumping. 2012-10-10 16:38:33 +02:00
Sven Eberhardt 08b495e43d PlayerControls: When the user changes a key assignment in his local config, all derived key assignments (Key=CON_*) change as well (#807). 
The "CON_" prefix is now mandatory when referencing other key assignments. Updated PlayerControls.txt to reflect that.
 2012-10-08 20:45:04 +02:00
Tobias Zwick ba1a2cbdad add missing strings for localisation of controls definition dialogue 2012-10-07 18:45:50 +02:00
Tobias Zwick f296f31c62 add script that automatically removes unused strings from LanguageXX.txt in the System.ocg and executed it once 2012-10-07 15:27:30 +02:00
Charles Spurrill e019cd5655 Added missing 'MoveTowards' function in Math.c and upgraded LaunchProjectile func 2012-08-09 17:37:53 -07:00
Günther Brammer 35a0d7b6cd Script: Get/SetGravity use 1/100 px/tick^2 instead of 1/500 
The old factor was chosen because the default gravity * 500 was exactly
100. But a lot of other engine interfaces use 1/100 px/tick or px/tick^2,
and that is a common scale for scripts to work in, too.
 2012-07-15 22:42:17 +02:00
David Dormagen fb7151db7d added RemoveTimer() function as counterpart to AddTimer() 2012-06-24 20:37:28 +02:00
Felix Wagner d4fa3e10f3 Added settings parameter to plants' default Place() 2012-06-07 18:29:00 +01:00
Felix Wagner 0e5f0b28f2 + PlaceForest() 2012-06-07 01:45:49 +01:00
David Dormagen 80d94966bc added better documentation to some System.ocg functions 2012-06-05 22:51:09 +02:00
David Dormagen 15e29fcfd8 added very simple framework for the creation of purely visual environment objects + not-implemented-zicadas 2012-06-05 22:31:58 +02:00
Maikel de Vries c4bb9e6999 Stop fire sound if object stopped burning (real fix) 2012-05-12 14:42:20 +02:00
Maikel de Vries 797837712b Stop fire sound if object stopped burning 2012-05-12 14:07:55 +02:00
Felix Wagner 63be80a1f8 + Fire sound 2012-05-11 18:32:21 +01:00
Felix Wagner f07359e4b1 Fixed ClearScheduleCall (causing #770) 2012-05-11 16:31:47 +01:00
Bernhard Bonigl a5adc8c2ad Added missing CON_PushENter to IsInteractionControl 2012-05-08 20:42:08 +02:00
Bernhard Bonigl 3893fea82f Added Helper-Functions that categorize Controls 2012-05-07 20:34:28 +02:00
Günther Brammer 099cd15e56 Script: Remove unused OnBlastIncinerationDamage callback 
Scenarios that want to override the default behaviour of BlastObject should
overload the BlastObject function itself. Objects can simply use the Damage
callback and/or set BlastIncinerate to nil.
 2012-05-06 15:37:43 +02:00
Bernhard Bonigl c87d5d4435 Fixed incorrect GetPosition parameters 2012-05-06 18:10:36 +02:00
Bernhard Bonigl dce8e579d3 Added InFrontOf(object). Returns if the midpoint of the calling object is in front of the other object. 2012-05-06 18:10:16 +02:00
Maikel de Vries 6fcc0f6d2e Removed TimerCall in favour of AddTimer script implementation 2012-05-05 12:09:44 +02:00
Maikel de Vries 90ee070f33 Cleaned up Fire.c a bit 2012-05-01 20:50:21 +02:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Maikel de Vries 8188793d67 Implemented Sign function (Math.c) 2012-04-28 09:32:42 +02:00
Maikel de Vries b36e10b8dc Barrel spray extinguishes burning objects 2012-04-23 22:48:41 +02:00
Maikel de Vries 45905c013d Prevent dead corpses from burning 
Eternal fires appear for C4D_Living && !GetAlive() && NoBurnDecay.
 2012-04-22 15:15:04 +02:00
Maikel de Vries 3768206cc6 Contact incineration in Fire effect takes into account containers and layers 
This was already in the engine before(at least the containers), and makes much more sense.
However, it's useful to think about how ClosedContainers and Extinguish should work.
 2012-04-22 13:08:54 +02:00
Armin Burgmeier 90dc9abbcd Add Anim_R as a AVP for mesh animations 2012-04-22 00:22:05 +02:00
Bernhard Bonigl 4c38caaf27 Merged default into Controls 2012-04-17 17:37:52 +02:00
Bernhard Bonigl 657782cfb6 Fixed Conifers changing rotation on 100 Con instead on construction 
StartGrowth now applies a random time-offset so trees don't grow simultanously.
 2012-04-17 14:06:40 +02:00
Maikel de Vries 16fa9cf341 Placement is now a property instead of DefCore value 2012-04-16 22:17:05 +02:00
Felix Wagner d973636cf8 + GetCalcDir() - returns -1 for DIR_Left, 1 for DIR_Right 2012-04-16 16:30:20 +01:00
Bernhard Bonigl 1dfc41042a Added helper function GetPosition 2012-04-15 16:14:29 +02:00
Bernhard Bonigl 219bceefcd Added Helper-Functions returning the left/right/top/bottom Edge of an object 2012-04-14 23:36:54 +02:00
Bernhard Bonigl 0d53a16a21 Backed out changeset: b48412700d66 2012-04-14 15:38:18 +02:00
Martin Plicht a4194c22e9 Replace 0 with nil wherever string/object/array is expected 2012-04-12 11:48:23 +02:00
David Dormagen fc0a9f1630 fire damage to living objects doubled 
incendiary material (lava) burns you twice as fast
 2012-04-10 23:28:41 +02:00
Julius Michaelis a07ef70acf Use array slice operator in Array.c 
There is no Easter egg hidden in this commit message :Þ
 2012-04-08 16:22:43 +02:00
Maikel de Vries 35f8d6a454 Removed Goal.c and reimplemented effect in Goal library 2012-04-03 20:21:49 +02:00
Maikel de Vries 7b8800356a Removed Precipitation from engine 
Will be implemented through clouds and definition calls.
 2012-04-01 23:03:52 +02:00
Felix Wagner caee67e9cd Function list for System.ocg 2012-04-03 03:00:18 +01:00
Felix Wagner bf795164f2 Resolved all warnings due to global function in included scripts. 2012-04-03 02:12:44 +01:00
Felix Wagner 6e303c4e2c Resorted the functions from C4.c, Commits.c amd Helpers.c 2012-04-03 01:55:55 +01:00
Benjamin Herr cdaee93c94 Rename all the drag/drop script callbacks to OnMouseDr* 
MouseDrag is already a property, and would overwrite the callback
functions. Renamed MouseDragDone and MouseDrop for consistency.
 2012-04-01 20:42:14 +02:00
Bernhard Bonigl cc4b1ce763 Cleaned up controls. Controls-Dialogue should be more usable now. 2012-04-01 19:27:42 +02:00
Maikel de Vries 2da24e0ca3 MenuOK is now on Return 
This was already in the comments and it makes much more sense, cause it interferes with interact (Space)
 2012-03-31 14:19:39 +02:00
David Dormagen 3788bada43 plants will now stop growing for ten seconds after taking damage 2012-03-24 16:18:55 +01:00
Bernhard Bonigl 25fec934d6 Removed all Hacks with Interaction. Enter/Exit also works now. 2012-03-22 20:26:06 +01:00
Bernhard Bonigl 03729bdbf1 Experimental: Added Interaction-Hotkeys on <> to . (the row below the home row). 
Made the Keys <> on German Keyboards an \| and ;: on US Keyboards usable
 2012-03-21 21:52:32 +01:00
Bernhard Bonigl 3a7bc44da8 Experimental: Added Alt+# for rigth hand 2012-03-21 18:13:34 +01:00
Martin Plicht e7878038c8 mac: Use standard localization facility for addon installation dialogs + put addons into preferred installation location (Library/Application Support) 2011-10-16 16:09:05 +02:00
Bernhard Bonigl 4c01b585d9 Removed dropping on Down+Mouse 2012-03-20 00:48:29 +01:00
Bernhard Bonigl 01c004b65b Merged Controls into default 2012-03-18 22:07:58 +01:00
Maikel de Vries 6e55dce1e5 Added Invincible and NonFlammable effects for NPCs, etc. 
Also applied that to Crash.ocs NPCs
 2012-03-18 13:16:25 +01:00
Bernhard Bonigl 80070b1b46 Merged default into Controls 2012-03-10 19:14:29 +01:00
Bernhard Bonigl 4c6b374dd7 Removed Interact = GrabNext. Use Actionbar-Hotkeys/Mouse for that. 
If something is grabbed, it'll always be ungrabbed by pressing Space now.
 2012-03-09 23:10:18 +01:00
Bernhard Bonigl 44ceefae9a Down+Space now Ungrabs if something is grabbed 2012-02-28 20:44:10 +01:00
Julius Michaelis cb6eb060cc Add a dialogue for windows which can be displayed when the graphics engine initialisation failed 
The dialogue has fields for resolution and a checkbox for fullscreen mode
 2012-02-28 18:28:16 +01:00
Bernhard Bonigl 6dddb26b8e Fixed InteractionHotkey not beeing prioritized 2012-02-28 14:30:32 +01:00
Bernhard Bonigl b8b4ee03f8 Changed Shift+Hotkey to Space+Hotkey for Interaction 
Space now interacts on release instead of press
Shift now works as a drop/throw modifier
Shift+Hotkey now drops that inventory slot
Non-Forced Throws/Drops (without Shift) now automatically select the next non-selected non-free Slot
 2012-02-27 16:24:34 +01:00
Bernhard Bonigl db53603396 Hotkeys select the item at release now 
Holding hotkey + left/right mouse button selects it into the corresponding hand
 2012-02-26 16:19:52 +01:00
Bernhard Bonigl a0e9ef1406 Fixed Actionbar-Hotkeys not working (Shift+(1-0)) 2012-02-26 14:26:23 +01:00
Bernhard Bonigl 5587ed0618 Backback and Hands share one Inventory now 
New Inventory Display at the left side
Inventory fades out if not locked
Inventory fades in if something changes, or mouse hovers there
Left/Right Mouse Click on an Inventory-Slot selects it for the corresponding hand
Icons to show which Slot is selected by left/right hand
Inventory can be reordered via Drag&Drop
Dragging an Item from a Slot onto the Landscape drops it
Changed Shift+Number to Ctrl+Number for selecting crew
Changed Number to Shift+Number for using Action-Bar
Changed Number to select inventory-slots now
 2012-02-26 01:48:58 +01:00
Bernhard Bonigl 2a5c129c93 Implemented MouseHover-Callback. 
Calls OnMouseOver(player, draggedObject) in Objects beeing hovered over.
Calls OnMouseOut(player, draggedObject) in Objects that stop beeing hovered over.
 2012-02-26 01:36:38 +01:00
Bernhard Bonigl 3c785cbee3 Added MovePosition(x,y,precision), which moves an object by x/y. 2012-02-26 01:34:56 +01:00
David Dormagen e0fa05418c added more array helper functions 2012-02-25 21:58:05 +01:00
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00:00
Maikel de Vries c68b5b2920 Menus: implemented closing when clicked in the landscape 2012-02-01 22:29:49 +01:00
Felix Wagner d468862159 Player options dialogue, let the player choose a clonk skin 2012-01-29 02:16:22 +00:00
Günther Brammer a667e0beb6 Remove duplicated functions from GetXVal.c 2012-01-25 00:36:52 +01:00
Felix Wagner 1cc5f78171 No more messages from burning objects 2012-01-11 02:03:09 +00:00
Maikel de Vries b2f723c4e1 Removed obsolete ShowNeededMaterial 
We want to get rid off the old menus(including MessageWindow), also fixed a stupid ctrl+v mistake
 2012-01-02 13:48:51 +01:00
David Dormagen 2c2cc44b15 GoldSeller library added (used by flag to autosell gold/valuables) 
Cash sound added
 2011-12-29 16:06:12 +01:00
David Dormagen 980f953da4 helper function IsAllied (counterpart to IsHostile, with NO_OWNER check) 2011-12-28 18:56:32 +01:00
Maikel de Vries 85cbefe808 Content menu can now handle the clonk's backpack 
Also did some cleanup
 2011-12-28 11:49:38 +01:00
Tobias Zwick 1f00badc57 fixed runtime errors in contents menu controller 2011-12-11 19:58:40 +01:00
Maikel de Vries f47749c771 Content menu: fixed d&d, added background image 2011-12-11 15:50:51 +01:00
Tobias Zwick 4645592fb6 implement d&d in contentsmenu 2011-12-08 23:04:36 +01:00
Tobias Zwick 34e9c3bc8b fixed more errors, put the array helper functions into the system.ocg 2011-12-08 20:50:00 +01:00
Tobias Zwick 682e59ac2d preliminary commit of content menus 2011-12-08 19:57:14 +01:00
Tobias Zwick e2d1eb2d9f new control: E for show/hide contents menus 2011-11-20 23:09:47 +01:00
Tobias Zwick e7ff632fd6 added method that returns stacked contents of an object 2011-11-20 20:26:14 +01:00
Sven Eberhardt c287c093cc PlayerControl: Mouse coordinate space (viewport vs landscape) is now a control property; not an assignment property. 
This is in preparation for proper custom control assignments
 2011-11-20 21:49:38 +01:00
Günther Brammer 3c41310fa3 Remove C4ConfigShareware to reduce OpenSSL dependency 2011-11-02 00:07:29 +01:00
Nicolas Hake 7c34fa9121 Replace RGB player color selection with an HSV chooser (#679) 2011-10-30 20:43:45 +01:00
Maikel de Vries 4f6ee17884 Objects: Weapons are armory products 
Also boolean functions should return booleans
 2011-10-14 00:03:55 +02:00
Felix Wagner 610940ceb8 Version corrected 2011-10-13 00:43:16 +01:00
Julius Michaelis 0f12b3485e Find sounds with all extensions instead of only wav, so Sound() does no longer require .ogg extensions 
Do not replace * with ? in sound name wildcards anymore, adjust scripts
 2011-10-12 23:09:22 +02:00
Felix Wagner 5258b47ce6 +StonyObjectHit, different sounds for soft/hard hit or just sliding 2011-10-08 17:12:19 +01:00
Charles Spurrill 238cb6a0c2 Added Iron Bomb (grenade). Modified Explode.c to allow custom exlosion sounds 2011-10-06 06:02:36 -07:00
Felix Wagner 67a9708720 + HasCNAT() in Commits.c, prevent endless loop in plant 2011-10-05 04:47:07 +01:00
Charles Spurrill 9f27a89912 SetVelocity can now set speed and/or angle of velocity vector 2011-09-30 22:28:01 -07:00
Günther Brammer 4bf663c792 Remove unused Landscape.NoSky from the Scenario.txt 2011-09-24 18:17:48 +02:00
Charles Spurrill 69369aa59e Blast sounds different under water (or any liquid) 2011-10-01 09:23:44 -07:00
Tobias Zwick 9d67bf366e docs: documented FatalError 2011-09-18 18:16:49 +02:00
David Dormagen a5e24c3b2f fix to GetTurnDirection() 2011-09-18 10:57:02 +02:00
Tobias Zwick 638bf42cb7 object-context security check for Explode(int level) 2011-09-12 22:30:34 +02:00
Tobias Zwick da10451031 chat: removed notice from RWD, /help is now correctly displayed in the chat 
+ sideeffect: if someone uses "|" in the chat, it will be interpreted as a newline by the irc chat client
 2011-09-10 21:05:21 +02:00
Julius Michaelis f389ee0781 Removed CheckVisibility from Commits.c and made the engine function C4Object::IsVisible available instead. 2011-09-05 13:51:34 +00:00
Tobias Zwick c2cefe2e4f new control: collect (into backpack) 2011-08-11 16:37:46 +02:00
Tobias Zwick ecd6de1d65 refactor: schedulecalls without object can now be made from object context 
(parameter obj is not automatically filled with this if nil)
 2011-07-31 19:27:26 +02:00
Tobias Zwick 480ff384f8 refactored most effects to use meaningful names for their variables 2011-07-31 17:59:51 +02:00
Tobias Zwick 92069bb2f8 removed undocumented ~GetCustomComponents callback and the involved hackery 2011-07-31 02:22:29 +02:00
Tobias Zwick d43ace0110 fix function HSLa(h,s,l,a) 2011-07-31 02:00:12 +02:00
Maikel de Vries d550f7c7da Differentiate between COMD_None and COMD_Stop 
Was necessary after 267ebb600481 and current abuse of FLOAT procedure. None keeps the current motion, Stop halts the current motion of a procedure.
 2011-07-06 18:13:39 +02:00
Maikel de Vries eb530c6017 Removed Defcore:Prey and OCF_Prey 
Had no use in the engine, should therefore be defined in C4Script if deemed necessary.
 2011-07-05 13:40:40 +02:00
Maikel de Vries 248f85c2eb Removed Defcore:Edible and OCF_Edible 
Had no use in the engine, should therefore be defined in C4Script if deemed necessary.
 2011-07-05 13:10:56 +02:00
Tobias Zwick 6278b91c83 BlastObjects - if cause_plr not specified, try calling object 2011-07-03 03:59:48 +02:00
David Dormagen 53e743b4d0 first version of flagpole and flag-libraries added 2011-06-18 15:22:34 +02:00
Charles Spurrill 806ea2cf4f Fixed water jump 2011-06-04 14:07:02 -07:00
Charles Spurrill b7bc9bc755 Clonk can jump off walls (with new animation). 2011-06-03 12:11:23 -07:00
Günther Brammer 3c943479ab editor: File/Save creates a savegame when the original scenario was one 2011-05-15 19:38:47 +02:00
Maikel de Vries 971b330288 Objects: Removed superfluous parameters in function calls 
Caused a few warnings recently.
 2011-05-12 17:01:54 +02:00
Günther Brammer bbaf1c2c06 Empty Scenario.txt produce a more helpful error message 2011-05-03 00:57:35 +02:00
David Dormagen a9b5fc9c95 fix 2011-04-14 18:23:09 +02:00
Günther Brammer 9b3afcef04 Remove IDS_LANG_CHARSET and supporting code, everything is in UTF-8 now 2011-04-09 02:51:57 +02:00
Sven Eberhardt b01cddc560 control config dialog improvements 2011-03-31 16:26:59 +02:00
David Dormagen a38de1ecd0 Extinguish() fix 2011-03-16 10:12:09 +01:00
Armin Burgmeier 41a1b5867d Change .c4g extension to .ocg 2011-03-13 16:16:45 +01:00