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

6800 Commits (stable-6.1)
 

Author SHA1 Message Date
Maikel de Vries 41040eebfd clean up dynamite box and fix (#1265) 2015-02-15 21:33:52 +01:00
Nicolas Hake a70433b6a7 Skip drawing line objects with less than two vertices (#1263) 
A line object must have at least two points to plot a line through. At
any vertex count less than that, we were accessing invalid memory by
dereferencing the first element of an empty vector (VtxNum==1), or
issuing an OOB read from the vertex data (VtxNum==0).
 2015-02-15 14:23:44 +01:00
Maikel de Vries 7f79c77af6 fix javelin direction when aiming 2015-02-15 12:25:03 +01:00
Maikel de Vries 6cd3b9775c fixed power need symbol display for elevator 2015-02-15 09:34:45 +01:00
Sven Eberhardt a7ecc86dc4 Hide normal maps from landscape drawing texture list in editor. (#1255) 2015-02-14 23:45:16 +01:00
Nicolas Hake 9093bde491 Suppress -Wcast-align on clang 
Alignment doesn't matter on any platform we support, and unlike gcc,
clang uses natural alignment instead of required alignment to emit this
warning.
 2015-02-14 19:45:32 +01:00
Maikel de Vries a5b6066f25 fix removal of ownership on flag movement 2015-02-14 00:16:32 +01:00
Nicolas Hake cdd490b53c Set some warning flags when compiling with clang 
The Clang warning flags are woefully underdocumented, so I've just
matched the g++ list in as much as I knew the flags existed.
 2015-02-14 00:11:51 +01:00
Nicolas Hake 2b332f5a74 Adapt mape to C4Group changes 2015-02-13 20:22:41 +01:00
Nicolas Hake 09ad403d06 C4Group: Stop checking operator new return value 
new throws std::bad_alloc on failure. It never returns NULL, so checking
for that is useless.
 2015-02-13 19:46:11 +01:00
Nicolas Hake 48626ce7ae C4Group: Change int Status members to enums 2015-02-13 18:49:23 +01:00
Nicolas Hake 340e0e3f64 Remove unused C4Group::GetStatus 2015-02-13 18:37:20 +01:00
Nicolas Hake 413e66ff97 Move C4Group::PrintInternals out of C4Group 
C4Group::PrintInternals is only used in the c4group command line tool.
Move the code there.
 2015-02-13 18:25:21 +01:00
Nicolas Hake c1e113f1f9 c4group: Remove useless version history 
A list of versions and dates isn't helping anyone, especially not if
no actual changelog is available.
 2015-02-13 17:21:49 +01:00
Nicolas Hake 73862d8fcb Move C4Group::View out of C4Group 
C4Group::View is only used in the c4group command line tool, so the
right place for that code is inside the tool. Added two public constant
accessors to return the header data and entries.
 2015-02-13 17:19:37 +01:00
Nicolas Hake ff263e5433 Fix potential buffer overflow in ssprintf 
If vsnprintf fails for other reasons than too small a buffer, it returns
a negative value. Comparing that with a size_t value promotes the
negative value to unsigned, which makes for a very large result, almost
guaranteed to be larger than the buffer size.
 2015-02-12 23:55:38 +01:00
Nicolas Hake 95641b5fb0 Add a dummy declaration to ssprintf 
G++ doesn't allow attributes on function definitions for reasons. Add a
declaration immediately before the definition so it works.
 2015-02-12 23:14:16 +01:00
Nicolas Hake e21a5bdd44 Rename BoundBy to Clamp 
"BoundBy" sounds like a predicate. "Clamp" is a common function name for
the operation in graphics processing, so it should be familiar to users.
 2015-02-12 23:05:55 +01:00
Nicolas Hake 35e7ca509b Replace NoPointer struct with template parameter deduction 
We're trying to ensure that no caller passes a char* to ssprintf, but a
char array instead. This is way easier done by using template parameter
deduction than a specialized class template.
 2015-02-12 22:25:36 +01:00
Nicolas Hake 69cdae5ef2 Use find_package instead of raw include to find libraries 2015-02-12 20:09:58 +01:00
Maikel de Vries de8ee9d840 fix flag removal effect on power network 2015-02-11 22:42:35 +01:00
Nicolas Hake ea354218bb Remove unused private field StdMeshMaterialShader::Type 
We'll keep the parameter just in case we'll ever need the info.
 2015-02-11 20:48:18 +01:00
Nicolas Hake 2d1e4caabc Remove a superfluous endianness test 
We're not supporting BE systems, and even when we did, I'm not sure this
test could ever have done something.
 2015-02-11 20:41:35 +01:00
Maikel de Vries cba73bafca implement flag ownership and network change on team switch and hostility change 2015-02-11 00:02:45 +01:00
Maikel de Vries 45a8c02cd0 clean up the animal library 2015-02-11 00:02:45 +01:00
Armin Burgmeier 8825b2c2fb Interpret normal maps for meshes in Clonk coordinates, not OGRE coordinates 2015-02-09 21:18:47 -05:00
Armin Burgmeier bcaa2399eb Fix shader compilation on old Intel drivers 
See http://forum.openclonk.org/topic_show.pl?pid=28313#pid28313
 2015-02-09 20:10:40 -05:00
Maikel de Vries 7f79caade5 flag library: fix on owner change and clean up 2015-02-09 19:32:15 +01:00
Maikel de Vries b7b6b187f7 clean up gold seller library 2015-02-09 19:32:15 +01:00
Nicolas Hake 81f9ee1c85 Reset C4Group search after Add() to invalidate stale directory cache 
Adding a file to an on-disk unpacked C4Group file needs to reset the
directory cache so C4Group doesn't return old state later.
 2015-02-08 22:28:33 +01:00
Nicolas Hake 06d86f7666 Split a return into multiple statements to make it less unreadable 
IOCCC is that way ------->
 2015-02-08 22:28:32 +01:00
Maikel de Vries e47a08aaf7 clean up more flag related libraries 2015-02-08 15:28:13 +01:00
Nicolas Hake 3f5efe65ad Tests: Link winmm 2015-02-08 15:05:14 +01:00
Nicolas Hake 849f8fe98d GTest: Also accept fused sources 2015-02-08 15:05:12 +01:00
Nicolas Hake 1a1cecadd4 Update license texts 
Some files, most notably ObjC and test cases, hadn't been updated to use
the new license header. Fix this.
 2015-02-08 15:05:11 +01:00
Nicolas Hake 0076fc7d7b Fix DbgHelp check 
CMake didn't always find the correct DbgHelp.lib on Win64. Somehow,
nobody seems to have noticed!
 2015-02-08 15:03:08 +01:00
Maikel de Vries 37eb7a0095 make flag marker id consistent with other libraries 2015-02-08 13:35:26 +01:00
Maikel de Vries f2794d335f move ownable library into flag group 2015-02-08 13:35:26 +01:00
Sven Eberhardt bcd821a786 Fix construction menu opened at wrong position. (#982). 
It was always opened at the last mouse position of the owner of the hammer. Fixed it to use the controlling player instead.
 2015-02-08 13:31:51 +01:00
Maikel de Vries ce37dc181e clean up of the flag library 
This might have fixed the appearance of flag markers at the flag's center.
 2015-02-08 13:07:56 +01:00
Sven Eberhardt cd3b969fc4 Silence a few warnings in render and SolidMask code. 2015-02-08 12:37:00 +01:00
Sven Eberhardt 4e65dccb1f Fix memory leak on CID_Animation_BaseInfo mesh chunk type. 
Detected by a -Wunused warning.
 2015-02-08 12:35:45 +01:00
Sven Eberhardt e05c7de976 Flag UPnP includes as system to suppress warnings. 2015-02-07 22:46:52 +01:00
Sven Eberhardt f032662052 Mark getopt and tinyxml thirdparty includes as system libraries. 
This should silence some warnings occuring in thirdparty code so warnings in our own code get the exposition they deserve.
 2015-02-07 22:02:42 +01:00
Maikel de Vries 38e0e0d299 add a test for testing power system performance 2015-02-07 18:17:49 +01:00
Nicolas Hake 3136c90ded Solve the problem of Wsign-compare from timsort.h 2015-02-07 17:41:57 +01:00
Nicolas Hake e4fea50a9a Mark thirdparty as system headers so we don't get warnings from there 
thirdparty needs to be pristine code so we can update those libraries
without having to figure out whether we need to apply some more patches.
This means we can't easily fix warnings in there; telling GCC that these
are system headers means it won't emit any.
 2015-02-07 17:39:15 +01:00
Nicolas Hake bf1e02872d Revert "Avoid signed/unsigned comparison in mesh sorting." 
This reverts commit 01b47bae8e.
 2015-02-07 17:35:11 +01:00
Sven Eberhardt 01b47bae8e Avoid signed/unsigned comparison in mesh sorting. 2015-02-07 17:02:17 +01:00
Sven Eberhardt df97b485f9 Fix group loading order for definitions, sounds and graphics (#1253). 
Graphics are now pre-loaded and may then be accessed in random order. Reduces Objects.ocd load time from 20 seconds to 1 second for me.

Some ordering is still broken (e.g. material.ocg and player files).
 2015-02-07 14:01:15 +01:00