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

380 Commits (544c1cbb4bb6da97d30571ff28772660c7ad5969)

Author SHA1 Message Date
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