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

107 Commits (19caa65b7b6432605e2ee12cf508680ed2688ca3)

Author SHA1 Message Date
Günther Brammer 22016e075f Replace some usages of C4ID with C4Def* 
In particular those that made the c4script shell depend on C4Id.cpp.
 2014-04-19 19:02:22 +02:00
Nicolas Hake e0dc30c59a Update copyright notices 
As discussed in http://forum.openclonk.org/topic_show.pl?tid=2917, I
have merged all copyright notices into a single file and referenced that
merged file from each source file.

For the updated source files, the timeline has been split into three
parts:
 1. Pre-RWD code (before 2001)
 2. RWD code (2001 through 2009)
 3. OpenClonk code (2009 and later)
All pre-RWD copyright notices have been left intact, as have RWD-era
copyright notices where the file did not have a RedWolf design copyright
notice but only individual author ones. All copyright notices of the
OpenClonk era have been replaced by a single notice ranging from the
first recorded year to the current year (2013). Mape code did not get a
OpenClonk Team copyright notice because it is somewhat separate from the
main OpenClonk codebase and has only been touched by Armin Burgmeier.
 2013-12-23 13:03:19 +01:00
Sven Eberhardt 09b46130a1 Fix mape build 2013-12-15 15:59:26 +01:00
Nicolas Hake 77b1da5238 mape: Update StartSoundEffectAt dummy 
ceca8b8 changed the signature of StartSoundEffectAt, but didn't update
mape's dummy function.
 2013-12-01 13:13:56 +01:00
Martin Plicht b6a01b62aa Fix mape compilation failure due to C4AulDebug changes 2013-10-17 01:23:33 +02:00
Sven Eberhardt 400e8719bb Fix mape build 2013-04-28 19:10:27 +02:00
Sven Eberhardt ec38b4d9e4 Fix some C4MapScript dependencies 2013-03-22 22:24:20 +01:00
Sven Eberhardt ac8e48e85e Added some C4MapScript stubs for mape 2013-03-22 22:05:58 +01:00
Sven Eberhardt 437433776f C4Landscape::InsertMaterial use ptr instead of ref for insertion pos 2013-02-18 00:48:25 +01:00
Sven Eberhardt fdaa3a7956 Fix mape build 2013-02-17 18:48:50 +01:00
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
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 263d944d5c mape: Build with debugrecs enabled 2013-01-16 02:13:38 +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 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 4aca001152 Fix warning about gtk_container_set_border_width being used with GtkBox 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
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 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 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 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
Armin Burgmeier 644f97efd3 GObectify MapeTextureMap; add functions to get texture mapping entry 2012-02-18 21:10:07 +01:00
Armin Burgmeier 81e04899dc Merge default into mape 2012-02-12 19:41:48 +01:00
Armin Burgmeier b2af6314cb mape: Don't dynamically allocate memory for each pixel to draw 2009-10-06 20:30:54 -04:00
Armin Burgmeier bc980ebc12 GObject-ified MapeMaterialMap 2009-09-30 22:54:10 -04:00
Armin Burgmeier ba740c4296 Actually committed new MapeGroup code 2009-09-30 22:53:29 -04:00
Armin Burgmeier 7b586338ef Increased version number to 1.3.90, and added license text to about dialog 2009-09-26 23:14:51 -04:00
Armin Burgmeier 12dce39aa1 Changed license headers of a few more files to ISC 
They have been left out in e3b05cfc2145 for some reason.
 2009-09-26 22:47:01 -04:00
Armin Burgmeier 45e79a3299 Removed mape/ include path, include by "mape/foo.h" instead 2009-09-26 22:43:09 -04:00
Armin Burgmeier 2d580e99d0 Follow GTK+'s single-include policy 2009-09-26 22:08:40 -04:00
Armin Burgmeier 52464df1c0 GObject-ified MapeGroup 2009-09-26 21:54:47 -04:00
Armin Burgmeier ae37dddcbf mape: Fix texture loading 
We now not only load a texture's name, but also a thumbnail of the texture
itself, which we can show in the texview later, and from which we are going
to determine the material color to draw in the preview (note that the Color
field in .c4m files went away).
 2009-09-24 23:46:14 -04:00
Armin Burgmeier a81d0e6cbb Relicense mape under ISC 
ack: Tyron, Armin
 2009-09-22 23:22:01 -04:00
Armin Burgmeier 9e81287ee5 Catch MapGenerator errors in mape, not in C4MapCreatorS2 
Where it lead to a crash eventually, since it tried to Log the error message,
and Log is only allowed from the main thread - the Landscape is rendered by a
worker thread however.
 2009-09-22 23:07:20 -04:00
Armin Burgmeier 2ef403728e Added initial mape code, and added it to the CMake build system 
The code is not yet working properly, but it compiles
TODO: autotools build, material colors, Material&Texture overload,
relicensing, maybe algo=script
 2009-09-21 00:04:52 -04:00