Commit graph

38 commits

Author SHA1 Message Date
Martin Hrubý (hrubymar10)
bc4d22dc72 Migrate links to https if available - Fwd c18537edc0 2018-07-16 19:07:08 +11:00
Iris Morelle
c9eee2d351 Copyright/attribution update
[ci skip]
2018-02-16 20:03:24 -03:00
Gregory A Lundberg
b5f76eff79
Bump copyright to 2018 2018-01-19 00:02:20 -06:00
Celtic Minstrel
b4dc11ce36 Belated 2017 copyright update 2017-03-19 10:05:38 -04:00
Charles Dang
4d48ed1319 Cleaned up util.hpp includes 2016-12-08 14:21:18 +11:00
Charles Dang
e7258407ec Cleaned up remaining uses of PANDORA define 2016-10-03 21:21:36 +11:00
Celtic Minstrel
3ac7f8d970 NULL -> nullptr
A few cases of NULL were missed, since changing them led to errors
(Mainly instances where it was passed to a boost::function)
2016-03-31 00:42:38 -04:00
Chris Beck
ba51524f6e update copyright to year 2016
using this shell script:

find src -type f -print0 | xargs -0 sed -i "s|Copyright (C) \([[:digit:]]*\)\([ ]*\)-\([ ]*\)2015|Copyright (C) \1\2-\32016|g"
2016-01-02 23:59:31 -05:00
Nils Kneuper
7513477224 remove most OpenPandora specific items
The only thing that the ENABLE_PANDORA flag does now is to allow the
resolution of 800x480 and using a special theme automatically.
Everything else is 100% "mainline code". This means if someone wants to
package for pandora several system libraries will have to be
handcompiled and shipped in the pnd including:
* >=boost 1.48 (at least one component (locale) requires this)
* >=SDL_mixer 1.2.12
* VorbisFile
2015-04-12 11:07:37 +02:00
Ignacio R. Morelle
57ae45387a New Year copyright update 2015-01-01 19:07:35 -03:00
Alexander van Gessel (AI0867)
e5cb79b8e9 Move everything in src/filesystem.hpp into its own namespace
This is a chearry pick by me (gfgtdf) of 66176b1738. It differes a lot from the original becasue since there were so much merging conflics i decided to do it mostly from scratch.

Conflicts:
	src/addon/manager.cpp
	src/addon/manager_ui.cpp
	src/campaign_server/campaign_server.cpp
	src/config_cache.cpp
	src/create_engine.cpp
	src/editor/map/context_manager.cpp
	src/editor/map/map_context.cpp
	src/font.cpp
	src/game_config_manager.cpp
	src/gamestatus.cpp
	src/gui/dialogs/editor/custom_tod.cpp
	src/gui/dialogs/lobby/lobby_data.cpp
	src/gui/dialogs/mp_create_game.cpp
	src/gui/widgets/settings.cpp
	src/hotkeys.cpp
	src/image.cpp
	src/multiplayer_lobby.cpp
	src/network.cpp
	src/playcampaign.cpp
	src/preferences.cpp
	src/savegame.cpp
	src/serialization/preprocessor.cpp
	src/tests/main.cpp
	src/wesnoth.cpp
	src/widgets/button.cpp
