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

5104 Commits (814f80988541056a194f0538da62adc47e2d4000)
 

Author SHA1 Message Date
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
Armin Burgmeier bab0e4bb3c Show correct material color in preview 2013-01-14 01:41:22 +01:00
Armin Burgmeier 98c9ec7734 When rendering the generated map in a pixbuf, apply rowstride correctly 
Current behaviour could lead to crash in case of non-square images whose
width was not a multiple of 4, i.e. rowstride != width.
 2013-01-14 01:41:22 +01:00
Armin Burgmeier e8076221df Return the correct image width of the generated map 
Before the rowstride was returned as actual image width
 2013-01-14 01:41:22 +01:00
Armin Burgmeier cc4f62a327 Fix a memory leak in mape_texture_map_load_textures() 2013-01-14 01:41:22 +01:00
Armin Burgmeier d2729e17e7 Make average texture color available in mape, and set it from loaded textures 2013-01-14 01:41:22 +01:00
Armin Burgmeier b6bcc0d36e Make a texture's average color able to be set externally 2013-01-14 01:41:22 +01:00
Armin Burgmeier 26143ededc Load the default textures for all materials 
so that materials without a proper tex= line are rendered correctly
 2013-01-14 01:41:21 +01:00
Armin Burgmeier 8ce4b2472b Honor configured map size correctly 2013-01-14 01:41:21 +01:00
Armin Burgmeier 64c78f1674 Show a thumbnail of the textures in the textures view 2013-01-14 01:41:21 +01:00
Armin Burgmeier f8a61b4a00 Adapt for OpenClonk file extensions 2013-01-14 01:41:21 +01:00
Armin Burgmeier b2be39b576 Handle-ify the random seed setting 2013-01-14 01:41:21 +01:00
Armin Burgmeier 7f452643aa Add mape files to .gitignore 
Conflicts:
	.gitignore
 2013-01-14 01:41:10 +01:00
Armin Burgmeier 4b4da8646b Handle-ify the mapgen call 2013-01-14 01:40:54 +01:00
Armin Burgmeier 662d9bc4f4 Use the icons that come with OC for mape 
gdk-pixbuf-csourcing them from the .ico files in a build step.
 2013-01-14 01:40:47 +01:00
Armin Burgmeier 257db99165 Merge remote-tracking branch 'new/master' into mape 
Conflicts:
	CMakeLists.txt
	src/graphics/C4Draw.h
 2013-01-14 01:38:03 +01:00
Tobias Zwick d018920f53 if Crew is not specified, default to Clonk=1 in the scenario.txt 2013-01-13 22:08:30 +01:00
Nicolas Hake 016f626cbe planet: Normalize line endings 2013-01-13 19:00:12 +01:00
Armin Burgmeier 2d3a4981bf map creator: don't crash when using a template within itself (#534) 2013-01-13 18:19:32 +01:00
Tobias Zwick 28e2bdbb92 fix #724: revers the order in which GetCrew(plr,index) returns the crew 2013-01-13 15:45:51 +01:00
Tobias Zwick 65d50da83f cleaned up obsolete entries in scenario.txt 2013-01-13 15:45:01 +01:00
Tobias Zwick 6dc75fb22a documentation -> link to git repos in header 2013-01-13 15:40:28 +01:00
Tobias Zwick b85b08687f fix #907: name of the construction site is not localized 2013-01-13 14:16:43 +01:00
Gabriel f4d8d81a70 Changed actmap.xml "Facet" entry to coordinates. 
Replaced "Facet" with "X", "Y", "Wdt" and "Hgt".

Signed-off-by: Tobias Zwick <newton@westnordost.de>
 2013-01-13 14:07:27 +01:00
Martin Plicht 379cd1c210 StdStrBuf::AppendFormatV: Pass copied va_list to vsnprintf so the second iteration of the while loop does not crash 2013-01-13 11:31:13 +01:00
David Dormagen 7ba10ca3cf added IsPointInRectangle(point, rectangle) to System.ocg/Math.c 2013-01-12 18:15:51 +01:00
David Dormagen 00d5ffea03 added LargeCaveMushroom and Cave 
the Cave-dummy-object has a Place() method which places a cave
 2013-01-12 18:15:51 +01:00
David Dormagen 1cd7ffec6a added a FindLocation function in System.ocg/FindLocation.c 2013-01-12 18:15:50 +01:00
Günther Brammer 864c5c7ea8 copyright notices update 2012 2013-01-12 16:31:40 +01:00
Nicolas Hake a619b4b6ed c4group: Fix incorrect swprintf usage 2013-01-11 23:41:58 +01:00
Tobias Zwick 0d0df683d8 add WindowsGamesExplorer.xml to .gitignore 2013-01-08 23:52:45 +01:00
Tobias Zwick d0a6bb099f fix #792: wouldn't load Overlay.*.png 2013-01-08 23:52:45 +01:00
Günther Brammer 08f86c2038 Script: continue in a do-while loop jumps to test instead of start of loop 
This matches C and other languages.
 2013-01-08 21:21:11 +01:00
Gabriel 8bce48f166 Fixed parameters and text in SetGamma.xml, Schedule.xml and Effects.xml 
I also managed to get rid off the extra " automatically inserted at the end of the Schedule examples, by adding a <funclink></funclink> after the last &quot;. The string is not highlighted green now, but it not even was before.

Signed-off-by: Tobias Zwick <newton@westnordost.de>
 2013-01-02 22:45:31 +01:00
Sven Eberhardt 58ea47a4fd Added support for function pointers to ScheduleCall/AddTimer/ClearScheduleCall/RemoveTimer 2013-01-02 00:50:01 +01:00