Commit Graph

477 Commits (8e5aed4bea1da6bd6ce3fd7d682df03cf9479574)

Author SHA1 Message Date
Nicolas Hake 8e5aed4bea Update TRADEMARK and add trademark reference to credits (#1370)
I don't like that the FMOD and Clonk trademarks are separated, but we
don't have enough space in the credits screen to do it differently.
2015-08-09 19:20:53 +02:00
Sven Eberhardt 8ec159d755 Remove some unnecessary restrictions from /script message board command (#1369). 2015-08-08 21:52:13 -04:00
Sven Eberhardt d3a9a3bc39 Change mission unlock key to Ctrl+M (from Alt+M).
Alt+Key was problematic for some Linux people. Also most other combinations have been changed to Ctrl+Key already.
2015-05-22 21:41:34 +02:00
Nicolas Hake 5562b09dc4 Remove a lot of disabled legacy code, round 2
Maybe at some point we'll be rid of all the commented-out code that
nobody has looked at in years.
2015-03-25 20:02:53 +01:00
Sven Eberhardt 922a87527c Use magic STL instead of magic numbers for TODO file location count. 2015-03-05 16:19:50 +01:00
Sven Eberhardt 90cca08d63 Add /todo message board command.
Adds text to local TODO.txt file. Useful for taking notes quickly e.g. when testing new scenarios in a network game.

TODO filenames are configurable. Default file is TODO.txt in the scenario file (if it's unpacked) and TODO.txt on the current path if access to the first location failed.
2015-03-05 16:04:07 +01:00
Nicolas Hake ceeb322a87 Win32: Keep GL error dialog from immediately closing
GL startup failures call Application.Clear(), which will at some point
before creating the error dialog post a WM_QUIT. When the dialog box's
message loop retrieves that message, it will shut down the dialog box,
thus ensuring that the user will never see it.
So before showing the dialog box, we have to dispatch any pending
messages, then retrieve the WM_QUIT ourselves, run the dialog box, then
re-post the WM_QUIT.
2015-02-18 23:02:34 +01:00
Nicolas Hake 4db690b0c6 Add copyright header to files that were missing it 2015-02-16 18:40:52 +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 e2a8f6d303 Reorder some declarations and initializations to avoid order mismatch
While none of the mismatches were having a side-effect, this silences a
number of -Wreorder warnings which were drowning out potentially
important diagnostics.
2015-02-04 22:12:42 +01:00
Günther Brammer 5bcedb5bbf Remove some redundant #includes 2015-01-25 18:53:48 +01:00
Günther Brammer a92c22a7b3 Merge various build system fixes and cleanups 2015-01-25 18:50:29 +01:00
Nicolas Hake 2ef2c637a7 Remove several instances of disabled legacy code 2015-01-18 22:59:45 +01:00
Sven Eberhardt 8dddbe5a10 Allow definitions without graphics. 2015-01-17 18:10:21 +01:00
Tobias Zwick 5e188aafb3 Fix setting small ViewOffsets. Refactor neighbouring code, enable a slight MouseAutoScroll by default
* make ViewX,ViewY,ViewOffsetX and Y private, add getters and setters that update variables that are dependent on these
2015-01-03 22:53:02 +01:00
Günther Brammer 69f8ca27ec Move C4ApplicationSec1Timer to StdScheduler.h
There is nothing "Application" specific about this class.
2015-01-03 21:06:25 +01:00
Günther Brammer d9e3d9db3d Require filenames to be in unicode, remove iconv usage
Every modern operating system and Clonk uses UTF-8, and windows uses UTF-16
and has its own conversion code.
2015-01-03 20:41:03 +01:00
Sven Eberhardt 98093961ec Add packet logging option.
This should reduce log spam in network games.
2015-01-03 18:15:41 +01:00
Tobias Zwick 4981182cf8 Merge remote-tracking branch '_origin/master' into lights
Conflicts:
	src/c4group/C4Components.h
2014-12-15 21:16:40 +01:00
Nicolas Hake 9089f6857f Remove Sort field from C4FolderHead
This field apparently was intended to be used in folder maps, but was
already unused in Clonk Rage, and has never been used in OC either.
2014-12-12 22:54:42 +01:00
Tobias Zwick d59b1e5e5b reduce version numbering from x.y.z (x does never changes) to y.z 2014-12-12 21:57:52 +01:00
Armin Burgmeier 00447dd524 Merge branch 'master' into lights 2014-11-12 08:47:43 -05:00
Armin Burgmeier c3bcedfbf9 Don't attempt mouse hover callbacks when mouse control is passive (github #5) 2014-11-07 20:16:30 -05:00
Armin Burgmeier aed907e30d Remove old fog of war 2014-11-07 11:53:10 -05:00
Armin Burgmeier f89058f094 Remove config entries that are no longer used 2014-11-02 16:57:50 -05:00
Armin Burgmeier b0f2f507b1 Fix execl invocation in C4UpdateDlg 2014-10-29 00:35:13 -04:00
Sven Eberhardt ca64fad8b5 Fix lobby team distribution settings hotkeys (#1133) 2014-10-09 20:40:01 +02:00
Sven Eberhardt ee80b46841 Fix possible race condition on update check in network game list.
Also avoid repeated parsing of update reply on every network event.
2014-10-05 15:11:06 +02:00
Sven Eberhardt e740938bbb Fix .ocu updates and allow direct download of installer for future updates. 2014-10-05 14:32:23 +02:00
Sven Eberhardt f8f232a275 Fix build without automatic updates. 2014-10-04 23:01:53 +02:00
Tobias Zwick 90b86dbf69 seperate update server from masterserver
Don't query the masterserver for a new version, instead ask the update server directly.
2014-10-04 22:50:46 +02:00
Sven Eberhardt ffdd2f37eb Fix recursions caused by modal league dialogues during game execution and game end (#1118). 2014-10-04 00:16:03 +02:00
Sven Eberhardt f815613ce8 Don't force league settings on scenario parameters if league is enabled during single player scenario selection (#1120). 2014-10-03 21:25:25 +02:00
Sven Eberhardt 3c731729b4 Fix bogus warning about missing AchvDone.png files (#1119) 2014-10-03 20:58:49 +02:00
Sven Eberhardt 91800fcfec Implement setting for forced values of parameters in league games. 2014-10-03 14:02:28 +02:00
Sven Eberhardt 05631742c8 Allow definition of achievements in parent (.ocf) folders.
Note that regular scenario parameters cannot be defined in folders because that would complicate savegames, records, etc.
2014-10-03 12:17:12 +02:00
Sven Eberhardt cd9d655ad9 Fix local scenario achievement graphics for achievement values larger than 1. 2014-10-03 00:49:03 +02:00
Sven Eberhardt 3fc1f02c6d Implement custom scenario parameter selection in startup scenario selection dialogue and by command line. 2014-09-27 16:05:32 +02:00
Sven Eberhardt abab7be591 Added scenario achievements displayed as small symbols beside the scenario name in the startup selection screen.
They can be used e.g. to show that you have finished a scenario on different difficulty levels.
2014-09-24 23:08:40 +02:00
Sven Eberhardt 378bda5546 Added custom scenario parameters (SCENPAR_*).
Can currently only be set in network games in the lobby. In the future, maybe we can find a place somewhere in the scenario selection dialogue.
2014-09-23 23:02:52 +02:00
Sven Eberhardt ecdcb58bf6 Fix mouse cursor graphics when scrolling and outside viewport.
Cursor indexes were off by one.
2014-09-21 23:59:50 +02:00
Sven Eberhardt b1db0c7918 (Re)implement text completion in dialogue text windows as an async control. Default to Space, i.e. MenuOK. 2014-08-10 20:58:26 +02:00
Nicolas Hake 642ce2eb9c Merge all of the audio provider switches into one
There's no point in splitting the audio library selection into multiple
CPP macros, since there can always only be one anyway. Merge all of them
into a single macro AUDIO_TK (for "toolkit") and have CMake select one
for the user, instead of making him choose (and potentially failing).
2014-08-01 23:37:42 +02:00
Sven Eberhardt ac395ba65f Increase display time of global messages.
Global messages are usually important and contain story elements, game goals, etc. So they should stay for a bit longer than e.g. object status messages.
2014-07-05 16:44:48 +02:00
Sven Eberhardt 5cd9b915b0 Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics.
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
2014-07-05 15:25:30 +02:00
Günther Brammer 22016e075f Replace some usages of C4ID with C4Def*
In particular those that made the c4script shell depend on C4Id.cpp.
2014-04-19 19:02:22 +02:00
Julius Michaelis ccb6bfbc81 Remove obsolete effect level slider and configuration option 2014-04-03 23:02:00 +02:00
Julius Michaelis e5b7ef5b80 AutoFrameSkip: Graphics option to reduce lag by slow
Skips drawing every second frame if drawing the previous frame was too slow
Setting is controlled by game host
Default: on

Imported from Clonk Rage

From e6e680f49ac50a352e9a051ee21622e7f00648b6 Mon Sep 17 00:00:00 2001
From: sven2 <sven2@786b8e90-9c09-0410-89a9-bccc6ef1e79b>
Date: Sat, 21 Sep 2013 21:34:44 +0000
Subject: [PATCH] + AutoFrameSkip: Graphics option to reduce lag by slow
 clients in network games

git-svn-id: https://www.clonk.de:83/svn/clonk/stable@14501 786b8e90-9c09-0410-89a9-bccc6ef1e79b
2014-04-03 14:53:12 +02:00
Julius Michaelis a06b7e3c23 Fix use after free and conditional jump on uninitialized 2014-03-31 12:07:58 +02:00
Julius Michaelis cfc5af7f9d Do not exit round on closing game over dialoge with ✗-button 2014-03-30 16:03:26 +02:00