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

3518 Commits (5ddc76afa6c21b6acb148383b31dd13a2ab0f722)
 

Author SHA1 Message Date
Nicolas Hake 5ddc76afa6 Mercurial: Users with EOL extension now always check out planet with LF endings 
See http://forum.openclonk.org/topic_show.pl?pid=15005#pid15005 for reference
 2011-11-10 18:21:34 +01:00
Nicolas Hake 0dcfe72148 MSVC: Build all binaries directly in build dir 
With this change, MSVC will build binaries in ${CMAKE_CURRENT_BINARY_DIR}
without adding any more subdirectories. It will also expect its data in a
directory called "planet" immediately below the binary directory.
Since MSVC allows building multiple configurations from the same input file,
the resulting binaries will be suffixed by the configuration type. An exception
is RelWithDebInfo, which will have no suffix; this was chosen over plain Release
to aid in debugging.

Building OpenClonk will work out of the box for in-source builds, but
out-of-source builds will have to create a symlink or a directory junction.
We consider this an acceptable drawback; it was proposed that if you use the
non-default option of an out-of-tree build, you will also know how to create a
link or a junction to, or copy the planet directory.

This changeset also revives looking for game data in the same directory as the
binary, which was part of c3fc1ee1ec8c [Peter Wortmann].
 2011-11-10 02:01:21 +01:00
Nicolas Hake 74620be240 Backed out changeset: c3fc1ee1ec8c 2011-11-10 02:17:00 +01:00
Peter Wortmann d5c075ade8 Yet another variant on how to find data files 
This time, the relocation code checks for a "System.c4g" in either
the executable path or a "data" folder directly below. CMake makes
sure that this points somewhere sensible for normal builds.

TODO:
* Check whether this actually works under Unixes. Can "ln -sf"
  delete important stuff? Is there a safe alternative?
* Further unify with the Mac Os solution. Other platforms might
  auto-pack for release builds too, for example - and it might
  be a good idea to have a proper data subdirectory in Mac bundles
  as well.
 2011-11-09 00:45:07 +00:00
Günther Brammer cd93daf8b9 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
Peter Wortmann 638cb919d4 Fixed line drawing coordinate rounding 2011-11-08 16:22:39 +00:00
Felix Wagner 3da392888c Moss & Lichen added, Lichen graphic needed 2011-11-05 01:49:15 +00:00
Felix Wagner 1478eaf152 Removed Log 2011-11-05 01:48:13 +00:00
Felix Wagner 7a74abae0d Typo 2011-11-05 01:47:09 +00:00
Günther Brammer 29ff51b16d 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 91e3a0ca07 Remove unused EraseFiles and EraseItems functions 2011-11-02 21:34:04 +01:00
Günther Brammer cb3ae45c2f c4group -t: remove destination before packing group 2011-11-02 21:33:38 +01:00
Günther Brammer d709de7e73 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
Günther Brammer ccbf4d1d45 Consolidate duplicated simple Log functions 
The various small utilities do not use the engine Log implementation but
one that simply prints to stdout. Instead of duplicating that one, link a
common one into the utilities.
 2011-11-02 21:36:39 +01:00
Günther Brammer b911630578 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 3c41310fa3 Remove C4ConfigShareware to reduce OpenSSL dependency 2011-11-02 00:07:29 +01:00
Günther Brammer 7a63fc0ade C4ChatDlg: Use EnsureUnicode() instead of a custom half-implementation 2011-11-01 23:19:03 +01:00
Günther Brammer 5f2f995852 Unify the #include blocks a little bit 
One line for C4Include.h, one for the .h corresponding to the .cpp, one
empty line, the other C4* includes, another empty line, external headers.
 2011-11-01 23:17:41 +01:00
