Commit Graph

3415 Commits (stable-5.2)
 

Author SHA1 Message Date
Martin Plicht cf18d82e36 mac: Fake revision as the official 5.2.2 release one 2012-04-04 21:26:29 +02:00
Martin Plicht 2c597ba56d mac: Fix exclusive dialogs not clickable in game mode 2012-03-25 12:08:06 +02:00
Martin Plicht a28cad6947 mac: Change version in dmg build makefile 2012-04-03 11:15:13 +02:00
Martin Plicht 1bb87d2b60 mac: Turns out, shift+mouse actions were never properly processed. Whoops 2012-03-22 21:08:19 +01:00
Martin Plicht 6d64a1a138 cmake: mac: Remove duplicated APPLE block 2012-03-20 21:46:59 +01:00
Martin Plicht 39caae97c6 mac: osx_bundle_libs bundles recursive dependencies so libogg/libvorbis conundrum solved 2012-03-25 15:30:01 +02:00
Martin Plicht 7ee45e13d8 cmake: xcode: Set prefix header dialect to c++0x if clang requested 2012-02-14 16:44:29 +01:00
Martin Plicht 597af907cb cmake: xcode: Introduce option to build with Clang 2012-02-12 16:19:39 +01:00
Günther Brammer 1904bffbd4 Added tag release-5.2.2 for changeset 14ab9fe1345a 2012-02-10 20:15:19 +01:00
Armin Burgmeier e0817719b8 Remove executable bits of non-executable files 2012-02-10 01:18:15 +01:00
Günther Brammer df0282fc72 Remove the remaining remnants of OpenSSL usage
OpenSSL sure has many names - libssl, libcrypto, libeay32, possibly more.
2011-11-03 00:37:07 +01:00
Günther Brammer 0367dabb63 Replace OpenSSL SHA1 implementation with one copied from boost/uuid
Although the code already uses boost, boost/uuid hides the sha1
implementation in a deeply nested namespace, which is just too bizarre to
use. Also the name of that namespace suggests that it is just an
implementation detail that could go away without notice.
2011-01-10 21:30:40 +01:00
Günther Brammer b660f093fc Rename C4Group_GetFileCRC/SHA1 to GetFileCRC/SHA1
These functions aren't used for files in groups and
consequently broken for them. Remove the dead code.
2011-09-15 20:16:00 +02:00
Günther Brammer a135349703 Remove C4ConfigShareware to reduce OpenSSL dependency
Conflicts:

	src/config/C4ConfigShareware.cpp
	src/config/C4ConfigShareware.h
2011-11-02 00:07:29 +01:00
Günther Brammer 0e65c78185 Remove C4GroupEntryCore::(Has)CRC, calculate the CRC on demand
The CRC was basically only used to decide which files to include in update
groups, but calculated for every group and then stored in the file on disc.
And for some unknown reason, updates themself didn't produce the right
numbers in the file.

This means that c4groups with this change cannot reproduce groups written
by older c4groups and vice versa, but this isn't necessary for updates, and
reading is compatible both ways.

Except for the ways that C4Update fails to remove the CRCs.
2012-02-08 00:12:44 +01:00
Nicolas Hake bc1f569616 cmake: Search for FMOD headers and add to include path 2011-10-28 23:49:11 +02:00
Günther Brammer 6728ab7992 Version 5.2.2 2012-02-06 21:22:08 +01:00
Günther Brammer 3790390347 win32: Fix out-of-tree setup build 2012-02-05 21:42:28 +01:00
Nicolas Hake bfdf1ec8c8 cmake: Read Mercurial revision from .hg_archival.txt if available
This way cmake will generate a correct C4Version.h from source tarballs
generated by hg archive.
2012-02-05 02:08:45 +01:00
Armin Burgmeier af7788f4f4 Update C4Group packing order
This speeds up loading of packed files significantly. It's not optimal,
though, because the order in which textures are loaded by the engine
is not known by c4group (it depends on their occurence in the Scene.material
file). This could be fixed by specifying custom packing orders for every
object we have. But then again maybe switching to a different format which
allows for random access might be more worth it.
2012-02-04 22:08:38 +01:00
Armin Burgmeier 76baf72dfa Generate packed groups only at make install or make setup
But not for regular make when just compiling the source code.

Conflicts:

	CMakeLists.txt
