28e794654c
Add network option to disable UPnP.
...
Also add some more UPnP failure messages to log.
2016-01-24 00:11:14 -05:00
e94c0e38fc
Add scenario core field "Mode" (in [Game]) to allow setting game mode independent of goal objects.
...
To be used by the league so you can properly host race scenarios in the open melee league.
2016-01-23 21:19:22 -05:00
3c625a00dd
C4Game: Turn some owned pointers into std::unique_ptr
...
Using std::unique_ptr instead of raw pointers makes ownership clear and
avoids leaks.
2015-12-28 11:43:37 +01:00
e0bcaf8d7d
Sound UI::Confirmed (instead of Objects::Connect)
2015-12-15 01:41:25 -05:00
dcfb986e34
moved sounds into subfolders
...
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
72002cc366
Kill netpuncher
...
Another piece of code that hasn't been tested in ages, gone. The default
puncher address was still pointing to clonk.de, which I'm very certain
isn't providing UDP hole punching services anymore.
Instead of a bespoke hole punching implementation we should use a STUN
lib.
2015-12-13 16:11:08 +01:00
499959fa14
Fix team distribution of savegame resume and initial script players #1494
2015-12-12 14:09:42 -05:00
019cc0d583
Enable immediate tooltips on mouse-over-event for unlabeled icons in lobby and scenario selection ( #1132 ).
2015-12-06 21:03:54 -05:00
6e4c7a2c2d
Lobby ready button: Prevent message spam, improve icon updating and some small fixes.
...
* Show max one message per second per client
* Do not show ready message locally
* Fix observer flag reset by ready state change
* Reflect ready state change in client list immediately
2015-11-21 23:58:40 -05:00
d284f49b6b
Add "ready" button for clients in game lobby.
...
Signed-off-by: Sven Eberhardt <sven2@goldwipf.de>
2015-11-18 22:49:59 -05:00
24b54211c5
Drop Min, Max, Swap for std::min, std::max, std::swap
...
The C++ standard library comes with perfectly fine implementations of
these functions, so there's no point in reimplementing them just for the
hell of it.
2015-11-15 13:53:01 +01:00
7725a379c2
Fix display of player-colored charts (/chart).
2015-10-03 21:37:41 -04:00
f0030e33e0
Warning fixes
...
Actually pretty sure a few of them were bugs. Hopefully no new
ones were introduced here.
2015-10-03 15:32:39 +01:00
3159793dfc
MSVC build fix
2015-09-29 20:38:15 -04:00
ee859d85e0
Remove boost any usage of boost libraries
2015-09-30 00:16:12 +02:00
6a11e3e811
Stop checking for rvalue ref support
...
We already require support for std::unique_ptr, which itself requires
support for rvalue references. As such, we know we can use rvalue
references, and thus don't have to keep carrying dead code around.
2015-09-20 13:27:14 +02:00
d1313f622f
Drop hack that allowed taking a reference to a temporary value
...
This has never been legal C++, and the compilers where it was necessary
are no longer supported.
2015-09-20 13:27:13 +02:00
20d3de46cd
Fix some unused variables.
2015-09-03 21:26:49 -04:00
3e2e9d5ed4
Fix some warnings.
2015-09-03 00:16:25 -04:00
196f528201
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
src/game/C4Game.cpp
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
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
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
2d1e4caabc
Remove a superfluous endianness test
...
We're not supporting BE systems, and even when we did, I'm not sure this
test could ever have done something.
2015-02-11 20:41:35 +01:00
5bcedb5bbf
Remove some redundant #includes
2015-01-25 18:53:48 +01:00
a92c22a7b3
Merge various build system fixes and cleanups
2015-01-25 18:50:29 +01:00
089b4794a8
Fix a few warnings in Win64 build.
2015-01-25 16:43:51 +01:00
2ef2c637a7
Remove several instances of disabled legacy code
2015-01-18 22:59:45 +01:00
bd04722553
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
src/game/C4GraphicsSystem.cpp
src/game/C4GraphicsSystem.h
src/game/C4Viewport.cpp
src/gui/C4GameMessage.cpp
2015-01-15 19:57:01 +01:00
aa6b1384a7
Fix build with C4NET2IO_DUMP_LEVEL > 1
...
Instead of using the preprocessor to filter out debugging code, we might
want to make more use of the optimizer's DCE. That way, renaming and
moving a function or variable won't immediately break a rarely tested
configuration.
2015-01-15 16:33:20 +01:00
69f8ca27ec
Move C4ApplicationSec1Timer to StdScheduler.h
...
There is nothing "Application" specific about this class.
2015-01-03 21:06:25 +01:00
98093961ec
Add packet logging option.
...
This should reduce log spam in network games.
2015-01-03 18:15:41 +01:00
f89b8c8319
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/System.ocg/ClonkControl.c
src/gui/C4MouseControl.cpp
src/landscape/C4PXS.cpp
2014-12-25 15:24:19 +01:00
d59b1e5e5b
reduce version numbering from x.y.z (x does never changes) to y.z
2014-12-12 21:57:52 +01:00
c09e9880e2
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-10-13 18:54:05 +02:00
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
91800fcfec
Implement setting for forced values of parameters in league games.
2014-10-03 14:02:28 +02:00
02150f7298
Change default master server to league server.
2014-09-30 20:59:16 +02:00
e395e0741d
C4Network2IRC: Remove call to boost::cref which seems to be unnecessary since C4GUI::Ico_Error is just an integer
2014-09-29 22:28:01 +02:00
952f06b173
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-09-29 11:47:09 +02:00
3fc1f02c6d
Implement custom scenario parameter selection in startup scenario selection dialogue and by command line.
2014-09-27 16:05:32 +02:00
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
5722339e83
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/gui/C4Gui.h
src/gui/C4GuiDialogs.cpp
src/gui/C4GuiWindow.cpp
2014-08-13 11:52:41 +02:00
227d3d760d
Ship a fallback natupnp.h
...
MinGW doesn't bring a natupnp.h out of the box. Add one to the repository
so MinGW builds also support UPnP/NAT-PMP.
2014-08-03 21:48:53 +02:00
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
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
45f69abb6e
Revert engine-side league localization
...
The engine cannot know about all future league strings. Instead, localize server-side using language id from http request.
2014-04-27 15:42:47 +02:00
4266b370d6
Added script functions SetLeagueProgressData, GetLeagueProgressData, GetLeagueScore and SetLeaguePerformance.
2014-04-20 15:33:36 +02:00
2c7d9c0549
Fix a load of warnings (two were actual errors, only in diagnostics though)
2014-04-17 19:24:41 +02:00
5c17b48bc2
Merge branch 'master' into Controls
2014-03-26 23:58:24 +01:00
75c5ac1465
Enable league button if an alternate server is set. To be re-enabled completely when an OC league exists (and when we have new button graphics).
2014-03-23 20:41:58 +01:00
Sven Eberhardt