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

5693 Commits (stable-5.4)
 

Author SHA1 Message Date
Maikel de Vries df1d93992f Make sure LargeCaveMushroom does not burn forever 2014-02-22 15:16:54 +01:00
Tobias Zwick 1066c4a4b3 increase engine version number to 5.4.1 2014-02-16 22:45:27 +07:00
Sven Eberhardt 455c35e2e5 Fix DarkCatle null pointers and intro (#1034) 
(cherry picked from commit 085ec9de27)
 2014-02-16 22:43:53 +07:00
Martin Plicht 92186db246 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:48:16 +01:00
Martin Plicht 75f3fb2d70 C4NetIO: #ifdef __APPLE__, not APPLE 2014-02-16 14:28:01 +01:00
Maikel de Vries ce56d6a681 Fixed the pickaxe creating huge amounts of earth (#1030) 2014-02-16 12:00:25 +01:00
Martin Plicht d63ea57e5f C4NetIO: mac: To be on the safe side, only activate poll timeout cap when APPLE 2014-02-16 11:46:38 +01:00
Martin Plicht f90e67d4ca cmake: mac: Re-add libs bundling, revert to LegacyFindFreeType for APPLE 2014-02-16 11:46:38 +01:00
Martin Plicht e3b7d9841c C4NetIO: Place silly poll timeout fix where it actually helps in case of UDP 2014-02-16 11:46:38 +01:00
Martin Plicht a9abbd0cc8 cmake: mac: Reorder compiler flag selection a bit 2014-02-16 11:46:38 +01:00
Martin Plicht 16e55f9915 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 11:46:38 +01:00
Martin Plicht b76b4342aa StdSchedulerMac: Was crashy because of faulty memory management which is now hopefully better 2014-02-16 11:46:38 +01:00
Martin Plicht b6083f0e9f mac: Add precompiled nib files to really not require Xcode … 2014-02-16 11:46:37 +01:00
Martin Plicht bbc2547ab7 cmake: mac: make install installs bundle 2014-02-16 11:46:37 +01:00
Martin Plicht 7338153627 C4NetIO: Endless polls cut short by cheap hack 2014-02-16 11:46:37 +01:00
Martin Plicht 6c8b944272 StdSchedulerMac: Only add NSRunLoop additions for main thread 2014-02-16 11:46:37 +01:00
Martin Plicht 80fce0968d cmake: Insert hacks and hardcoded paths to make mac version compilable using Unix make 2014-02-16 11:46:37 +01:00
Maikel de Vries 72d8fd88c0 Fixed boomshire's door solidmasks (#1035) 2014-02-16 11:43:19 +01:00
Tobias Zwick c772ff8df6 fix possible block in tutorial 2 (#1036) 2014-02-16 13:31:12 +07:00
Tobias Zwick ba64fda137 selecting the clonks via hotkey was all backwards (#1031) 
e.g. pressing ctrl+3 selected 1st clonk if there are 3 in the crew

(cherry picked from commit 3a8c8d7c3b)
 2014-02-16 13:16:57 +07:00
Sven Eberhardt 48cc4be206 Fix save as scenario for Dialogue. 
Add GameCall as fallback mechanism for dialog implementation if no local function is defined.

(cherry picked from commit 13a60848c6)
 2014-02-16 12:34:40 +07:00
Nicolas Hake 4745f881c4 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-12 13:28:43 +01:00
Nicolas Hake a7199c26a0 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-12 13:28:42 +01:00
Tobias Zwick 65873fbfdb add a note to CMakeLists.txt 
(cherry picked from commit a0848af371d451e6ef69918bacf2dd42bf7a6202)
(cherry picked from commit 44ffc5c470)
 2014-02-07 21:56:11 +07:00
Sven Eberhardt 638467d5a6 Make acid corrode coal and firestone (#1032) 
(cherry picked from commit 959da11e11)
 2014-02-07 21:56:04 +07:00
Tobias Zwick b63f46d0ba 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.

(cherry picked from commit e1cff59418)
 2014-02-03 01:12:39 +07:00
Maikel de Vries 38ea88bdb2 Removed double Title1.png from Arena.ocf 
(cherry picked from commit 6cbe9e0554)
 2014-02-03 01:12:23 +07:00
Tobias Zwick 8741283ecb change a LogFatal() to Log() when loading of a player failed (related to #693) 
(cherry picked from commit 724bb80300)
 2014-02-03 00:22:21 +07:00
Maikel de Vries 037d167de8 Fix issues with Crash.ocs intro (#951) 
(cherry picked from commit addf28a0ab)
 2014-02-03 00:22:19 +07:00
Maikel de Vries 1f34a2bbef Moved Dialogue to Helpers.ocd to avoid copies 
(cherry picked from commit 6ff632e2f2)
 2014-02-03 00:22:14 +07:00
Tobias Zwick 325d2b80e1 fix update via *.ocu on Windows 7 (#870) 
see bugtracker entry for details
 2014-02-02 23:45:24 +07:00
Tobias Zwick ba2d71c942 installer should delete Issues.ocf, Experimental.ocf etc on install (part of solution to #1029) 2014-02-02 22:50:42 +07:00
Tobias Zwick 8bc4b086d5 fix typo in documentation (#1023) 
(cherry picked from commit 1ed6521565)
 2014-02-02 13:43:51 +07:00
Tobias Zwick 2f5946d419 fix typo in english translation 
(cherry picked from commit 1e359bddf9)
 2014-02-02 13:43:41 +07:00
Tobias Zwick 47984a322d 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!

(cherry picked from commit a04a1b697b)
 2014-02-02 13:43:21 +07:00
Tobias Zwick 23aa72f52f correct version to 5.4.0 2014-01-27 00:24:16 +07:00
Pyrit c71ac73fa5 Remove triangles from windmills in Windmill.ocs. 2014-01-26 17:39:11 +01:00
Pyrit c33ef06909 Fix sky scrolling for several scenarios. 
SkyScrollMode=1 in Scenario.txt is broken, so I used  SetSkyParallax() in the script.
 2014-01-26 17:39:11 +01:00
Armin Burgmeier 814b97c6ad Fix the MtBrame intro, and make the lower right corner a bit larger 2014-01-26 17:19:58 +01:00
Tobias Zwick 590141dd0b ++version number 2014-01-26 23:05:10 +07:00
Tobias Zwick 44f0cc7205 move RubyCave to Worlds for now 2014-01-26 22:56:31 +07:00
Sven Eberhardt 6e90e80c04 Add material Vehicle to TexMap to prevent unnucessery Material.ocg generation 2014-01-26 16:52:04 +01:00
Sven Eberhardt 32104f6bbe Change StdScheduler loop to work in MSVC2010. 2014-01-26 16:26:27 +01:00
Sven Eberhardt 94a17c534c AcidDrilling: Power crystals block building construction (#1009) 2014-01-26 14:27:27 +01:00
Tobias Zwick acba8cad36 update the descriptions for missions and world to hopefully make the distinction between the two more apparent 2014-01-26 20:01:50 +07:00
Sven Eberhardt 8368ec8c0f MtBrame: Fix object planes 2014-01-26 13:59:29 +01:00
Tobias Zwick 4713437503 MtBrame: use Objects.c 2014-01-26 18:31:21 +07:00
Tobias Zwick baed75b2f6 fix invalid landscape 2014-01-26 17:53:57 +07:00
Tobias Zwick 9c1f4bcbef replace FIXME logs on each scenario start with a FIXME comment in the code (#1013) 2014-01-26 17:16:22 +07:00
Tobias Zwick 9396201996 more iron bombs! 2014-01-26 12:42:25 +07:00