--- Log opened Tue Dec 05 00:00:48 2017 20171205 00:21:40< zookeeper> yeah i think it's okay to merge. i'll try to do some dialogue tweaks afterwards myself. 20171205 00:25:06< sigurdfd> ok, thanks 20171205 00:26:34< sigurdfd> did you want to merge it since you're the maintainer, or would you prefer if I did it? 20171205 00:27:34-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection] 20171205 00:30:18< zookeeper> eh, i can do it i suppose 20171205 00:30:59< zookeeper> rebase and merge, i suppose 20171205 00:31:14< zookeeper> or do you want to add changelog entries first? 20171205 00:33:31< sigurdfd> I can add them right after 20171205 00:33:40< sigurdfd> or now, doesn't matter= 20171205 00:35:29< zookeeper> up to you 20171205 00:35:56< sigurdfd> after, still writing it up at the moment 20171205 00:36:17< irker388> wesnoth: sigurdfdragon wesnoth:master 4f899d44c517 / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Use macros https://github.com/wesnoth/wesnoth/commit/4f899d44c517f3a2cca5123b0a1c8d1c42daa1a7 20171205 00:36:19< irker388> wesnoth: sigurdfdragon wesnoth:master a9d016f84a7f / data/campaigns/Descent_Into_Darkness/scenarios/ (11_Descent_into_Darkness.cfg 12_Endless_Night.cfg): DiD S12: Move and adjust scenario repetition variable https://github.com/wesnoth/wesnoth/commit/a9d016f84a7f5feff2e0d6b0d52fe3dedd7ea9bf 20171205 00:36:21< irker388> wesnoth: sigurdfdragon wesnoth:master 6139e22b2566 / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Change and improve objectives https://github.com/wesnoth/wesnoth/commit/6139e22b2566af136a7419d9c9d6212b92cb0b0c 20171205 00:36:23< irker388> wesnoth: sigurdfdragon wesnoth:master b477729a2fc5 / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Add status table names & flags for side 2 https://github.com/wesnoth/wesnoth/commit/b477729a2fc557a3602741de66530d327650af2f 20171205 00:36:25< irker388> wesnoth: sigurdfdragon wesnoth:master 821f68a3a153 / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Add race-specific ending dialog https://github.com/wesnoth/wesnoth/commit/821f68a3a1537205824e7ade4ebe11b815408ccd 20171205 00:36:27< irker388> wesnoth: sigurdfdragon wesnoth:master 205f0005292e / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Add proper time area for outside of cave https://github.com/wesnoth/wesnoth/commit/205f0005292e1bb7a0955504907de499cdb0d15b 20171205 00:36:29< irker388> wesnoth: sigurdfdragon wesnoth:master a384f9dcc9bd / data/campaigns/Descent_Into_Darkness/maps/12_Endless_Night.map: DiD S12: Remove illuminated from hexes for a darker mood on the map https://github.com/wesnoth/wesnoth/commit/a384f9dcc9bde8cc8ab4662adb887722b6a381fa 20171205 00:36:31< irker388> wesnoth: sigurdfdragon wesnoth:master 6cebe328b72c / data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg: DiD S12: Consolidate and adjust difficulty settings https://github.com/wesnoth/wesnoth/commit/6cebe328b72ce7e067bfb066465b7ec0f644738d 20171205 00:37:21< sigurdfd> ok, thanks 20171205 00:43:23-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20171205 00:43:23-!- Necrosporus is now known as Guest70703 20171205 00:43:23-!- Necrosporus_ is now known as Necrosporus 20171205 00:44:02-!- Guest70703 [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 268 seconds] 20171205 00:51:33< irker388> wesnoth: sigurdfdragon wesnoth:master 07707dd62701 / changelog players_changelog: Update changelogs https://github.com/wesnoth/wesnoth/commit/07707dd62701dde3231401a1caf615ca944a031a 20171205 00:54:59< irker388> wesnoth: Gregory A Lundberg wesnoth:master ac77c3226ec0 / src/gui/dialogs/title_screen.cpp: Fix warning unused lambda binding https://github.com/wesnoth/wesnoth/commit/ac77c3226ec0aea31b47d159c6b0e0041eb71993 20171205 01:07:53< irker388> wesnoth/wesnoth:master newfrenchy83 6412350113 Update unit.cpp All builds passed 20171205 01:26:05-!- Greg-Boggs [~greg_bogg@c-73-11-32-127.hsd1.or.comcast.net] has joined #wesnoth-dev 20171205 01:30:41-!- Greg-Boggs [~greg_bogg@c-73-11-32-127.hsd1.or.comcast.net] has quit [Ping timeout: 248 seconds] 20171205 01:46:01-!- sigurdfd [sigurdfd@dynamic-acs-72-23-110-196.zoominternet.net] has quit [] 20171205 01:56:48-!- midzer_ [~quassel@2001:41d0:a:2255::1] has joined #wesnoth-dev 20171205 01:58:02-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 268 seconds] 20171205 01:59:21-!- midzer [~quassel@2001:41d0:a:2255::1] has quit [Ping timeout: 258 seconds] 20171205 01:59:37-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20171205 02:18:24-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20171205 02:27:30-!- travis-ci [~travis-ci@ec2-54-242-86-104.compute-1.amazonaws.com] has joined #wesnoth-dev 20171205 02:27:31< travis-ci> wesnoth/wesnoth#15935 (master - 6cebe32 : sigurdfdragon): The build was canceled. 20171205 02:27:31< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/311610938 20171205 02:27:31-!- travis-ci [~travis-ci@ec2-54-242-86-104.compute-1.amazonaws.com] has left #wesnoth-dev [] 20171205 02:28:35-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 240 seconds] 20171205 02:33:52-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20171205 02:55:56-!- vslavik [vslavik@nat/redhat/x-bzaimjmwkvhnjarc] has quit [Remote host closed the connection] 20171205 02:56:12-!- vslavik [vslavik@nat/redhat/x-yywjqbgowbauhuba] has joined #wesnoth-dev 20171205 03:45:19-!- travis-ci [~travis-ci@ec2-54-242-86-104.compute-1.amazonaws.com] has joined #wesnoth-dev 20171205 03:45:20< travis-ci> wesnoth/wesnoth#15937 (master - ac77c32 : Gregory A Lundberg): The build passed. 20171205 03:45:20< travis-ci> Build details : https://travis-ci.org/wesnoth/wesnoth/builds/311616358 20171205 03:45:20-!- travis-ci [~travis-ci@ec2-54-242-86-104.compute-1.amazonaws.com] has left #wesnoth-dev [] 20171205 04:08:57-!- irker388 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20171205 04:34:56-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: So long and thanks for all the fish.] 20171205 04:35:49-!- irker823 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20171205 04:35:49< irker823> wesnoth/wesnoth:master Gregory A Lundberg ac77c3226e Fix warning unused lambda binding All builds passed 20171205 05:02:40-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has joined #wesnoth-dev 20171205 05:28:28-!- Greg-Boggs [~greg_bogg@c-73-11-32-127.hsd1.or.comcast.net] has joined #wesnoth-dev 20171205 05:32:47-!- Greg-Boggs [~greg_bogg@c-73-11-32-127.hsd1.or.comcast.net] has quit [Ping timeout: 248 seconds] 20171205 06:33:01-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has quit [Quit: .] 20171205 07:06:27-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has quit [Remote host closed the connection] 20171205 07:06:39-!- janebot [~Gambot@unaffiliated/gambit/bot/gambot] has joined #wesnoth-dev 20171205 07:21:35-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has joined #wesnoth-dev 20171205 07:24:47-!- atarocch [~atarocch@5.91.186.2] has quit [Ping timeout: 248 seconds] 20171205 07:35:48-!- irker823 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20171205 07:41:15-!- atarocch [atarocch@nat/redhat/x-koukdtoptscxdnpc] has joined #wesnoth-dev 20171205 07:44:50-!- vn971 [~vasya@94.158.103.15] has quit [Ping timeout: 260 seconds] 20171205 08:36:42-!- DeFender [~DeFender1@89-138-239-68.bb.netvision.net.il] has joined #wesnoth-dev 20171205 08:39:04-!- DeFender1031 [~DeFender1@93-173-16-154.bb.netvision.net.il] has quit [Ping timeout: 255 seconds] 20171205 08:51:11-!- midzer_ is now known as midzer 20171205 08:56:06-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20171205 09:16:44-!- mesilliac [~mesilliac@p4FED35C7.dip0.t-ipconnect.de] has joined #wesnoth-dev 20171205 09:28:50-!- Greg-Boggs [~greg_bogg@2601:1c2:1a80:1c20:e9fb:7bc2:d72b:d71c] has joined #wesnoth-dev 20171205 09:33:11-!- Greg-Boggs [~greg_bogg@2601:1c2:1a80:1c20:e9fb:7bc2:d72b:d71c] has quit [Ping timeout: 255 seconds] 20171205 09:36:31-!- Bonobo [~Bonobo@61.68.169.173] has quit [Ping timeout: 248 seconds] 20171205 09:36:44-!- Bonobo [~Bonobo@61.68.169.173] has joined #wesnoth-dev 20171205 09:52:32-!- vultraz [uid24821@wesnoth/developer/vultraz] has quit [Quit: Connection closed for inactivity] 20171205 10:06:29-!- Bonobo [~Bonobo@61.68.169.173] has quit [Ping timeout: 255 seconds] 20171205 10:06:55-!- Bonobo [~Bonobo@110-175-146-248.static.tpgi.com.au] has joined #wesnoth-dev 20171205 10:40:14-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has quit [Quit: .] 20171205 11:04:17-!- vslavik__ [vslavik@nat/redhat/x-roiurcauotggfjdw] has joined #wesnoth-dev 20171205 11:06:54-!- vslavik [vslavik@nat/redhat/x-yywjqbgowbauhuba] has quit [Ping timeout: 260 seconds] 20171205 11:26:02-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has joined #wesnoth-dev 20171205 11:41:44-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20171205 11:57:50-!- vslavik [vslavik@nat/redhat/x-ldnepxnubljbevmh] has joined #wesnoth-dev 20171205 12:00:34-!- vslavik__ [vslavik@nat/redhat/x-roiurcauotggfjdw] has quit [Ping timeout: 260 seconds] 20171205 12:12:02-!- Bonobo [~Bonobo@110-175-146-248.static.tpgi.com.au] has quit [Ping timeout: 255 seconds] 20171205 12:22:00-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20171205 12:46:16-!- kallaballa [~amir@public.metalab.wien.funkfeuer.at] has joined #wesnoth-dev 20171205 12:50:25-!- kallaballa [~amir@public.metalab.wien.funkfeuer.at] has quit [Client Quit] 20171205 13:32:14-!- vultraz [uid24821@wesnoth/developer/vultraz] has joined #wesnoth-dev 20171205 14:39:08-!- irker046 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20171205 14:39:08< irker046> wesnoth: Charles Dang wesnoth:master 52421672e1cf / src/cursor.hpp: Removed two unused function declarations https://github.com/wesnoth/wesnoth/commit/52421672e1cf36739cd99374a5c298e36b5766f0 20171205 14:39:08< irker046> wesnoth: Charles Dang wesnoth:master d09ad24037e3 / src/ (38 files in 12 dirs): Used standard C++ fixed-width integer types instead of SDL-provided ones https://github.com/wesnoth/wesnoth/commit/d09ad24037e3151035b2cbb1e5c1dc886ea0684c 20171205 14:39:09< irker046> wesnoth: Charles Dang wesnoth:master c2fbfbf8ac4a / projectfiles/CodeLite/ (wesnoth.project wesnoth.workspace): Removed abandoned CodeLite projectfiles https://github.com/wesnoth/wesnoth/commit/c2fbfbf8ac4a1a8766b9f546bd5975340a0c07ce 20171205 15:13:30-!- JyrkiVesterinen [~JyrkiVest@195-192-251-124.s1networks.fi] has quit [Quit: .] 20171205 15:19:52-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20171205 16:08:21-!- vslavik [vslavik@nat/redhat/x-ldnepxnubljbevmh] has quit [Quit: Leaving] 20171205 16:13:34-!- Oebele [~quassel@143.177.58.202] has joined #wesnoth-dev 20171205 16:37:25-!- galegosimpatico [~uprego@unaffiliated/ushiu] has quit [Read error: Connection reset by peer] 20171205 16:38:11-!- galegosimpatico [~uprego@216.red-83-46-196.dynamicip.rima-tde.net] has joined #wesnoth-dev 20171205 17:04:00-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has joined #wesnoth-dev 20171205 17:17:09-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20171205 17:55:23-!- galegosimpatico [~uprego@216.red-83-46-196.dynamicip.rima-tde.net] has quit [Ping timeout: 255 seconds] 20171205 17:57:24-!- galegosimpatico [~uprego@216.red-83-46-196.dynamicip.rima-tde.net] has joined #wesnoth-dev 20171205 18:05:32-!- atarocch [atarocch@nat/redhat/x-koukdtoptscxdnpc] has quit [Remote host closed the connection] 20171205 18:12:11-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20171205 18:30:01< irker046> wesnoth: Jyrki Vesterinen wesnoth:master efa91bd9e8cb / src/halo.cpp: Fix #2275: Unit halo flickers when unit moves https://github.com/wesnoth/wesnoth/commit/efa91bd9e8cbbac4d2a213da80040f3b30e81402 20171205 20:13:08-!- Greg-Boggs [~greg_bogg@173.240.241.83] has quit [Remote host closed the connection] 20171205 20:26:14-!- mjs-de [~mjs-de@x4db603fb.dyn.telefonica.de] has joined #wesnoth-dev 20171205 20:27:46-!- Greg-Boggs [~greg_bogg@173.240.241.83] has joined #wesnoth-dev 20171205 20:46:51-!- mjs-de [~mjs-de@x4db603fb.dyn.telefonica.de] has quit [Remote host closed the connection] 20171205 21:01:29-!- JyrkiVesterinen [~JyrkiVest@85-23-197-3.bb.dnainternet.fi] has quit [Quit: .] 20171205 21:30:16-!- irker046 [~irker@uruz.ai0867.net] has quit [Quit: transmission timeout] 20171205 21:31:58-!- vultraz [uid24821@wesnoth/developer/vultraz] has quit [Quit: Connection closed for inactivity] 20171205 22:10:09-!- mesilliac [~mesilliac@p4FED35C7.dip0.t-ipconnect.de] has quit [Ping timeout: 248 seconds] 20171205 22:22:18-!- Oebele [~quassel@143.177.58.202] has quit [Remote host closed the connection] 20171205 22:25:48-!- irker804 [~irker@uruz.ai0867.net] has joined #wesnoth-dev 20171205 22:25:48< irker804> wesnoth/wesnoth:master Jyrki Vesterinen efa91bd9e8 Fix #2275: Unit halo flickers when unit All builds passed 20171205 22:36:53< irker804> wesnoth/wesnoth:master Charles Dang c2fbfbf8ac Removed abandoned CodeLite projectfiles All builds passed 20171205 22:53:56-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20171205 22:58:16-!- Bonobo [~Bonobo@110-175-146-248.static.tpgi.com.au] has joined #wesnoth-dev 20171205 23:02:37< irker804> wesnoth: kallaballa wesnoth:master 4dda0ad9b2dc / / (16 files in 8 dirs): rebase commit: implemented a surrender dialog that records a surrender command i https://github.com/wesnoth/wesnoth/commit/4dda0ad9b2dc74f0d2251f6778339f4199bec4e9 20171205 23:14:52< irker804> wesnoth: Charles Dang wesnoth:master 4d3fa03ba88f / src/font/text.cpp: Removed now-useless static_assert https://github.com/wesnoth/wesnoth/commit/4d3fa03ba88f7ed1d3eb9cfbacc46ac2bc90f346 20171205 23:16:40-!- vultraz [uid24821@wesnoth/developer/vultraz] has joined #wesnoth-dev 20171205 23:23:53-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20171205 23:50:27< irker804> wesnoth: Charles Dang wesnoth:master 003d964c4b43 / projectfiles/VC12/ (wesnoth.vcxproj wesnoth.vcxproj.filters): Updated VC projectfile for 4dda0ad9b2dc74f https://github.com/wesnoth/wesnoth/commit/003d964c4b43239699e5d69359a0ff7e76f524ea --- Log closed Wed Dec 06 00:00:49 2017