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

2256 Commits (stable-5.1)
 

Author SHA1 Message Date
Günther Brammer 3fe8c353e7 Added tag release-5.1.2 for changeset 231524eaec9a 2011-02-11 15:32:46 +01:00
Günther Brammer 588ba69052 Version 5.1.2 [4] 2011-02-11 15:32:03 +01:00
Julius Michaelis 5ef3991e7b console mode: Make CStdWindow::Init succeed 
This solves the problem introduced with "Fix stable branch compile errors".
 2011-02-11 15:26:53 +01:00
Günther Brammer 59514d0123 crew: Default Infocores without Physical information to the Clonks defaults 
This makes Crews that were used with the 5.2 branch usable with 5.1.x.
 2011-02-10 15:33:12 +01:00
Günther Brammer e989553435 sdl: update for refresh rate API changes 2011-01-24 23:32:51 +01:00
Günther Brammer 6e0d2ad391 console mode: Fix compilation without libreadline 2011-02-04 00:16:45 +01:00
Günther Brammer 801cf1b8b3 Flush stdout after every log line even without a terminal 2011-02-04 00:15:52 +01:00
Charles Spurrill d7f01fc0d2 Cannon and lorry don't fall off the sides of the map 2011-02-02 16:08:48 -08:00
Maikel de Vries 066caf1509 Objects: Fixed #554, respawn container does not spawn weapons anymore 2011-01-31 19:09:13 +01:00
Julius Michaelis 1e3dc0fe4d dedicated: fix CMake and object loading (thanks ck and Guenther) 
Conflicts:

	CMakeLists.txt
 2011-01-30 21:44:54 +01:00
