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

4988 Commits (682e315ea14bf9fb7848902c379c6194de96c317)
 

Author SHA1 Message Date
Armin Burgmeier 682e315ea1 mape: Fix an endless loop when enumerating available drives on Windows 2013-01-22 00:28:42 +01:00
Armin Burgmeier 0d4703e6a8 mape: Change "close window" shortcut from alt+F4 to ctrl+q 
Alt+F4 will be caught by the window manager and close the program as
well.
 2013-01-20 23:56:00 +01:00
Armin Burgmeier 2dcd26521d mape: Fix directory listing for directories with non-readable files 2013-01-20 22:28:30 +01:00
Nicolas Hake 8a9926ccc4 CMake: Ensure compatibility with cmake <2.8.6 2013-01-20 22:10:26 +01:00
Nicolas Hake 6bb595f842 CMake: Use GTK+ cflags as reported by pkg-config 
Ignoring CFLAGS/LDFLAGS makes GTK+ not work correctly
if the libraries are compiled with -mms-bitfields (as
is the case with the prebuilt binaries from gnome.org).
 2013-01-20 21:53:56 +01:00
Günther Brammer 211634cf15 mape: Even more windows fixes 2013-01-20 20:36:51 +01:00
Günther Brammer 414cb8a4c7 gtk: GDK_KEY_* constants require at least GTK+ 2.21.8 2013-01-20 18:41:07 +01:00
Günther Brammer bf12980ccb mape: Further windows compilation fix 2013-01-20 18:39:56 +01:00
Günther Brammer cd19aff059 mape: Correct openclonk file extensions some more 2013-01-20 17:54:27 +01:00
Günther Brammer 78c39530a2 mape: Make group.c compile on windows 2013-01-20 17:53:52 +01:00
Günther Brammer 7dade553e8 Remove unused clonk.anjuta 2013-01-20 17:25:02 +01:00
Günther Brammer 019ea36ee9 Remove unused C4Object::GetActionByName 2013-01-20 17:25:02 +01:00
Sven Eberhardt 1ed3e9d648 Experimental EvilCastle now has a goal! 2013-01-20 17:12:07 +01:00
Sven Eberhardt 34831fd821 Experimental EvilCastle: Intro, startup materials, relaunch, enemies. Still no goal :( 2013-01-20 13:26:34 +01:00
Sven Eberhardt 4b189cacd1 Added Scenario [Landscape] FlatChunkShapes. If set to true, all chunks are drawn flat. Useful for scenario editing to fix little holes in your static landscape. 2013-01-20 12:51:33 +01:00
Sven Eberhardt c8edaab426 Experimental: EvilCastle scorching ruins and some enemies 2013-01-20 01:45:00 +01:00
Sven Eberhardt 1f32bce29b Experimental: EvilCastle now with evil mushroom cave! 2013-01-20 00:45:17 +01:00
Sven Eberhardt 18c7525420 Experimental: EvilCastle 2013-01-19 17:49:08 +01:00
Sven Eberhardt 68e445aa2e Experimental: Enemy AI 2013-01-19 17:46:53 +01:00
Sven Eberhardt 9bcf7ca725 fix typo in catapult script 2013-01-18 23:12:17 +01:00
Günther Brammer ce87faaf9e Fix #including a definition that has local variables with proplists 
The missing break meant that the freshly created copy of the proplist would
get overwritten by the original, which was thankfully caught and announced
with "internal error: constant proplist has the wrong parent".

Thanks to Zapper for the testcase.
 2013-01-18 01:45:06 +01:00
Armin Burgmeier e1ccbddd5e Fix configure error when mape build is not enabled 2013-01-16 23:24:14 +01:00
Armin Burgmeier 8be7ff42db Merge branch 'mape' 2013-01-16 21:58:07 +01:00
Günther Brammer 263d944d5c mape: Build with debugrecs enabled 2013-01-16 02:13:38 +01:00
Günther Brammer 320672f608 autotools: Make mape optional 2013-01-16 02:13:22 +01:00
Sven Eberhardt 06e70b7b74 Synchronized EditCursor(De)selection, so you can edit scenarios in network mode and/or record it. 2013-01-15 23:30:23 +01:00
Sven Eberhardt f51a085592 Added object callbacks EditCursorSelection and EditCursorDeselection. Useful to show or hide developer stuff in the editor. 2013-01-15 23:10:25 +01:00
Maikel de Vries 6742013d11 Krakatoa health bars in front of structures (#860) 2013-01-14 20:12:35 +01:00
Maikel de Vries b6b8e559a0 Moved Raiders.ocs to Experimental.ocf 
This is where experimental scenarios belong.
 2013-01-14 20:06:27 +01:00
David Dormagen 38bdfd296d FindLocation: added parameters, improved documentation, now uses Par(i) 2013-01-14 10:41:10 +01:00
Günther Brammer c719c6650c autotools: Update mape source list 2013-01-14 02:25:15 +01:00
Armin Burgmeier 881ebd4b95 Don't show line numbers for error messages not coming from map generator 2013-01-14 02:25:15 +01:00
Armin Burgmeier 9e4d3d9caf Make C4MapCreatorS2 show line numbers in error messages when parsing from mem 2013-01-14 02:25:15 +01:00
Armin Burgmeier 2cd91a56c4 Add support for algo=script overlays 2013-01-14 02:25:15 +01:00
Armin Burgmeier 0b45ac83cf Make sure not to render map before map size configuration has been read 2013-01-14 02:25:14 +01:00
Armin Burgmeier ab66f3ffd5 Fix overload_materials and overload_textures flag being erroneously set to true 
since they are not initialized by C4TextureMap::LoadMap in case
materials and/or textures are not overloaded.
 2013-01-14 02:25:14 +01:00
Armin Burgmeier f016b07d47 Handle the unsupportedness of algo=script gracefully 
at a later point this logic can be used to load the script file if
algo=script occurs somewhere in the Landscape.txt to be rendered.
 2013-01-14 02:25:14 +01:00
Armin Burgmeier c8f9bc4252 Fix function namespacing 2013-01-14 02:25:13 +01:00
Armin Burgmeier 9a6d545f94 Use the OpenClonk version as the mape version 2013-01-14 02:25:13 +01:00
Armin Burgmeier 3849972dfd Fix a crash when the water material appears on the map somewhere 2013-01-14 02:25:13 +01:00
Armin Burgmeier 926a3afdd4 Restore original formatting of CMakeLists.txt 2013-01-14 02:25:13 +01:00
Armin Burgmeier abfdd12501 Build mape always when the dependencies are available 2013-01-14 02:25:12 +01:00
Armin Burgmeier 4aca001152 Fix warning about gtk_container_set_border_width being used with GtkBox 2013-01-14 02:25:12 +01:00
Günther Brammer b3c24dec56 autotools: Add mape 2013-01-14 02:25:12 +01:00
Günther Brammer 36e966ba26 mape: Port to GTK+ 3.0 2013-01-14 02:25:11 +01:00
Günther Brammer 3833416629 autotools: Compile script engine source files only once 2013-01-14 02:25:11 +01:00
Armin Burgmeier e7be3dc32d Remove some additionally introduced includes and forward declarations 
they are no longer needed, the code compiles just fine without.
 2013-01-14 02:25:11 +01:00
Armin Burgmeier aa2f3df779 Make mape link only against the part of the Clonk engine that is needed 
and not against the whole engine. This avoids pulling in unnecessary
dependencies like SDL or OpenGL.
 2013-01-14 02:25:11 +01:00
Armin Burgmeier 7357125368 Make C4Material.cpp independent of C4Game 
This allows compiling and linking with it without pulling in whole
C4Game. This is useful for the mape map editor.

The only place where C4Game was used in C4Material.cpp was in
CrossMapMaterials where the name of the earth material is read from
Game.C4S. The code has been changed such that the earth material name is
now a parameter to the CrossMaterialMap function.
 2013-01-14 02:14:39 +01:00
Armin Burgmeier 3420b2a9a2 Move C4ScenarioSection code from C4Scenario.cpp into C4ScenatioSection.cpp 
This allows compiling and linking with C4Scenario.cpp without having to
pull in whole C4Game.
 2013-01-14 02:14:37 +01:00