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

4047 Commits (b7e8ca92631e0d279ee58a2c69025a0536acb2c9)
 

Author SHA1 Message Date
Benjamin Herr b7e8ca9263 move logic from OnOwnerRemoved to C4Player 
This avoids a previous assert() on player elimination from GetFunc()
being unable to handle the tilde in "~OnOwnerRemoved". FnOnOwnerRemoved
is gone so that shouldn't happen anymore.
 2012-04-01 22:06:43 +02: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
Benjamin Herr cf0069a3e2 C4MouseControl: don't reset "Drag" before UpdateCursorTarget() 2012-04-01 19:48:11 +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 a0f8f6bc51 Fixed interchange of weapons in tutorial 3 and 4 on death (#665) 2012-04-01 16:49:03 +02:00
Julius Michaelis 97d34d8c46 Oversight in PCH fix 951aac232911 
Shouldn't make any difference
 2012-04-01 14:23:29 +02:00
Bernhard Bonigl 0ea2f7e46d Lowered Rock needed for foundry to 4 from 6 2012-03-30 00:11:52 +02:00
Maikel de Vries 6a2d0aa901 Removed log from team account rule... 2012-03-31 18:34:00 +02:00
Maikel de Vries be02f5bdc1 Fixed multiple team account rules giving too much money 
Also removed three copies in Skylands.ocs
 2012-03-31 18:27:14 +02:00
Maikel de Vries 78fd5fd166 Implemented Callbacks to containers when content menus are opened and closed 
The chest now also plays its animation and sound again.
 2012-03-31 17:34:03 +02:00
Maikel de Vries 03109201cc Fixed some NoRain.c appendtos 2012-03-31 17:27:26 +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
Maikel de Vries 84e5f04cd3 Fixed shooting items with cannon (#733) 
Also minor cleanup in code
 2012-03-31 12:46:24 +02:00
Julius Michaelis 15696e75ae Fix the GCC precompiled headers 
It's still hacky as hell, but changing CMAKE_BUILD_TYPE or only rebuilding c4script without c4group_pch shouldn't break anymore
 2012-03-30 19:47:21 +02:00
Bernhard Bonigl f5504f7497 Fixed Hand-Size. 
Turned Hand-Indicators into one layer
 2012-03-29 22:27:42 +02:00
Martin Plicht 26fec4ca89 mac: Lion: More fullscreen/mouse movement fixes, hopefully the mouse now actually works in-game and moving mouse into screen corners does not trigger mission control or whatever else is set as hot corner actions. Remaining problem is that when activating mission control with the clonk window active, the user cannot move the mouse cursor since it's still stunned by CGAssociateMouseAndMouseCursorPosition(FALSE) 2012-03-29 00:43:03 +02:00
Martin Plicht 397557f1e1 mac: Gamma: Don't maintain conversion table (what was I thinking?) 2012-03-29 13:30:36 +02:00
Martin Plicht c02f334d15 mac: Switch to game window when application activated 2012-03-28 22:38:33 +02:00
Bernhard Bonigl 71061c8d4b Allowed movement during construction-preview (for better positioning) 2012-03-28 19:39:00 +02:00
Martin Plicht 50e6e497b1 mac: Lion: Fix mouse movement when scrolling (grunt) 2012-03-28 15:03:25 +02:00
Martin Plicht e25351ed04 mac: Lion: More mouse shenanigans to suppress hot corner actions when in fullscreen mode 2012-03-28 14:50:50 +02:00
Martin Plicht f1c7ceeb75 mac: Lion: Restore not redrawing the window when in fullscreen mode and inactive 2012-03-24 19:43:50 +01:00
Felix Wagner 98f422a2ac Construction preview for the hammer. 2012-03-27 19:10:44 +01:00
Felix Wagner 47fcf53868 docs for CheckConstructionSite 2012-03-27 19:10:07 +01:00
Felix Wagner 2416fa98fb + FnCheckConstructionSite 2012-03-27 19:09:55 +01:00
Martin Plicht 4d504956c5 mac: osx_bundle_libs bundles recursive dependencies so libogg/libvorbis conundrum solved 2012-03-25 15:30:01 +02:00
Martin Plicht ef289a0c60 mac: le typo 2012-03-25 12:52:48 +02:00
Martin Plicht 01530ea3b1 mac: Add key codes for "Backslash", "Comma_US" and "Less" 2012-03-23 18:11:46 +01:00
Martin Plicht db6009d8b1 mac: Fix exclusive dialogs not clickable in game mode 2012-03-25 12:08:06 +02:00
Günther Brammer 40de33ca3c win32: Make sdl-mainloop option work 
As it doesn't have the editor, this is only useful for compiling
more of our code on more platforms.
 2012-03-23 22:53:56 +01:00
Günther Brammer 25bbaef7d2 sdl-mainloop: Draw things again 2012-03-25 01:54:07 +01:00
David Dormagen 182889bfe4 lorry: fixed collection limit when collecting via collection zone 2012-03-24 16:33:15 +01:00
David Dormagen 3788bada43 plants will now stop growing for ten seconds after taking damage 2012-03-24 16:18:55 +01:00
David Dormagen cc715ae682 the sawmill now checks whether the tree will actually produce wood before sawing it 2012-03-24 16:09:11 +01:00
Maikel de Vries 3e705cf500 Toolsworkshop needs 100 power now 
This was a decision "we" testers made already weeks ago but forgot to implement.
 2012-03-23 22:50:40 +01:00
Günther Brammer 378029168b Re-enable keyboard configuration dialog (#624) 2012-03-21 21:17:39 +01:00
Martin Plicht 160e214196 mac: Silly pinch gesture in mainmenu to toggle fullscreen mode Lion-compatible 2012-03-23 00:21:03 +01:00
Martin Plicht aaa5a71e4b mac: Support Lion FullScreen 2012-03-23 00:03:05 +01:00
Bernhard Bonigl 25fec934d6 Removed all Hacks with Interaction. Enter/Exit also works now. 2012-03-22 20:26:06 +01:00
Martin Plicht 30840696c6 C4AulScriptEngine::Clear: Don't create GlobalPropList just to Clear() it 2012-03-22 21:49:55 +01:00
Martin Plicht 62f7540b2d mac: Turns out, shift+mouse actions were never properly processed. Whoops 2012-03-22 21:08:19 +01:00
Martin Plicht 5b98c4a2ae mac: README: Forgot note about checking out 'next' when cloning cmake 2012-03-22 10:25:19 +01:00
Martin Plicht 0364e23deb mac: README: Add some anecdotal notes for Xcode 4.3+ 2012-03-22 09:40:46 +01:00
Martin Plicht 9177c3e515 mac: Fix some Xcode warnings 2012-03-22 01:19:10 +01:00
David Dormagen ae6381d467 halfed the point limit of the two KotH scenarios 2012-03-21 23:43:01 +01:00
Bernhard Bonigl b6731b1dc8 Inventory now updates when an object is removed (Loam, Constructing stuff,...) 2012-03-21 21:55:34 +01:00
Bernhard Bonigl 7842d8c8e5 Made inventory-slots bigger 2012-03-21 21:52:57 +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 db73b6ab67 mac: ConsoleWindow.xib: Remove Script Counter display (again) 2012-03-21 11:46:19 +01:00