2014-10-13 18:31:18 +02:00
Zappaman
b7e8590120 added support for a shuffle key in the [music] music to allow selecting between random and non-random music play 2014-08-08 01:14:05 +03:00
fendrin
329e7cea96 Disable the use of vorbisfile on the Pandora.
This is an attempt to fix the Segfault at the title screen on the named
system.
2014-01-02 16:47:21 +01:00
Ignacio R. Morelle
a4f47a63c7 New Year copyright update 2014-01-01 02:08:52 -03:00
Alexander van Gessel
38b224c1ff Revert "Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old""
This reverts commit 23b72d6956.
2013-08-09 00:13:46 +02:00
Thibault Févry
23b72d6956 Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old"
This reverts commit 5fa5c03411, reversing
changes made to 06374c64ba.
2013-08-08 18:50:46 +02:00
fendrin
a682e33be0 Fix clearing the file handle at the wrong location. 2013-07-20 15:59:28 +02:00
fendrin
547a736346 Add support for title attribute and some code cleanups. 2013-07-20 15:59:28 +02:00
Ignacio R. Morelle
b9a35cb3db Demote all music_track::resolve() output to the info log level and clarify origin
Some of these error messages can seem duplicate in practice (if a track
can't be found, the playlist manager will complain again) or unfitting
(not all music tracks have to be in Ogg Vorbis format, or have
appropriate comments), hence they are more fitting for the info level
rather than the error level.
2013-06-07 05:58:00 -04:00
fendrin
7729a3950e Fixed a merge conflict that made it in my repository.
Reverting the commit ends up in the "git revert" command not
terminating. I do not know what to do else.
2013-05-24 05:48:49 +02:00
fendrin
e40af6407e Disabled (hopefully) the ogg tag reading on Win and Mac.
The scons build system still asks for the library,
thus the compiling might still be broken on scons based builds.
2013-05-24 05:44:58 +02:00
anonymissimus
ccdc8bd2ea disable "show track title feature" for Win-MSVC, Win-MinGw and Mac
(from commit 3440218c0f)
2013-05-22 00:45:33 +02:00
fendrin
3440218c0f Show the ogg's title (metadata) in the playlist menu. 2013-05-20 11:21:06 +02:00
fendrin
0f8a287b10 Scenario playlist editor. 2013-05-19 13:50:16 +02:00
Eric S. Raymond
043c4f9fd3 Remove $Id$ cookies. 2013-03-26 21:41:37 -04:00
Mark de Wever
43b71f2ff0 New year copyright update. 2013-01-01 09:22:03 +00:00
Ignacio R. Morelle
6ca69b2df5 New year copyright update 2012-01-07 02:35:17 +00:00
Mark de Wever
ecbabea838 New year copyright update. 2011-01-01 15:57:50 +00:00
Guillaume Melquiond
eeb047de55 Fixed file headers so that they match the content of the COPYING file. 2010-09-01 21:12:38 +00:00
Guillaume Melquiond
d5b30ae6b9 Avoided costly roundtrip through strings.
Removed half-backed copy constructor and assignment.

Factored code.
2010-05-27 16:28:00 +00:00
Guillaume Melquiond
01e0010adf Removed hardcoding of boolean names when storing values into config object. 2010-03-27 10:59:17 +00:00
Mark de Wever
92f5f92ce5 New year copyright update. 2010-01-01 13:16:49 +00:00
Mark de Wever
29ae8bf5de Remove an unneeded include. 2009-11-27 23:00:41 +00:00
Guillaume Melquiond
15cc0203d0 Removed unused constructor sound::music_track. 2009-10-10 10:45:42 +00:00
Ignacio R. Morelle
90540e2ecd Moved some WML evaluation code from a method in sound.cpp...
...to the music_track class constructor.
2009-07-26 02:19:38 +00:00
Guillaume Melquiond
789736ac91 Removed specialized domains from log.hpp,
...so that adding a new domain no longer forces to recompile the whole
game.
2009-04-24 23:18:31 +00:00
Mark de Wever
22917c1c60 Fix a compiler warning.
2009-03-24T12:19:40Z!shadowm@wesnoth.org introduced an unused parameter, this seems the obvious fix.
Shadow_Master please review this change.
2009-03-29 10:06:46 +00:00
Ignacio R. Morelle
61fb097e5d Partial refactoring of music and sound effects component.
The music_track struct has been rewritten (and "promoted" to class) and
music caching behavior in Wesnoth has changed a bit. This should not
noticeably affect performance or be visible to users in other ways (if
it is, we've got regressions).

There's a hidden, disarmed core bomb in this commit. Can you find it?

Formerly, the engine resolved binary paths to music files whenever it
hit one in the playlist. Now it resolves the binary path when
loading/editing the playlist, reducing the time it takes to play a new
track by an insignificant amount of time. It will also consider a
data/add-ons/foo/music/track1.ogg as a different file to
data/core/music/track1.ogg as far as the music cache is concerned, since
it now stores entries by real paths rather than just filenames.
2009-03-24 12:19:40 +00:00