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

5678 Commits (959da11e116141bf0137569776fddbeb2c8e3ea9)
 

Author SHA1 Message Date
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
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
Tobias Zwick 189e667b1f include grenade launcher in one of the arenas (ruins) 2014-01-26 12:42:24 +07:00
Sven Eberhardt a9f4e7d0d7 AcidGoldMine: Reduced amount of fire stone material and made sure it only occurs further down in the cave. 
The transition from sulphur to fire stone made this scenario hellishly hard. Meteors would hit the fire stone material and cause a chain reaction that would flood the cave.

This can still happen, but at least you get some more time now.
 2014-01-25 23:06:03 +01:00
Tobias Zwick 37d699c452 fix name and description of spray can 2014-01-26 01:54:17 +07:00
Tobias Zwick f541ab9075 add placeholder graphic for loom 
+ the previous unfinished loom model export seems to be corrupt, there was a loading error
 2014-01-26 01:54:16 +07:00
Tobias Zwick 13537812ef convert mesh of spray can to binary format 2014-01-26 01:54:16 +07:00
Martin Plicht 515aaf656d cmake: Only add StdSchedulerMac.mm when APPLE platform 2014-01-25 16:12:02 +01:00
Tobias Zwick a423a62bb2 Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
Tobias Zwick e1a417bc97 make the story of MineRescue more believable (so the "trapped" clonks can't climb, eh?) 2014-01-25 22:05:11 +07:00
Tobias Zwick 00ada6563c add icon for maze 2014-01-25 22:05:10 +07:00
Martin Plicht bf1f9037a8 Merge branch 'macscheduler' 2014-01-25 16:00:29 +01: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
Tobias Zwick 7420dba41b fix creation of particles when outside for ruby 2014-01-25 17:03:07 +07:00
Tobias Zwick cb32c3f93c maze.ocs: finetune to be more claustrophobic 2014-01-25 17:02:21 +07:00
Tobias Zwick ebd14e2339 fix #1012: Construction removed when all materials available 
+ Add localized error message when the underground changed and thus the construction cannot be created
+ Add a SetPosition to ensure the construction site is really exactly at the given position
 2014-01-25 16:20:27 +07:00
Tobias Zwick b221623b89 less firestone yield from firestone veins (blowing up one vein was too extreme) 2014-01-25 13:50:07 +07:00