Nicolas Hake d3d5e77f69 Only select display modes with the configured color depth 2011-01-31 14:37:32 +01:00
Nicolas Hake e9d9e7c178 win32: Default to current desktop display settings (#484, #493) 
Previously, the graphics code tried to set a refresh rate as close to
85 Hz as possible. This led to black screens when the display driver
would report a refresh rate that was not actually supported by the
monitor.
This change also uses the currently set monitor orientation, instead
of always selecting a non-rotated display mode.

Conflicts:

	src/gui/C4StartupOptionsDlg.cpp
 2011-01-20 15:43:19 +01:00
Günther Brammer b3a34fea69 editor/gtk: Save the clipboard on exit 
Normally, this is done by gtk_main with a private function. Since Clonk
does not use gtk_main, that function is copied and slightly changed to use
the public API and compile as C++.
 2011-01-16 21:30:59 +01:00
Günther Brammer b03f6381fb Script: == works when one side is an object with proplist type label 
I don't actually know how to get to that situation in script, but when it
happens, everything else expecting an object would correctly accept it
despite the proplist label.
 2011-01-15 23:03:01 +01:00
Charles Spurrill d55609e633 very slightly improved texture for wooden cabin 2011-01-14 17:17:22 -08:00
Maikel de Vries 9b26363e52 Objects: Fixed a possible runtime error in the Parkour goal 2011-01-14 22:32:50 +01:00
Günther Brammer 503172bf99 Fix a mismatched malloc/delete resulting from StdStdBuf::GrabPointer usage 2011-01-12 19:58:33 +01:00
Martin Plicht 7725a9290a C4GamePadCon: Fix some method signatures and a preprocessor directive 2010-12-24 14:18:51 +01:00
Günther Brammer fdcb1dfb19 console mode: Fix all the obvious compile errors 
One of them even affected any engine configured without OpenGL support.
 2011-02-08 23:12:30 +01:00
Günther Brammer 608b76a44a x11: Restore argc/argv saving accidentally removed two commits ago 2011-01-10 15:52:50 +01:00
Günther Brammer 031345c1ac console mode: Fix stable branch compile errors 2011-02-09 00:16:58 +01:00
Günther Brammer 7dd368086e console mode: Move keyboard input to CStdInProc, make it compile again 
Conflicts:

	src/editor/C4Console.cpp
	src/platform/StdMacApp.mm
 2011-02-08 22:51:23 +01:00
Günther Brammer 1ce90e97e5 Edge: Remove a stray ActMap.txt 2011-01-04 15:39:26 +01:00
Günther Brammer 654d29120a Script: Add DigFreeMat 
So that one can script magical winter services or whatever else that
requires removing just some specific materials.
 2011-01-02 02:14:45 +01:00
Günther Brammer 7a63dc8878 scheduler: Only execute one proc per poll call 
The Execute callback could create a new proc which made the poll results
and proc list disagree, confusing the loop.
 2011-01-07 00:22:44 +01:00
Günther Brammer cf52e9d395 config: Remove General/Definitions 2011-01-04 17:39:52 +01:00
Tobias Zwick 867935d691 make sword work correctly with gamepad controls 2011-01-03 21:20:01 +01:00
Tobias Zwick 957f865cfa fixed pressing use1/use2 on gamepad when no item is selected (#535) 2011-01-03 21:15:19 +01:00
Armin Burgmeier 9a15b99753 Fix crash when both shaders and FoW are enabled (#549) 
PerformBlt and BlitLandscape did not clean up the GL state properly as the
texcoord pointer for texture 3 was still set and enabled but pointing to
nowhere anymore.
 2011-01-02 20:33:45 +01:00
Maikel de Vries 08ae037534 Objects: Fixed parkour short description 
This was due to a false ordering of checkpoints in the cp_list, not that this ordering still doesn´t function if SetCPMode() is used alone.
 2011-01-02 12:49:50 +01:00
Nicolas Hake 12f6255453 win32: Do not throw exceptions from WinMain 2011-01-02 03:50:06 +01:00
Nicolas Hake 2f6aaa9133 win32: Do not use SEH in WinMain because it needs stack unwinding 2011-01-02 03:44:07 +01:00
Nicolas Hake 6d6633e576 Correctly specify type of GenerateDump 2011-01-02 03:41:20 +01:00
Armin Burgmeier 651153d814 Add a CMake option for generating mini dumps 2011-01-02 01:20:52 +01:00
Maikel de Vries 34c41dc837 Overcast: Removed double Scenario.txt Sky entry 
Caused a warning in the logs.
 2011-01-01 22:32:31 +01:00
Sebastian Rühl 1fd6f2f057 Use cmake in the debian build, and add hg as a build dependency 
* Mercurial as Build Dependency
  * Switch to cmake as build system
  * Fixed spacing issues in $(CURDIR)
 2010-12-31 15:41:41 +01:00
Maikel de Vries dcf8ef75f3 Cool Cavern: Finetuned landscape and TopOpen=0 2010-12-29 22:08:51 +01:00
Armin Burgmeier 69268b2999 Don't reset progress bar when starting to load definitions 2010-12-29 17:00:13 +01:00
Tobias Zwick 1956c37923 fix: Version information from masterserver is correctly parsed 
PeterW changed some stuff about the INI parser. I adjusted the parsing of the version info from the masterserver to fit his change
and let the C4Network2RefClient inherit from the C4Network2UpdateClient (as refclient does the same as updateclient only more) while I was at it.
 2010-12-27 01:07:59 +01:00
Tobias Zwick 21ccfe946f Clonk client redirects user to download page if new version is available but not as update 2010-12-27 00:31:25 +01:00
Armin Burgmeier 8f8ff33bd9 Add --without-automatic-update when building the Debian package 2010-12-26 22:10:39 +01:00
Sebastian Rühl 1dccd4a5b5 Add icon to Debian package 2010-12-26 17:56:20 +01:00
Sebastian Rühl 40dc82c4aa Introducing Debian files 2010-12-26 00:04:23 +01:00
Armin Burgmeier 745b7d4f20 Add a compile-time option to disable automatic update 2010-12-26 21:39:52 +01:00
Armin Burgmeier f50972a9de Fix update procedure on Windows 
by letting c4group wait for the Clonk process to terminate
 2010-12-26 20:49:04 +01:00
David Dormagen b471c22204 kill logs fix 
-with rant about GetRelaunchCount
 2010-12-25 19:06:05 +01:00
Günther Brammer 6650f12696 Remove a debug printf 2010-12-22 02:11:16 +01:00
MimmoO 760c06666e WindScroll: correct killer set 2010-12-20 18:49:45 +01:00
MimmoO 81e4b1e9ab Thunderous Skies: Added to stable branch 2011-01-09 15:56:00 +01:00
Günther Brammer e864c56d10 Added tag release-5.1.1 for changeset 994c87fddebe 2010-12-25 00:51:33 +01:00