Commit Graph

5841 Commits (b1292a3421876416bf9d317391268215dfdad0f2)
 

Author SHA1 Message Date
Günther Brammer b1292a3421 cmake: The netpuncher can use the Scheduler source files from libmisc 2014-05-28 03:38:11 +02:00
Günther Brammer 7c38154837 cmake: Use builtin support for .rc compilation on mingw
This requires CMake 2.8.4.
2014-05-28 03:38:11 +02:00
Günther Brammer 42602fc79a Finish DEBUGREC compile option removal
Except for the DEBUGREC_RECRUITMENT option available in C4Include.h
2014-05-28 03:38:11 +02:00
Kevin Zheng e129005b0e Let CMake determine the location of the targets to install 2014-05-28 00:46:53 +02:00
Maikel de Vries e73de734d1 added basement to worlds' player knowledge 2014-05-27 20:21:43 +02:00
Kevin Zheng df523d502c Fix typo in Crash.ocs scenario description 2014-05-27 00:31:40 +02:00
Kevin Zheng 6a1a551d01 Clean up deprecated headers and functions
"gdk_pixbuf_unref has been deprecated since version 2.0 and should not be
used in newly-written code. Use g_object_unref()."

sys/timeb.h isn't used anymore since 2005.
2014-05-27 00:30:20 +02:00
Maikel de Vries 0426ae7872 added basement as a structure
A feature to be added is that it automatically attaches to existing structures.
2014-05-26 22:23:47 +02:00
Maikel de Vries 6ba0164c5b removed unnecessary defcore Value entries
Completely unneeded for structures and many other objects.
2014-05-26 21:38:32 +02:00
Maikel de Vries 66f8454b67 allow for constructing just below surface
Useful for basements and maybe also other structures in the future.
2014-05-26 21:28:07 +02:00
Günther Brammer 023f2dd5b0 Update dependencies list in the README
Also remove mention of PATH from windows installer section - CMake finds
makensis using the Registry when it isn't in the PATH.
2014-05-25 22:47:56 +02:00
Günther Brammer 38f6c1802b Remove unused MSVC project files for tstc4netio and netpuncher 2014-05-25 22:47:56 +02:00
Günther Brammer 130a275dea Correct a comment about GetDataString safety 2014-05-25 22:47:56 +02:00
Kevin Zheng f76856ae97 Use the Linux paths for everything that isn't a Mac or Windows
Specifically, FreeBSD. Assuming something POSIX-like if there is no
specific code for the target OS is a good idea in general, though.
2014-05-25 22:47:56 +02:00
Julius Michaelis e6d7d0e7eb Add a few more things to the player knowledge in the settlement
tutorial.
2014-05-25 15:36:35 +02:00
Maikel de Vries 7737759ffb fix ShuffleArray() function 2014-05-19 20:20:20 +02:00
Sven Eberhardt 6e8b6a8e74 Added center vertex to pipe head.
So it doesn't get stuck in places where it cannot pump from.
2014-05-18 22:06:30 +02:00
Sven Eberhardt 91c2d49d2a Remember league login name and password token.
Also removed some CUID/Webcode authentification code from engine.
2014-05-18 15:10:00 +02:00
Sven Eberhardt efcdf6fa68 Fix hanging network thread due to timing calculation errors in UDP network class.
GetNextTick() may sometimes return a tick in the past, which calculations need to consider.

This might also fix #1076.
2014-05-18 13:41:47 +02:00
Sven Eberhardt 75a626efd2 Added Decoration.ocd to CMakeLists. 2014-05-12 09:26:42 +02:00
Günther Brammer 73c6931cfb Give g++ 4.9 a chance to prove that it has working <regex>
The -std=gnu++0x-Flag was removed from the compiler flags before
testing the <regex> header, and so just re-confirmed that <regex>
didn't work in previous C++ standards.
2014-05-12 02:24:19 +02:00
Günther Brammer 3e7d0ba1ff win32: Fix installer generation from MSVC
f897e95071 broke this by reusing the macro with the path to the binary
as the binary name, which doesn't work if the path contains directories.
Also, 0dcfe72148 moved the binaries, but the LOCATION property still
pointed to the old location. Luckily, CMake also has a non-broken option to
pass target file paths to custom commands.
2014-05-12 02:24:19 +02:00
Günther Brammer b7a022852e Revert "Move C4Aul code into separate subdirectory"
The distinction between the "aul" and "non-aul" parts of
the script engine are mostly historical accident, and the
current organization of the source code does not use
sub-subdirectories. I'd like to keep it that way.

This reverts commit 69ba06b8d0.
2014-05-12 02:24:19 +02:00
Günther Brammer 52dbf8e585 Revert "Use pkg-config to get linker flags for SDL_mixer"
This reverts commit 9941388526.