Nicolas Hake 7c34fa9121 Replace RGB player color selection with an HSV chooser (#679) 2011-10-30 20:43:45 +01:00
Nicolas Hake af8cc1320f Do not throw from DirectoryIterator::Read (#681) 2011-10-29 01:16:13 +02:00
Nicolas Hake f9f01bef9a cmake: Search for FMOD headers and add to include path 2011-10-28 23:49:11 +02:00
Charles Spurrill d9a02eaf14 Carry-Heavy system added 2011-10-26 14:03:12 -07:00
Charles Spurrill 2a04127c2c wooden cabin Components defined properly; better texture 2011-10-26 13:41:03 -07:00
Charles Spurrill 4272b0e5ea Player Options Dialogue Box: Ink markings aren't offset 2011-10-25 15:14:32 -07:00
Charles Spurrill 4ce3b0d477 Clonk can't turn around whilst rolling 2011-10-25 15:01:27 -07:00
Günther Brammer 5f5f2f3975 Fix definition drag-n-drop from file manager to editor viewport 2011-10-21 22:56:26 +02:00
Felix Wagner f812208711 Axe: interrupt chopping if clonk does something else than IsWalking 2011-10-21 21:17:03 +01:00
Felix Wagner abcee8afa3 Plant library: RootSurface() limits for positioning added 2011-10-21 21:16:44 +01:00
Felix Wagner cf71fb48b6 Plant library: renamed CanBeHarvested -> IsCrop 2011-10-21 21:14:51 +01:00
Günther Brammer 7dcc36b27a Post-release version bump 2011-10-21 20:35:06 +02:00
Günther Brammer 78b6f73efe docs: Update Sound() for recent changes 2011-10-21 20:19:26 +02:00
Charles Spurrill fbb8440b7e Sawmill animation is no longer jumpy 2011-10-20 14:05:26 -07:00
Charles Spurrill 66e261572b Boompack doesn't weigh so much 2011-10-20 01:53:27 -07:00
Felix Wagner 2017d4bd44 Standard smoke particle (to use in Smoke(x,y,strength)) 2011-10-20 00:42:35 +01:00
Felix Wagner 096c07a251 Sawmill added. Just push chopped trees in front of it. 2011-10-20 00:42:32 +01:00
Felix Wagner 60f9064d8e Removed hit sound for mushroom (was a horrible idea) 2011-10-20 00:42:28 +01:00
Charles Spurrill 3e5a4f46d5 Fixed stupid mistake in airship script I made 2011-10-19 15:35:14 -07:00
Günther Brammer 8af0bb03be docs: Updates for Physical and Category changes 2011-10-20 00:26:22 +02:00
Charles Spurrill 3439704dc0 Airship: Draws over clonk, solidmask position fixed, and smoke emits properly 2011-10-19 14:36:17 -07:00
Charles Spurrill 23d2508602 fixed shovel topology 2011-10-18 17:07:43 -07:00
Charles Spurrill ec1e9fba5c Fix orangey-ness of hammer and boompack 2011-10-18 15:40:44 -07:00
Günther Brammer ed6eeb3179 Update README.linux.txt for the search path changes and other stuff 2011-10-18 23:57:00 +02:00
Charles Spurrill 8925f85af1 Sword is finally shaded like it is supposed to be :) 2011-10-17 03:59:42 -07:00
Charles Spurrill a611d019ba HaseFuse() for objects that are lit to detonate. Only used by cannon for now. 2011-10-17 03:29:15 -07:00
Tobias Zwick e8a5a3645e updated licenses 2011-10-16 18:30:57 +02:00
Charles Spurrill e4c08a7288 Nugget and Ore are IsFoundryIngredient() 2011-10-16 09:48:13 -07:00
Nicolas Hake d5669964b8 tests: Fix on linux-gcc 2011-10-16 14:17:43 +02:00
Charles Spurrill f1d07f8449 Foundry only collects objects that are IsFuel() or IsFoundryIngredient() 2011-10-15 18:03:13 -07:00
Armin Burgmeier e44b216230 Enable face ordering individually for all submeshes 2011-10-15 21:35:39 +02:00
Charles Spurrill 3fab3265f9 Fixed bug where clonk could hold other items when chopping trees 2011-10-15 11:58:47 -07:00