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

5707 Commits (01d5507c228d6d5883111d7b961bd0e9af0ca94a)
 

Author SHA1 Message Date
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
Nicolas Hake 4a3ece5f5d Don't split UTF8 when handling accelerators (#983) 
Marking up accelerator keys still assumed all characters were one byte
wide. Change this to accept multi-byte characters.
 2014-03-11 00:25:38 +01:00
Maikel de Vries adbe3c629b GemGrabbers: gems stalactites reappear to allow for more risky game play 2014-02-23 17:22:57 +01:00
Maikel de Vries 2cf42422b4 Improved information of SellGems goal 2014-02-23 17:15:39 +01:00
Maikel de Vries 65b54132ac Make sure LargeCaveMushroom does not burn forever 2014-02-22 15:08:05 +01:00
Sven Eberhardt fe20ef43a7 Fix AcidDrilling goal (#1038) 2014-02-18 22:56:44 +01:00
David Dormagen 6b25e54f0b PV_Step: added "maximumValue" parameter 2014-02-18 20:37:43 +01:00
David Dormagen b533d3b390 particles: minor documentation fixes 2014-02-18 20:37:16 +01:00
David Dormagen bc9b5c8bd7 added documentation for PV_Gravity 2014-02-18 19:13:51 +01:00
Nicolas Hake 7b495cdef4 C4Script: Allow more format flags 
In addition to field width and precision, also accept sign flags (+, -,
<space>) and the "alternate output" flag (#).
 2014-02-17 23:10:50 +01:00
Maikel de Vries c075103bb9 Added GetDescription to all goals 
This will be used by the new HUD on the controls branch.
 2014-02-17 20:41:02 +01:00
Martin Plicht 46df9d758c StdScheduler: Make DoScheduleProcs virtual, override it in C4AbstractApp and set isInManualLoop flag around the DoScheduleProcs call so the FlushMessages() of C4AbstractApp will happen when isInManualLoop is true 2014-02-16 14:54:32 +01:00
Martin Plicht e02b2d425f C4NetIO: #ifdef __APPLE__, not APPLE 2014-02-16 14:54:26 +01:00
Sven Eberhardt 085ec9de27 Fix DarkCatle null pointers and intro (#1034) 2014-02-16 13:55:46 +01:00
Maikel de Vries 5ebe30e77c Fixed the pickaxe creating huge amounts of earth (#1030) 2014-02-16 11:58:41 +01:00
Maikel de Vries e7eabe01a7 Fixed boomshire's door solidmasks (#1035) 2014-02-16 11:37:18 +01:00
Martin Plicht 61cd4271c9 C4NetIO: mac: To be on the safe side, only activate poll timeout cap when APPLE 2014-02-16 10:54:24 +01:00
Martin Plicht 90dec14601 cmake: mac: Re-add libs bundling, revert to LegacyFindFreeType for APPLE 2014-02-16 10:18:45 +01:00
Martin Plicht aee2e358ca C4NetIO: Place silly poll timeout fix where it actually helps in case of UDP 2014-02-16 10:18:45 +01:00
Martin Plicht 59bc72f54e cmake: mac: Reorder compiler flag selection a bit 2014-02-16 10:18:45 +01:00
Martin Plicht c3dd3a08ce StdScheduler::Added is not necessarily called from the thread the 
procedure is meant to be run on, so introduce yet another StdScheduler
extra method StartOnCurrentThread which on Mac OS X does the actual run
loop registration stuff and needs to be called from the actual thread
the scheduler is supposed to run on

StdSchedulerMac: Remove SCHAdditions objects again
 2014-02-16 10:18:38 +01:00
Martin Plicht c9521e2c3c mac: Zoom in/out main menu commands also work in game mode, call Viewports. methods then 2014-02-16 10:01:14 +01:00
Tobias Zwick 24307e0713 fix possible block in tutorial 2 (#1036) 
(cherry picked from commit c772ff8df6)
 2014-02-16 13:31:36 +07: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
Sven Eberhardt 13a60848c6 Fix save as scenario for Dialogue. 
Add GameCall as fallback mechanism for dialog implementation if no local function is defined.
 2014-02-08 22:49:08 +01:00
Tobias Zwick 44ffc5c470 add a note to CMakeLists.txt 
(cherry picked from commit a0848af371d451e6ef69918bacf2dd42bf7a6202)
 2014-02-07 21:53:06 +07:00
Nicolas Hake 2becbf6b44 Use pkg-config over CMake to find Freetype (#1024) 
If pkg-config does not exist on the build system, then the old
FindFreetype.cmake behavior will be fallen back upon, but pkg-config
should be a lot more reliable.
 2014-02-07 00:06:04 +01:00
Nicolas Hake fe7d2de852 Add option to link Boost dynamically (#1025) 
Distributions can guarantee the existence of a specific version of
the Boost libraries, so it makes less sense to link them statically.
 2014-02-06 22:08:15 +01:00
Sven Eberhardt 959da11e11 Make acid corrode coal and firestone (#1032) 2014-02-03 21:46:56 +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
Maikel de Vries 6cbe9e0554 Removed double Title1.png from Arena.ocf 2014-02-02 18:53:04 +01:00
Tobias Zwick 724bb80300 change a LogFatal() to Log() when loading of a player failed (related to #693) 2014-02-03 00:19:08 +07:00
Maikel de Vries addf28a0ab Fix issues with Crash.ocs intro (#951) 2014-02-02 18:03:54 +01:00
Maikel de Vries 6ff632e2f2 Moved Dialogue to Helpers.ocd to avoid copies 2014-02-02 18:03:54 +01:00
Tobias Zwick 9f78f85206 fix update via *.ocu on Windows 7 (#870) 
see bugtracker entry for details

(cherry picked from commit 325d2b80e1)
 2014-02-02 23:54:15 +07:00
Tobias Zwick 269b609edf installer should delete Issues.ocf, Experimental.ocf etc on install (part of solution to #1029) 
(cherry picked from commit ba2d71c942)
 2014-02-02 23:53:57 +07:00
Tobias Zwick 1ed6521565 fix typo in documentation (#1023) 2014-02-01 19:51:44 +07:00
Tobias Zwick 1e359bddf9 fix typo in english translation 2014-02-01 19:51:42 +07:00
Martin Plicht 4299faefd4 StdSchedulerMac: Was crashy because of faulty memory management which is now hopefully better 2014-01-29 22:57:19 +01:00
Martin Plicht acceeb7291 mac: Add precompiled nib files to really not require Xcode … 2014-01-29 20:39:24 +01:00
Martin Plicht f1cc91055a cmake: mac: make install installs bundle 2014-01-29 14:12:22 +01:00
Tobias Zwick a04a1b697b fix game does not initialize when OS runs for longer than 30 days or so. 
Special thanks to Yshxod for having the patience and debugging the game with me!
 2014-01-28 00:04:31 +07:00
Tobias Zwick a4d8cef7b0 register new version at masterserver: fix php script 2014-01-27 22:09:00 +07:00
Martin Plicht 09e1a47cf9 C4NetIO: Endless polls cut short by cheap hack 2014-01-27 14:22:22 +01:00
Martin Plicht 3ce7d7ae7f StdSchedulerMac: Only add NSRunLoop additions for main thread 2014-01-27 14:22:22 +01:00
Martin Plicht c26ac97729 cmake: Insert hacks and hardcoded paths to make mac version compilable using Unix make 2014-01-27 14:22:22 +01:00
Martin Plicht b3c1706b1b mac: Clonk.icns is oc.icns 2014-01-27 14:22:22 +01:00
Tobias Zwick f471955a72 masterserver: be more verbose when reporting an error while registering a new update 2014-01-27 14:24:24 +07:00
Tobias Zwick 23aa72f52f correct version to 5.4.0 2014-01-27 00:24:16 +07:00