The breakage was just due to me using an outdated library list.
2014-05-12 02:24:19 +02:00
Clonkonaut a5040fe0ad Fixed potential crash in certain doomsday scenarios. 2014-05-11 22:04:51 +02:00
Sven Eberhardt 68c297c210 Sorted decoration from scenarios into main decoration folder. 2014-05-11 16:27:13 +02:00
Nicolas Hake 69ba06b8d0 Move C4Aul code into separate subdirectory 2014-05-11 16:17:48 +02:00
Sven Eberhardt 148e27ebce Minor changes to HeartOfTheMountain
* starting platform area increased
* recreate tools instead of just moving them into clonk's inventory on respawn (to help with burned grapple bows)
* spawn clubs instead of swords [Maikel]
* do not kill clonk on Ctrl+F9
2014-05-11 15:49:18 +02:00
Sven Eberhardt 488044f266 Added script function GetPlayerZoomLimits (#1071). 2014-05-11 11:10:13 +02:00
Sven Eberhardt 893d5e87da Implement PLRZOOM_Set flag to allow setting current zoom and limits in the same call. 2014-05-11 10:30:41 +02:00
Sven Eberhardt cd8ab67c14 Copy static variables assigned in Objects.c to the scensario script to avoid problems in savegames.
Static variables in Objects.c are problematic because Objects.c is deleted in savegames.
2014-05-11 10:09:11 +02:00
Sven Eberhardt 93ea6cb6c2 DarkCastle: Fixed object duplication and solidmasks in some decoration objects 2014-05-11 10:02:04 +02:00
Sven Eberhardt c267ae39e0 Added IceHit sounds, which is slightly less plingy than the gem hit sound.
I didn't like using the GlassHit sounds because having the same sound for ice and gems makes the latter feel less unique and valuable.
2014-05-10 18:41:09 +02:00
Sven Eberhardt ba23c6e022 TreasureHunt moved from experimental to missions 2014-05-04 19:19:45 +02:00
Nicolas Hake 0f48e0c4b9 Aul: ExtraWarn when turning a fn varargs in body
Par() calls and '...' in function calls make functions take varargs
without this being obvious from the header. ExtraWarn about this so people
who care about it can add an ellipsis to the parameter list.
2014-05-04 17:15:43 +02:00
Nicolas Hake 8ab7a83e3b Aul: Allow '...' as final parameter in func decls
Accepting an ellipsis as the final parameter in a function declaration
makes it immediately obvious that the function can take a variable number
of parameters
2014-05-04 17:15:42 +02:00
Sven Eberhardt 6040dde80a Cleaned up airship: Extra graphics object and unnecessary timers removed. 2014-05-04 14:16:46 +02:00
Sven Eberhardt 91db5d33c2 Added SolidMaskPlane property.
If an object moves and other objects are attached to its SolidMask, only objects in front of this plane are moved along with it. Defaults to Plane if zero.
2014-05-04 14:16:46 +02:00
Sven Eberhardt 4f43da9999 Fix SolidMasks defined in DefCore.txt for objects with mesh graphics.
There were a few leftover checks from when SolidMasks could only be defined for definitions with bitmap graphics.
2014-05-04 14:16:46 +02:00
Julius Michaelis 1b1fa1643b Fix grenade launcher ammo check 2014-05-03 21:03:19 +02:00
Nicolas Hake 48c1f387f0 Require semicolon after 'do' loop
This makes C4Script consistent with C-based languages, and current usage
on master shows that in the majority of cases, the author expected to have
to place a semicolon after the loop anyway.
2014-05-03 10:07:41 +02:00
Clonkonaut e3bf5110ed Fixed restart rule (#1072). 2014-05-02 02:04:04 +02:00
Clonkonaut d70f8e1de2 Removed 4 lines of useless code. 2014-05-02 00:53:56 +02:00
Clonkonaut c35c352c46 Fixed clonk freezing in mid-run when building loam bridges (#943). 2014-05-02 00:52:20 +02:00
Clonkonaut 5f2c9ca8cb Merge branch 'master' of ssh://git.openclonk.org/openclonk 2014-05-02 00:03:05 +02:00
Clonkonaut 964e1a138a Deathmatch goal ends game when all but one player (or team) leave (#893). 2014-05-02 00:01:21 +02:00
Sven Eberhardt 79edc9917a Fix crash on DugOut callback if an unloaded definition is referenced in material Dig2Object. 2014-05-01 17:15:14 +02:00
Clonkonaut bf0d6b7176 Reactivated EditCursorModeToggle key (formerly Space) now set to no key.
Can be set in KeyConfig.txt as requested by Sven2.
2014-05-01 01:17:58 +02:00
Clonkonaut 3d224c1207 Added new callback: DugOut(object object_by).
Called in a new object that is created from digging out material.
2014-05-01 01:04:41 +02:00
Clonkonaut 4d05a01920 Documentation added for DigOutObject callback. 2014-05-01 00:58:11 +02:00