2012-02-03 22:22:25 +01:00
Nicolas Hake 8f0a3a6d5c Fix dangling pointer on temporary pack of player file on join (#706)
I hate StdStrBuf. It's just close enough to any sane string class that you think
it does reasonable things, then when you don't look it will turn around and stab
you in the back with a rusty fork.
2012-02-03 14:36:17 +01:00
Günther Brammer 2847569a12 win32: Add a firewall exception on installation
Conflicts:

	Makefile.am
2011-10-30 16:17:40 +01:00
Günther Brammer 8baf5d7ced win32: Every install location gets it's own uninstall entry 2011-11-01 20:46:48 +01:00
Günther Brammer 6b484eb2e5 win32: Installer uses a per-installation game explorer guid 2011-11-01 20:37:58 +01:00
Günther Brammer dd7a9eb0e4 win32: Fill in Games Explorer XML data from Version.txt 2011-10-31 01:31:56 +01:00
Günther Brammer 03d6d785b9 win32: register with the Game Explorer 2011-10-30 16:16:14 +01:00
Armin Burgmeier 387446c57d Add a copy of MultiUser.nsh patched for installation of 64 bit binaries 2012-02-02 22:24:35 +01:00
Armin Burgmeier fc598e79dc Fix timsort so that it compiles with Visual Studio 2012-02-01 23:03:29 +01:00
Armin Burgmeier a2fb35c985 Replace std::sort by timsort for Face ordering
The usage of timsort instead of std::sort at this point is twofold.  First,
it's faster in our case where the array is already sorted in many cases
(remember this is called at least once a frame). And it's not just a bit
faster either but a lot. I have measured a factor of 7 on my system.

Second, in our Windows autobuilds there is a crash within std::sort which is
very hard to debug because it's hardly reproducible with anything other than
the autobuilds (I tried hard). If the crash goes away with timsort then
great, if not then maybe it's easier to debug since the code is in our tree.

Conflicts:

	CMakeLists.txt
	src/lib/StdMesh.cpp
2012-02-01 22:11:46 +01:00
Armin Burgmeier 031db9d065 Enable face ordering individually for all submeshes 2011-10-15 21:35:39 +02:00
Julius Michaelis 5d46424208 Reduce bubble count (#627) 2011-09-06 21:21:10 +02:00
Armin Burgmeier 40df45eb02 Don't print an error message for ERROR_PATH_NOT_FOUND in DirectoryIterator::Read
We do the same already for ERROR_FILE_NOT_FOUND. This fixes a harmless warning
when running the engine in a release directory where there is no planet/
directory.
2012-01-28 18:15:51 +01:00
Armin Burgmeier 8ceac9e3d2 Don't do wildcard matching and other fancy stuff in C4DefList::Load
Instead just attempt to load the filename given. This function is only
used from two places: C4Game::InitDefs and C4Game::DropFile. In both
cases segments and wildcard matching is neither needed nor desired.

This fixes a problem with loading definitions when the Clonk installation
resides in a directory with paretheses, such as C:\Program Files (x86)\.
This might well fix the problem in http://forum.openclonk.org/topic_show.pl?tid=905.
2012-01-28 00:33:28 +01:00
Armin Burgmeier df710e6c41 Win32: Allow forward slash as separator when loading local definitions
This leads to an obscure error otherwise where local definitions are skipped
from loading when running the scenario as clonk.exe Tutorial.ocf/Tutorial01.ocs.
The scenario loads fine as such but some definitions are missing and therefore
it doesn't work properly. See also http://forum.openclonk.org/topic_show.pl?tid=905.
2012-01-27 23:21:03 +01:00
Peter Wortmann d5cf613cc1 Ensure that even with workarounds #version is always first directive in shader
This fixes workarounds for some drivers. Most notably mine. Now if only
it wouldn't fail silently...
2012-01-24 00:17:37 +00:00
Peter Wortmann d795f983bb Cap material store once objects can't be collect any more
This means that if the Clonk digs Earth but has a full inventory at the time
(so we can't generate Earth chunks), digging another material later can never
yield more than one Earth chunk.
2012-01-21 17:33:00 +00:00
Nicolas Hake 0fe9cb41cd C4FO: Make sure object has an action before testing its properties (#704) 2012-01-10 16:17:37 +01:00
Armin Burgmeier a5db0007c6 Fix build against recent zlib 2012-01-09 21:28:07 +01:00
Nicolas Hake c502ff6091 Aul: Make sure CreateConstruction id parameter is valid (#702) 2012-01-03 21:57:55 +01:00
Armin Burgmeier 0b2e7d6230 Print a warning instead of a failed assertion if C4Network2IO broadcast fails 2011-12-29 21:51:52 +01:00
Maikel de Vries 01e79fa307 LandscapeRender: fixed off by one for shader warning
By PeterW
2011-12-29 18:24:55 +01:00
Armin Burgmeier 1687665806 Synchronize the order of Definition() calls 2011-12-29 17:04:57 +01:00
Günther Brammer 5de72042fe Add a few missing "new"s to "throw NeedObjectContext" statements
The catch in C4AulExec only catches pointers, so without the new the
exception isn't caught.
2011-10-14 02:51:20 +02:00
Günther Brammer fd4bf9caa5 cmake: Replace redundant custom targets with a DEPENDS on the groups target
For some reason, add_dependencies didn't work for making the groups target
depend on the custom_commands, but specifying them via DEPENDS works.
2011-11-05 23:07:11 +01:00
Günther Brammer 24a146daa6 c4group -t: remove destination before packing group 2011-11-02 21:33:38 +01:00
Günther Brammer d5ba2f4b2e cmake: Always pack groups during build
This fixes make install, which previously tried to install nonexistant
packed groups from the source directory. Make it use the ones from
the build directory and build them during make all.
2011-11-02 01:43:36 +01:00
Nicolas Hake 3ac1d08465 Do not throw from DirectoryIterator::Read (#681) 2011-10-29 01:16:13 +02:00
Armin Burgmeier 283c6f2a94 Fix a crash when a mirrored animation has a track for only one pair of bones 2011-10-12 21:13:13 +02:00
Armin Burgmeier 801b10881b Apply animation mirror to bone translation of all keyframes 2011-10-12 20:50:27 +02:00