--- Log opened Sat May 17 00:00:10 2014 20140517 00:00:56< gfgtdf> so your code should default to: x=16,15,14,13,12,11,10,10,10,10,10,10,10,10,10... y=3,3,3,3,3,3,1,2,3,4,5,6,7,8,9,10...map_height or similat it seems 20140517 00:01:00< gfgtdf> iceiceice: ^ 20140517 00:01:35< iceiceice> hmm 20140517 00:04:52< gfgtdf> iceiceice: https://github.com/wesnoth/wesnoth/blob/master/src/map_location.cpp#L381 20140517 00:05:54< iceiceice> hmm my search ended somewhere completely different lol 20140517 00:06:11< iceiceice> i ended up in src/actions/move.cpp 20140517 00:06:14< iceiceice> at unit_mover 20140517 00:06:45< iceiceice> following move_unit_from_replay... 20140517 00:07:13< gfgtdf> iceiceice: is called hwere: https://github.com/wesnoth/wesnoth/blob/master/src/synced_commands.cpp#L244 20140517 00:07:44< iceiceice> oh 20140517 00:10:51< iceiceice> well thats pretty bizarre 20140517 00:14:00< iceiceice> i cant see why its desirable to use this function for moves 20140517 00:14:12< iceiceice> it looks like if you give it like x=1-3, y=1-3 20140517 00:14:24< iceiceice> it will make the unit move across the square in row order or smth like this 20140517 00:14:39< iceiceice> which is almost certainly not what anyone wants 20140517 00:17:23< gfgtdf> hm ye for the move unit handler this is normaly not what one would expect 20140517 00:18:26< iceiceice> is there ever a time that we store moves with ranges like this? 20140517 00:18:41< gfgtdf> Yes in filters 20140517 00:18:50< iceiceice> yeah but in [move] tags in replays? 20140517 00:18:58< iceiceice> theres no way that replays are like intelligently parsing this stuff, right? 20140517 00:18:59< gfgtdf> no 20140517 00:19:22< gfgtdf> maybe one could make a sqare movement era or something like that. 20140517 00:19:27< iceiceice> what if we just change it so, for [move] tag it just splits x and y and expects same size list of integers 20140517 00:19:36< iceiceice> most liekly that woudl not break compatibility with anything 20140517 00:19:45< gfgtdf> yes we can do thatr 20140517 00:19:46< iceiceice> and then we would not have to explain this nonsense int he [do_command] wiki 20140517 00:20:39< iceiceice> it seems much safer because we will catch messed up replays more likely if we reports wierd crap as oos 20140517 00:22:14< gfgtdf> the only disadvantage from removing this is, that we might steal a good laugh from the next dev who inspects this code. 20140517 00:22:19< iceiceice> haha 20140517 00:23:54< iceiceice> god i was so confused when i saw those wierd move commands appearing consistently 20140517 00:26:18< gfgtdf> something that bothers mo for a whole while now: which of the following codes is better/prettier: http://pastebin.com/JMy3C1T7 (both in that link) 20140517 00:27:01< gfgtdf> iceiceice: ^ 20140517 00:27:31< iceiceice> i like the second one 20140517 00:28:28< gfgtdf> hm ok 20140517 00:30:01< iceiceice> hmm so heres a C++ puzzle that bugged me for a few days now 20140517 00:30:06< iceiceice> when i tried to make strict logging 20140517 00:30:25< iceiceice> i went into logging objects, i guess i expected that they were wrappers for ostream or something 20140517 00:30:34< iceiceice> but actually they aren't, 20140517 00:31:02< iceiceice> when dave implemented them i guess what happened is they are logger classes in a private namespace that can give an ostream & as the output of operator () 20140517 00:31:18< iceiceice> so when you write WRN_LOG, 20140517 00:31:30< iceiceice> theres some macro behind it that gets the logger object of that name and severity 20140517 00:31:37< iceiceice> and asks it if the preferences said it should be logged 20140517 00:31:43< iceiceice> and if so it gives you std::cerr 20140517 00:31:49< iceiceice> otherwise it gives you some null object 20140517 00:31:54< iceiceice> and also it can give some like handler or osmething 20140517 00:32:02< iceiceice> err, i dont understand the last part fully 20140517 00:32:07< iceiceice> anyways it always gives an ostream 20140517 00:32:28< iceiceice> so when i do strict logging what i do is, if you ask for the logger of a warn or error stream, it throws a game::game_error exception immediately 20140517 00:32:31< iceiceice> since you were going to write... 20140517 00:32:39< iceiceice> but, i dont know what error message you wrote! 20140517 00:32:45< iceiceice> so it's not ideal 20140517 00:32:53< iceiceice> i just know "you were going to report a warning or error so we die" 20140517 00:33:18< gfgtdf> hm i think the onyl option si to impleent a wrapperobject oyourself ? 20140517 00:33:29< iceiceice> yeah i mean i could make something that derives ostream i guess 20140517 00:33:34< iceiceice> and has a custom destructor 20140517 00:33:40< iceiceice> so when it goes out of scope it throws the exception 20140517 00:33:43< gfgtdf> no ew return a reference 20140517 00:33:47< gfgtdf> e return 20140517 00:33:49< gfgtdf> we return 20140517 00:34:04< iceiceice> y i wasnt sure 20140517 00:34:15< iceiceice> i read a long time ago never to throw exception in destructor anyways 20140517 00:34:46< gfgtdf> ye i somehwere read that too 20140517 00:35:23< iceiceice> anywas its not important, you can just run without strict mode to get the error 20140517 00:35:32< iceiceice> but its a puzzle that bugged me now :) 20140517 00:36:23< irker930> wesnoth: Chris Beck wesnoth:master 9964be28499d / data/test/scenarios/move_skip_sighted.cfg: fixup move_skip_sighted tests http://git.io/8o6ksQ 20140517 00:37:00< gfgtdf> iceiceice: maybe we can returns an object thet thorws an exception when it gets a std::endl with the << operator 20140517 00:37:03< gfgtdf> return 20140517 00:37:11< gfgtdf> and saves what ti got before 20140517 00:37:14< gfgtdf> it* 20140517 00:39:26< iceiceice> y thats a pretty good solution :) 20140517 00:39:39< iceiceice> idk if all the errors use std::endl, some might use \n 20140517 00:39:56< iceiceice> maybe it can override flush and use that or something? 20140517 00:40:21< gfgtdf> iceiceice: also some of them have more than one line, so they could use \n to sperate teh lines and use std::endl at teh end 20140517 00:40:27< gfgtdf> the* 20140517 00:42:02< gfgtdf> iceiceice: i don't know how to use the std ostream and adjust it to st things. 20140517 00:42:49< iceiceice> y maybe will mess around with it some time 20140517 00:45:29-!- _8680_ [~8680@2002:4404:712c:0:d17a:a232:c560:b22c] has quit [Ping timeout: 245 seconds] 20140517 00:46:18-!- _8680_ [~8680@2002:4404:712c:0:1d12:5493:fa43:aa97] has joined #wesnoth-dev 20140517 00:47:36-!- gfgtdf [~chatzilla@e177164014.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.90.1 [Firefox 29.0.1/20140506152807]] 20140517 01:01:27-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20140517 01:12:18-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20140517 01:20:52-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140517 01:23:41-!- Necrosporus [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 252 seconds] 20140517 01:26:05< irker930> wesnoth: Chris Beck wesnoth:1.12 f19fd113f53e / src/synced_commands.cpp: fixup [command] [move] implementation http://git.io/fIMMkw 20140517 01:26:19< irker930> wesnoth: Chris Beck wesnoth:master 77993f9d988c / src/synced_commands.cpp: fixup [command] [move] implementation http://git.io/8lRNLQ 20140517 01:26:21< irker930> wesnoth: Chris Beck wesnoth:master d7374f4080c2 / data/test/scenarios/test_move.cfg wml_test_schedule: add test_move unit tests http://git.io/KAzAAQ 20140517 02:08:57-!- mattsc [~mattsc@wesnoth/developer/mattsc] has quit [Quit: Ciao] 20140517 02:15:22-!- mattsc [~mattsc@wesnoth/developer/mattsc] has joined #wesnoth-dev 20140517 02:36:43-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140517 02:41:22-!- Ivanovic_ [~ivanovic@frnk-5f74d610.pool.mediaWays.net] has joined #wesnoth-dev 20140517 02:43:53-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 240 seconds] 20140517 02:44:01-!- Ivanovic_ [~ivanovic@frnk-5f74d610.pool.mediaWays.net] has quit [Changing host] 20140517 02:44:02-!- Ivanovic_ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140517 02:45:29-!- Ivanovic_ is now known as Ivanovic 20140517 02:56:34< iceiceice> Ivanovic: shadowm suggested earlier that I ask you for an irc cloak, is that alright? 20140517 03:03:26< irker930> wesnoth: Chris Beck wesnoth:master af4b67126663 / data/test/scenarios/test_unit_map.cfg wml_test_schedule: add unit test for basic unit map functionality http://git.io/-bfVjA 20140517 03:03:28< irker930> wesnoth: Chris Beck wesnoth:master bf2dda129c7b / data/test/scenarios/ (4 files): refactor sighted events test to be one file http://git.io/nndvtg 20140517 03:03:30< irker930> wesnoth: Chris Beck wesnoth:master 8d161347bcfa / data/test/scenarios/ (7 files): refactor assert, return, two_plus_two, to each be one file http://git.io/_j9xLQ 20140517 03:03:32< irker930> wesnoth: Chris Beck wesnoth:master 4e16a998a211 / data/test/scenarios/ (break_replay_with_lua_random.cfg fixed_lua_random_replay_with_sync_choice.cfg): refactor break_replay tests into one file http://git.io/x30ivQ 20140517 03:50:19-!- happygrue [~happygrue@wesnoth/developer/wintermute] has quit [Ping timeout: 240 seconds] 20140517 03:54:08< irker930> wesnoth: Chris Beck wesnoth:master 86fea3c55116 / data/test/scenarios/test_berzerk_firststrike.cfg wml_test_schedule: add unit test for berzerk + firststrike interaction https://github.com/wesnoth/wesnoth/commit/86fea3c55116368f2c2147d324ec4b78e3023c40 20140517 03:54:22-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has quit [Quit: Leaving] 20140517 04:21:22-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140517 05:10:32-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has quit [Read error: Connection reset by peer] 20140517 05:11:52-!- Jetrel [~Jetrel@c-75-73-180-126.hsd1.mn.comcast.net] has joined #wesnoth-dev 20140517 05:15:02-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20140517 06:03:57-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140517 06:11:47-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 06:16:41-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140517 06:31:58-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Excess Flood] 20140517 06:35:26-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has joined #wesnoth-dev 20140517 06:39:19< Ivanovic> iceiceice: in general: yes 20140517 06:39:23< Ivanovic> but i need to be around 20140517 06:39:30< Ivanovic> this is not the case at 5am local time 20140517 06:39:32< Ivanovic> ;) 20140517 07:10:25-!- mjs-de [~mjs-de@f049245026.adsl.alicedsl.de] has joined #wesnoth-dev 20140517 07:25:20-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has quit [Ping timeout: 258 seconds] 20140517 07:31:35-!- Necrosporus_ [~Necrospor@unaffiliated/necrosporus] has joined #wesnoth-dev 20140517 07:33:53-!- Necrosporus_ is now known as Necrosporus 20140517 07:35:04-!- EdB [~edb@ARennes-658-1-64-158.w2-14.abo.wanadoo.fr] has joined #wesnoth-dev 20140517 07:39:20-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140517 07:44:08-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140517 07:44:51-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 08:11:36-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140517 08:35:28-!- Duthlet [~Duthlet@wesnoth/mp-mod/Duthlet] has joined #wesnoth-dev 20140517 08:40:02-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20140517 08:58:23-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140517 08:59:46-!- Guest13793 [~cib@p5DD21B1D.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 09:00:16-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has quit [Ping timeout: 252 seconds] 20140517 09:04:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140517 09:16:17-!- irker930 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140517 10:03:36-!- sachith500 [~kvirc@112.135.234.102] has joined #wesnoth-dev 20140517 10:04:08-!- timotei [~timotei@wesnoth/developer/timotei] has quit [Ping timeout: 276 seconds] 20140517 10:05:28-!- timotei [~timotei@wesnoth/developer/timotei] has joined #wesnoth-dev 20140517 10:08:02-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 276 seconds] 20140517 10:28:05-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140517 10:42:26-!- Ivanovic_ [~nils@x2f4aacd.dyn.telefonica.de] has joined #wesnoth-dev 20140517 10:42:26-!- Ivanovic_ [~nils@x2f4aacd.dyn.telefonica.de] has quit [Changing host] 20140517 10:42:26-!- Ivanovic_ [~nils@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140517 10:42:40-!- Ivanovic_ [~nils@wesnoth/developer/ivanovic] has quit [Client Quit] 20140517 10:51:42-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140517 10:52:03-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140517 10:57:31-!- happygrue [~happygrue@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140517 11:20:06-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 12:40:47-!- markus_ [~mjs-de@f048215213.adsl.alicedsl.de] has joined #wesnoth-dev 20140517 12:43:58-!- mjs-de [~mjs-de@f049245026.adsl.alicedsl.de] has quit [Ping timeout: 240 seconds] 20140517 13:00:52-!- markus_ is now known as mjs-de 20140517 13:09:23-!- Guest13793 [~cib@p5DD21B1D.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20140517 13:14:07-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140517 13:18:26-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has joined #wesnoth-dev 20140517 14:06:41-!- EdB [~edb@ARennes-658-1-64-158.w2-14.abo.wanadoo.fr] has quit [Quit: Konversation terminated!] 20140517 14:14:41-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has quit [Quit: DCW] 20140517 14:17:13-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140517 14:23:11< Necrosporus> In game advanced setting there's no hint for options "Show Combat" and "Show titlescreen animation" 20140517 14:23:38< Necrosporus> What does it do and which animation is meant? I guess, one with a bar when loading something 20140517 14:28:11-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has joined #wesnoth-dev 20140517 14:28:22-!- pluto [~pluto@151.66.133.19] has joined #wesnoth-dev 20140517 14:28:34< pluto> hi 20140517 14:29:00< pluto> HIIIIIIIII 20140517 14:29:22< pluto> you are stupid people buahahahaha 20140517 14:29:47< vultraz> Necrosporus: it used to be that it would cause the logo to windowshade-ish reveal itself when you started 20140517 14:30:13< vultraz> IMO it was a very cheap effect 20140517 14:30:22< vultraz> Somehow it got broken 20140517 14:30:38< vultraz> No one's bothered to fix it and I've advocated removing the option altogether 20140517 14:31:32-!- pluto [~pluto@151.66.133.19] has quit [Client Quit] 20140517 14:33:07< Necrosporus> vultraz, what about show combat? 20140517 14:34:04< vultraz> Not...exactly sure 20140517 14:43:05-!- sachith500 [~kvirc@112.135.234.102] has quit [Ping timeout: 240 seconds] 20140517 15:00:55< Necrosporus> Also I studied source of An Orcish Incursion, in last scenario there's [ai] tag in player side and same recruit list repeated three times in EASY, HARD and MEDIUM ifdefs 20140517 15:05:27-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20140517 15:05:29-!- _8680_ [~8680@2002:4404:712c:0:1d12:5493:fa43:aa97] has quit [Ping timeout: 245 seconds] 20140517 15:06:05-!- _8680_ [~8680@2002:4404:712c:0:f56f:3bff:ed67:3f9d] has joined #wesnoth-dev 20140517 15:08:48-!- irker317 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140517 15:08:48< irker317> wesnoth: Charles Dang wesnoth:master 6a4ac207730b / data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg: AOI S7: removed redundant difficulty-conditional recruit list http://git.io/IrUl7g 20140517 15:09:06< vultraz> Necrosporus: ^ 20140517 15:15:24< irker317> wesnoth: Charles Dang wesnoth:master 493f8d8fee1c / data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg: AOI S7: removed [ai] tag from player side http://git.io/BJJx6w 20140517 15:16:13< vultraz> Thanks for pointing that out 20140517 15:19:30< Necrosporus> But maybe it was present for a reason? 20140517 15:20:21< vultraz> Nah 20140517 15:20:35< vultraz> Player sides never have ai tags 20140517 15:21:06< Necrosporus> Maybe it was for debugging? Like if player could droid and get victory doing nothing 20140517 15:22:13< vultraz> If you noticed, half the keys had no values anyway 20140517 15:23:24< Necrosporus> I have not set [ai] values for my scenario and I wonder if I have to 20140517 15:23:40< Necrosporus> Like aggression caution and so on 20140517 15:24:30< Necrosporus> IS there a way to clear labels from WML? 20140517 15:24:48< Necrosporus> I mean all the labels on map 20140517 15:36:23-!- cib [~cib@p5DD21B1D.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 15:36:47-!- cib is now known as Guest64928 20140517 15:36:49< vultraz> there should be.. 20140517 15:37:44< vultraz> [label] 20140517 15:37:46< vultraz> x,y={EVERYWHERE} 20140517 15:37:47< vultraz> text="" # wmllint: ignore 20140517 15:37:49< vultraz> [/label] 20140517 15:42:18< Necrosporus> http://pastebin.com/c1c6Aym6 20140517 15:42:25< Necrosporus> I guess I'm doing something wrong 20140517 15:47:43< Necrosporus> side turn refresh -> turn refresh 20140517 15:48:41< vultraz> there's "side X turn refresh" but "side turn refresh" is not valid 20140517 15:50:18< Necrosporus> I see, I forget first_time_only=no 20140517 15:51:49< Necrosporus> So this clever event should let me see why my code is not working 20140517 15:55:22-!- Bodhi-Baum [~Bodhi@dslb-084-063-052-208.pools.arcor-ip.net] has joined #wesnoth-dev 20140517 15:56:56< Necrosporus> Labels are not cleared though 20140517 16:03:16< Necrosporus> http://pastebin.com/6ykBgUpe this time seem to work 20140517 16:19:43< zookeeper> vultraz, the [ai] tags might be intentional. 20140517 16:20:11< zookeeper> to make the AI able to play the player side, for whatever reason 20140517 16:27:41< Necrosporus> I can't see what's the difference between [filter] and [filter_self] http://wiki.wesnoth.org/AbilitiesWML 20140517 16:29:23< Necrosporus> or it's like... filter self determines if unit receives effects of ability (if it affect multiple units) filter determines if anyone at all receives effect 20140517 16:29:57< Necrosporus> and if it affects only unit itself, then they are equivalent 20140517 16:32:53-!- sachith500 [~kvirc@112.135.234.102] has joined #wesnoth-dev 20140517 16:40:32-!- sachith500 [~kvirc@112.135.234.102] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140517 16:46:21< Necrosporus> Though why official [hides] abilities use [filter_self] ? 20140517 16:52:49-!- Bodhi-Baum [~Bodhi@dslb-084-063-052-208.pools.arcor-ip.net] has quit [Quit: Verlassend] 20140517 16:56:51-!- mjs-de [~mjs-de@f048215213.adsl.alicedsl.de] has quit [Ping timeout: 252 seconds] 20140517 17:26:34-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140517 17:32:40-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 17:39:09< Necrosporus> http://wiki.wesnoth.org/AiWML there's a mistake at stuff like [avoid]= 20140517 17:39:22< Necrosporus> tags are wrongly presented as attributes 20140517 17:39:37-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140517 17:42:45-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140517 17:45:50< vultraz> Noted 20140517 17:47:13< Necrosporus> Anyway... should AI really set moves to 0 ? 20140517 17:54:41-!- iceiceice [~chris@cpe-66-108-20-80.nyc.res.rr.com] has joined #wesnoth-dev 20140517 17:59:29< iceiceice> hmm, i noticed that some code in map_location.cpp is throwing bad_lexical_casts that we don't catch 20140517 17:59:56< iceiceice> thats considered a bug, right? 20140517 18:00:15< iceiceice> relevant links: 20140517 18:00:15< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/map_location.cpp#L447 20140517 18:00:21< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/soundsource.cpp#L241 20140517 18:00:26< iceiceice> https://github.com/wesnoth/wesnoth/blob/master/src/actions/undo.cpp#L110 20140517 18:06:03-!- gfgtdf [~chatzilla@e177117220.adsl.alicedsl.de] has joined #wesnoth-dev 20140517 18:07:08< gfgtdf> iceiceice: yes thst is a bug, also bad_lexical_cast shoudl devide from std::exception and give a proper message, 20140517 18:07:48< iceiceice> gfgtdf: i'm going to change the code we modified in synced_commands [move] to use read_locations 20140517 18:08:11< iceiceice> but i think i might let read_locations throw the bad_lexical_cast? 20140517 18:08:24< iceiceice> and catch it at the places that are constructing these objects 20140517 18:09:16< gfgtdf> iceiceice: read_locations looks unsave to me in case the arras have a different length 20140517 18:09:54< iceiceice> y i'm thinking i will make it throw bad lexical cast in that case too 20140517 18:10:39< gfgtdf> iceiceice: <, it's definitley better than than a segafult 20140517 18:10:40< iceiceice> maybe some other kind of parsing exception is better but bad lexical cast is pretty close 20140517 18:10:44< gfgtdf> s/ iceiceice: can you also make bad lexical cast devide from std::exception ? 20140517 18:11:24< iceiceice> ok 20140517 18:11:59< iceiceice> i guess could switch to boost lexical cast also 20140517 18:12:11< iceiceice> idk if our lexical cast is defined as like a legacy from before we had boost 20140517 18:12:35< iceiceice> it probably doesnt make a difference, i guess i will just leave it for if we phase it out later 20140517 18:14:28< gfgtdf> iceiceice: i ahve somewhere heard that boost::lexical_cast is slow sometimes becasue, adn one shodul sholve that by makign an explicit template specialisation for teh most common types like string -> int 20140517 18:14:42< gfgtdf> becasue boost uses a ratehr generic solution 20140517 18:14:52< iceiceice> ok 20140517 18:14:59< iceiceice> i'm just going to leave with wesnoth lexical cast then i guess 20140517 18:15:06< iceiceice> and we can sort that stuff in the future 20140517 18:15:31-!- irker317 [~irker@fehu.ai0867.net] has quit [Quit: transmission timeout] 20140517 18:17:41-!- shadowm_desktop [ignacio@wesnoth/developer/shadowmaster] has joined #wesnoth-dev 20140517 18:23:02< Necrosporus> gfgtdf, so I fixed my ability, but AI should not really modify units parameters directly, as it breaks some assumptions like unit.moves only changes on start of turn or movement 20140517 18:23:49< gfgtdf> Necrosporus: matsc and crab know more about the ai than i do. 20140517 18:24:16< Necrosporus> gfgtdf, do you want to see fixed code? 20140517 18:24:38< gfgtdf> hm surem but your last coe alread worked for me 20140517 18:24:40< gfgtdf> sure 20140517 18:27:23< Necrosporus> http://pastebin.com/Q8U9H0Rn 20140517 18:28:03< mattsc> gfgtdf, Necrosporus: I have given my opinion on that topic already and am not going to change it just because the same question is asked again. 20140517 18:29:31< mattsc> Necrosporus: and I could turn your argument right around: you should not make assumptions like that because moves might be changed by the AI, by WML or by Lua. 20140517 18:30:22< gfgtdf> mattsc: do you know whether there is a was to knwo the current mose position in lua ? 20140517 18:30:25< gfgtdf> way 20140517 18:30:56< gfgtdf> mattsc: not in pixels but the hex that the mosecurrentl is 20140517 18:30:59< Necrosporus> mattsc, what do you think about code I pasted last? 20140517 18:31:20< Necrosporus> does it make assumptions it shouldn't? 20140517 18:31:33< mattsc> gfgtdf: I don’t think there is. Or at least I am not aware of any. 20140517 18:31:48< mattsc> Necrosporus: don’t have time to look at it right now, sorry. 20140517 18:31:55< iceiceice> mattsc: maybe it would be good to make a note on UnitWML on the wiki 20140517 18:32:02< iceiceice> to dispell mythical assumptions about unit.moves 20140517 18:32:24< mattsc> iceiceice: does the page say the opposite? 20140517 18:32:36< iceiceice> no but its pretty subtle 20140517 18:32:55< Necrosporus> gfgtdf, resting thing doesn't work because it is set by no at start of first turn and because when unit moves resting is set to no not at the start of movement, but at the end of it, while I want the unit to unhide when it starts moving (and hide again when it stands on place long enough) 20140517 18:33:12< gfgtdf> mattsc: some location equivalent of wesnoth.get_displayed_unit is what i thought of 20140517 18:33:44< mattsc> Guys, sorry, I really can’t get into a discussion right now. I’ll read the logs later. 20140517 18:35:45< gfgtdf> Necrosporus : you can also do it event based 20140517 18:36:15< gfgtdf> Necrosporus: shaouldnt be too hard 20140517 18:36:26< Necrosporus> gfgtdf, doesn't code I pasted do it? 20140517 18:38:02< gfgtdf> Necrosporus: but that code always makes it invisible wuridn athe other units run ? i thougth you lany want ti invisilbe when the unit didnt move in its last turn 20140517 18:38:26< gfgtdf> s/wuridn athe other units run/during the other sides turn 20140517 18:40:00< Necrosporus> gfgtdf, well, at least units stays visible when it kills something 20140517 18:40:13-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has quit [Quit: Upgrading WeeChat…] 20140517 18:40:26< gfgtdf> Necrosporus: also during the next sides turn ? 20140517 18:40:37< Necrosporus> And maybe it's ok if it stands invisible on other sides turn even if it moved (but not attacked), I'm not sure 20140517 18:40:42< Necrosporus> yes 20140517 18:48:01< gfgtdf> Necrosporus: but [not] side=$side_number shoudl always be true durign another players turn and therefore teh unit shoudl always be hidden then 20140517 18:48:14< gfgtdf> durign other players turns 20140517 18:53:09< Necrosporus> [hides] also mades some checks I guess 20140517 18:53:26< Necrosporus> Like whenever unit is adjacent to enemy 20140517 18:53:41< gfgtdf> Necrosporus : sure but still 20140517 18:53:55< Necrosporus> gfgtdf, test yourself 20140517 18:54:19< Necrosporus> also you could use other macro to insert at the end and get animations 20140517 19:12:49-!- c74d [~c74d3a4eb@2002:4404:712c:0:76de:2bff:fed4:2766] has joined #wesnoth-dev 20140517 19:18:50-!- vultraz [~chatzilla@124.109.10.167] has quit [Ping timeout: 255 seconds] 20140517 19:24:15-!- vultraz [~chatzilla@124.109.10.167] has joined #wesnoth-dev 20140517 19:57:49-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140517 20:00:42-!- Sulfur [~Miranda@p5B00801A.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140517 20:02:51-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140517 20:05:02-!- prophile [~alynn@oftn/member/prophile] has quit [Client Quit] 20140517 20:07:56-!- vultraz [~chatzilla@124.109.10.167] has quit [Changing host] 20140517 20:07:56-!- vultraz [~chatzilla@wesnoth/developer/vultraz] has joined #wesnoth-dev 20140517 20:45:44-!- RiftWalker [~nathan@ip24-252-126-205.no.no.cox.net] has joined #wesnoth-dev 20140517 20:57:27< gfgtdf> does any1 know why we disable teh debug library in our lua ? 20140517 21:06:47< loonycyborg> Sandboxing? 20140517 21:08:20< gfgtdf> loonycyborg: hm maybe but can you tell me an attacking scenario wthough luas debug lib ? 20140517 21:10:47< loonycyborg> I know little of lua, but I suspect debug api could expose access to parts of lua that are supposed to be closed. 20140517 21:23:05< gfgtdf> loonycyborg: hmm i just checked the code an with the way we use reinterpret_cast in lua.cpp it might indeed be a problem, but think that can be fixed somehow 20140517 21:23:55< loonycyborg> Better ask about it on the mailing list too 20140517 21:29:39-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: ancestral] 20140517 21:36:03-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140517 21:36:05< c74d> gfgtdf: “You should exert care when using this library. Several of its functions violate basic assumptions about Lua code […] and therefore can compromise otherwise secure code.” [] 20140517 21:37:25< c74d> (I don’t know any specifics though.) 20140517 21:39:26-!- irker252 [~irker@fehu.ai0867.net] has joined #wesnoth-dev 20140517 21:39:26< irker252> wesnoth: Chris Beck wesnoth:master b7f9f37f4dfa / src/log.cpp: small refactor of strict mode logging http://git.io/hnaYeQ 20140517 21:39:28< irker252> wesnoth: Chris Beck wesnoth:master dfdd43ba384d / src/ (10 files in 2 dirs): rename builder.cpp -> terrain_builder.cpp http://git.io/4XKy4A 20140517 21:39:30< irker252> wesnoth: Chris Beck wesnoth:master a6eb8bb4ef8f / src/lexical_cast.hpp: bad_lexical_cast derives from std::exception http://git.io/pm5zQg 20140517 21:39:32< irker252> wesnoth: Chris Beck wesnoth:master c7ea7677ab38 / src/ (5 files in 3 dirs): catch bad lexical casts (from parsing map locations from configs) http://git.io/rVDtmA 20140517 21:39:34< irker252> wesnoth: Chris Beck wesnoth:master bba94e422c48 / src/ (CMakeLists.txt SConscript tests/test_map_location.cpp): add map_location characterization tests http://git.io/8YTsDw 20140517 21:41:15< iceiceice> oh fuck 20140517 21:41:47< iceiceice> i just force pushed origin by accident... 20140517 21:41:52< iceiceice> i renamed my remotes yesterday 20140517 21:42:04-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140517 21:42:10-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140517 21:42:24< iceiceice> Vultraz: can you force push wesnoth master? i think i overwrote your commits 20140517 21:42:49-!- mjs-de [~mjs-de@p508C9A2A.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140517 21:42:54< iceiceice> or any one who has pulled vultraz's commits 20140517 21:43:30< iceiceice> :( :( :( 20140517 21:44:48< iceiceice> i had not pulled master today yet, there is no way for me to fix this unfortunately afaik 20140517 21:44:53< c74d> Searching my scrollback for messages from irkers, it seems that master previously pointed to 493f8d8fee1c. 20140517 21:45:46< iceiceice> y you can see in logs 20140517 21:45:54< iceiceice> there are two commits from Charles Dang i overwrote 20140517 21:46:44< iceiceice> did anyone have an up to date master? 20140517 21:46:52< iceiceice> besides Vultraz? 20140517 21:47:19< c74d> One could fetch that specific commit (and its according history). 20140517 21:47:27< iceiceice> no its not in the repo anymore afaik 20140517 21:47:56< iceiceice> oh hmm you are right 20140517 21:48:31< iceiceice> hmm ok i think i see what i can do 20140517 21:48:34< iceiceice> thx 20140517 21:49:30< Coffee_irc> iceiceice: not again :P 20140517 21:49:43< iceiceice> its a different snafu this time :/ 20140517 21:49:59< iceiceice> not sleepy just got confused ... i renamed origin to fork, and upstream to origin recently 20140517 21:50:33< c74d> Why upstream to origin? 20140517 21:50:57< Coffee_irc> this is why I just do the lazy thing and clone branches into separate folders 20140517 21:51:39< shadowm> Did somebody ask for a rubber mallet? 20140517 21:51:48< shadowm> I came as soon as I could. 20140517 21:52:00< c74d> If you cloned from the fork rather than from the authoritative repository, calling the latter “upstream” makes more sense to me than “origin”. 20140517 21:52:21< c74d> Clone branches into… wha? 20140517 21:52:47< iceiceice> y its a long story... 20140517 21:52:54< iceiceice> i accdientally corrupted my repo and rebuilt it 20140517 21:52:56< Coffee_irc> c74d: I've got separate folders on my comuter for 1.12 and master 20140517 21:53:00< iceiceice> and cloned from wesnoth/wesnoth this time instead 20140517 21:53:30< iceiceice> ok so heres what has happened 20140517 21:53:42-!- gfgtdf_ [~chatzilla@e177122105.adsl.alicedsl.de] has joined #wesnoth-dev 20140517 21:53:44< iceiceice> i formatted my 5 commits as a patch and reset --hard my master 20140517 21:53:46< iceiceice> but... 20140517 21:53:57< iceiceice> i dont know how i can reinsert vultraz's commits without fucking up history for sure 20140517 21:53:58< shadowm> I don't always use a fork, but when I do, I name it 'fork' to avoid any potential for confusion. 20140517 21:54:16< iceiceice> i think im just oging to stick with "upstream" and "fork" from now on... origin is in my muscle memory now i fear 20140517 21:54:29< iceiceice> but anyways 20140517 21:54:40< iceiceice> the thing is i cannot cherry-pick them? 20140517 21:54:43< iceiceice> or otherwise commit them?? 20140517 21:54:57< iceiceice> i feel like i should do something like 20140517 21:55:04< iceiceice> checkout -f (vultraz's 2nd commit) master 20140517 21:55:05< iceiceice> and pusht hat 20140517 21:55:10< iceiceice> to restore history 20140517 21:55:13< shadowm> Does 493f8d8fee1c still exist in the remote? 20140517 21:55:17< c74d> Force-push vultraz’s master back into place, then re-apply your commits properly? 20140517 21:55:18< shadowm> Does it exist in your clone? 20140517 21:55:34-!- gfgtdf [~chatzilla@e177117220.adsl.alicedsl.de] has quit [Ping timeout: 240 seconds] 20140517 21:55:36< iceiceice> i have hard reset to the time point just before vultraz's two commits 20140517 21:55:36-!- gfgtdf_ is now known as gfgtdf 20140517 21:55:44< iceiceice> and i fetched upstream 20140517 21:55:47< Coffee_irc> iceiceice: I don't think there is much of a problem 20140517 21:55:55< Coffee_irc> https://github.com/wesnoth/wesnoth/commit/6a4ac207730bef7c1ce5d02fbe0b0850b8322816 20140517 21:56:00< Coffee_irc> https://github.com/wesnoth/wesnoth/commit/493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 21:56:17< Coffee_irc> you could reapply these commits manually I think if these are the missing ones 20140517 21:56:20< shadowm> That wasn't what I was asking. 20140517 21:56:31< shadowm> Does `git show 493f8d8fee1c` show something for you? 20140517 21:57:19< iceiceice> no i dont think so 20140517 21:57:35< shadowm> You don't think? That means you didn't try first? 20140517 21:57:43< iceiceice> i did try it and id ont have it 20140517 21:57:45< iceiceice> i'm trying to fetch it 20140517 21:58:06< shadowm> Okay, I was about to suggest that next but I don't know how that'd be done, so... 20140517 21:58:22< iceiceice> ok i figured it out i think 20140517 21:58:31< iceiceice> git fetch origin 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 21:58:33< iceiceice> this ran without error 20140517 21:58:35 * shadowm hands the mallet to c74d. 20140517 21:58:44< shadowm> c74d: You deal with this. 20140517 21:58:49< vultraz> I actually don't have a clone right now since I still need to download it on my snail internet 20140517 21:58:56< vultraz> I committed those from the web interface 20140517 21:59:01< iceiceice> however i still have this: git show 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 21:59:02< iceiceice> fatal: bad object 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 21:59:36< iceiceice> git show origin/493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 21:59:36< iceiceice> fatal: ambiguous argument 'origin/493f8d8fee1c0e748591ef827571dbd42a1bb9bc': unknown revision or path not in the working tree. 20140517 21:59:36< iceiceice> Use '--' to separate paths from revisions, like this: 20140517 21:59:36< iceiceice> 'git [...] -- [...]' 20140517 22:00:40< iceiceice> hmm well did anyone pull those commits??? 20140517 22:00:44< iceiceice> lol 20140517 22:00:57< Coffee_irc> iceiceice: can you do "git --reset hard bf2dda129c7b860602d405585864e20e6d6ea33b" first? 20140517 22:01:11< Coffee_irc> on your local branch before 20140517 22:01:15< iceiceice> whats bf2dda 20140517 22:01:24< Coffee_irc> this is the commit before the snafu 20140517 22:01:37< iceiceice> i think thats too far back 20140517 22:01:43< Coffee_irc> or so I believe, if it was only 2 commits ago, right? 20140517 22:01:56< iceiceice> 86fea3 is where i think vultraz's commits should be 20140517 22:02:05< Coffee_irc> ah sorry, 4e16a998a211428506d8cbeb493809223cccf6e6 20140517 22:02:30< iceiceice> if u look at logs i think its 86fea3 20140517 22:02:31< iceiceice> http://www.wesnoth.org/irclogs/2014/05/%23wesnoth-dev.2014-05-17.log 20140517 22:02:42< iceiceice> thats where my master is right nwo locally 20140517 22:02:44 * shadowm downloaded and just in case. 20140517 22:03:15< loonycyborg> How can you accidentally FORCE push? 20140517 22:03:29< loonycyborg> The whole point of forcing 20140517 22:03:29< shadowm> Accidentally force push to the wrong remote. 20140517 22:03:44< loonycyborg> is to prevent accidental actions :P 20140517 22:03:46< shadowm> i.e. accidentally pass the wrong remote. 20140517 22:03:52< loonycyborg> ah 20140517 22:05:46< iceiceice> it would be nice if there was like a second tier of "--force" that would not overwrite *other people's* commits 20140517 22:05:54-!- mjs-de [~mjs-de@p508C9A2A.dip0.t-ipconnect.de] has quit [Ping timeout: 240 seconds] 20140517 22:07:05< shadowm> It would be nice if GitHub had options to control force-pushing to shared repositories. 20140517 22:07:38< iceiceice> hmm i dont understand why this doesn't give me any output, positive or negative: $ git show-ref 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 22:07:47< c74d> It would be nice if everyone used forks and pull-requests exclusively. 20140517 22:08:17< c74d> A commit id isn’t a ref; why would that do anything? 20140517 22:08:19< Coffee_irc> c74d: then we'd never get anything done :P 20140517 22:08:31< iceiceice> shadowm: if i use apply-patch with the .patch files, will that count as me committing it i guess? 20140517 22:08:31< c74d> Coffee_irc? 20140517 22:08:35< c74d> Why not? 20140517 22:08:53< shadowm> iceiceice: Yeah, changes the committer date and id. Not sure if those count for the hash. 20140517 22:08:55< c74d> does that, and they get plenty done. 20140517 22:09:27< c74d> They grant something like 60-80 pull requests per week. 20140517 22:09:36< shadowm> Yeah c74d obviously every other project's workflow would work for us. 20140517 22:09:38< Coffee_irc> c74d: if you ask me mozilla should have quit making changes since Firefox 3 :) 20140517 22:09:58< Coffee_irc> anything that limits the number of changes in Firefox is a good thing 20140517 22:10:00< c74d> I’m not saying it’s a feasible thing for this project to switch to. 20140517 22:10:04< shadowm> How about Linus' workflow? I think that'd prevent pretty much every possible catastrophe both gitways and bugways. 20140517 22:10:36< iceiceice> ok so after reading, i think what the situation is, 20140517 22:10:40< shadowm> Coffee_irc: Then it wouldn't support flex. 20140517 22:10:44< iceiceice> theres some kind of stub for those commits in the repo? 20140517 22:10:45< bumbadadabum> eh I don't find the newer firefox version to be that bad 20140517 22:10:45< shadowm> All hail flex. 20140517 22:10:48< iceiceice> but i dont think i actually have the commits themselves 20140517 22:10:51< c74d> Firefox doesn’t use Rust. 20140517 22:11:01< bumbadadabum> *versions 20140517 22:11:12< iceiceice> "fatal: not a tree" means apparently that the commits aren't properly "in the repo" or something 20140517 22:11:22< Coffee_irc> c74d: I see that :P 20140517 22:11:32< shadowm> iceiceice: I don't think that command does what you think it does. 20140517 22:11:48< shadowm> And 'tree' in Git has a very specific meaning separate from the working tree. 20140517 22:12:28< iceiceice> which command, git checkout -f? 20140517 22:12:41< shadowm> git show-ref 20140517 22:13:05< iceiceice> ok, it looks i didn't post all my log info 20140517 22:13:14< iceiceice> $ git checkout -f 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 22:13:15< iceiceice> fatal: reference is not a tree: 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 22:14:13< c74d> If you don’t have the commit, how would you check it out? 20140517 22:14:23< iceiceice> i think i do have the commit 20140517 22:14:36< iceiceice> this gives no error: $ git show-ref 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 22:14:39< c74d> You said you didn’t? 20140517 22:14:46< iceiceice> and i specifically was able to fetch it with $ git fetch origin ... 20140517 22:14:55< iceiceice> i think i just have some stupid git stub or something 20140517 22:14:57< iceiceice> wihtout the content 20140517 22:15:03< iceiceice> idk i really dont know why i cant check it out 20140517 22:15:09< c74d> `git show-ref ` doesn’t make sense; a commit isn’t a ref. 20140517 22:15:45< c74d> Did the `git fetch` say anything? 20140517 22:15:50< iceiceice> no 20140517 22:15:55< iceiceice> but no error 20140517 22:16:12< iceiceice> hmm i think maybe should go to the github web interface and make a branch pointing tothe commit? 20140517 22:16:21< iceiceice> then i can fetch the branch and checkout -f ? 20140517 22:16:49< c74d> For me, `git fetch upstream 493f8d8fee1c` says “fatal: Couldn't find remote ref 493f8d8fee1c”. 20140517 22:17:17< iceiceice> hmm i got no error: 20140517 22:17:17< iceiceice> chris@chris-KLR650 ~/wesnoth-src/clone/wesnoth $ git fetch origin 493f8d8fee1c0e748591ef827571dbd42a1bb9bc 20140517 22:17:17< iceiceice> chris@chris-KLR650 ~/wesnoth-src/clone/wesnoth $ 20140517 22:17:42< iceiceice> i guess that doesnt mean it succeeded though 20140517 22:19:42< iceiceice> hmm well 20140517 22:19:51< iceiceice> if anyone can figure out how to get those commits locally in their repo 20140517 22:19:53< iceiceice> and force push 20140517 22:19:54< iceiceice> that woudl be great 20140517 22:20:05< iceiceice> i'm more or less out of ideas thoguh 20140517 22:20:19< iceiceice> it doesnt look like you can create a branch in the github web interface 20140517 22:23:21< iceiceice> http://stackoverflow.com/questions/18878489/how-to-retrieve-orphaned-commit-object-after-push-force 20140517 22:24:45< gfgtdf> iceiceice: i think you can 20140517 22:25:11< Coffee_irc> his article may be of help http://www.programblings.com/2008/06/07/the-illustrated-guide-to-recovering-lost-commits-with-git/ 20140517 22:25:13< Coffee_irc> *this 20140517 22:25:45< gfgtdf> iceiceice: chick "branch" and then enter teh name of tehnew branch in teh searchbox 20140517 22:26:14< iceiceice> gfgtdf: yeah i see that but it looks like it has to be from an existing branch 20140517 22:27:23< iceiceice> the stack overflow i posted says basically that i cant fetch orphaned commits from master and recommit them 20140517 22:28:00< iceiceice> i think that, either someone has to have actually gotten bad refs from this, 20140517 22:28:05< iceiceice> and then they can force push, 20140517 22:28:17< iceiceice> or ... we'll have to just recommit from shadowm's patch 20140517 22:28:26< Coffee_irc> I suppose it's then time to commit the diffs and post again to the mailing list :P 20140517 22:28:44< iceiceice> idk unless someone shows up and says they actually got bad refs, then we are saved :) 20140517 22:30:15< shadowm> Why is it my patch now? :\ 20140517 22:30:25< iceiceice> well its your .patch anyways 20140517 22:30:30< iceiceice> i guess i can get one too 20140517 22:30:35< shadowm> And it's actually two patches, not one. 20140517 22:30:58< shadowm> Anyone can fetch them as long as orphaned objects don't get pruned or something. 20140517 22:32:16< iceiceice> ok well 20140517 22:32:27< iceiceice> i think its safe to force push my master right now which is right before vultraz's commits 20140517 22:32:43< iceiceice> actually the longer it stays in this state the more chance someone will get bad refs from the new commits in the force push 20140517 22:32:49< shadowm> baldras already did. 20140517 22:32:58< iceiceice> y thats true 20140517 22:33:07< shadowm> What do you mean 'why'? :p 20140517 22:33:40< shadowm> Anyway, I assume those commits you pushed aren't wanted on our master? 20140517 22:34:25< Coffee_irc> iceiceice: I would just commit the diffs and post on the ML 20140517 22:34:39< Coffee_irc> why would you do another force push? 20140517 22:34:53< iceiceice> because for the reason i said 20140517 22:34:57< shadowm> That's kind of the point of my question. 20140517 22:35:14< iceiceice> shadowm: the commits i pushed are eventually wanted on master 20140517 22:35:22< iceiceice> but in this state its better 20140517 22:35:37< iceiceice> idk i guess its moot now if i'm just gonig to commit the diffs and be done with it 20140517 22:35:45< c74d> I would restore local master to the state before vultraz’s commits, commit vultraz’s commits, and force-push that. 20140517 22:35:54< iceiceice> right now its possible that anyone could pull master and not have bad refs 20140517 22:36:03< iceiceice> and in principle ivanovic could say "i pulled last night, huzzah" 20140517 22:36:06< iceiceice> force push that 20140517 22:36:07< c74d> Then apply iceiceice’s commits however was intended. 20140517 22:36:10< iceiceice> and eveyrhting woudl be peachy 20140517 22:36:51< iceiceice> anyways i ahve now saved the patch files as well 20140517 22:37:11< c74d> I’m afraid I have no better solution than using the commits downloaded from GitHub’s Web UI. 20140517 22:38:29< c74d> (Disclaimer: As always, I’m not a developer, only a… Git advisor, and I’m not giving anyone orders.) 20140517 22:38:45< iceiceice> y i think pretty shortly we will end up doing that... 20140517 22:38:47< iceiceice> it's been almost an hour 20140517 22:39:13< c74d> (Disclaimer: “Git advisor” is in no way an official position nor one of authority.) 20140517 22:39:37< shadowm> Okay. 20140517 22:39:49< shadowm> Does anyone have vultraz's commits? 20140517 22:39:59< shadowm> (vultraz doesn't, we know that.) 20140517 22:40:53< shadowm> Definition of 'have' here: pulled them before ice^3's forcepush. 20140517 22:41:09< shadowm> c74d stop asking me questions in side channel. :p 20140517 22:41:57< bumbadadabum> lol ice^3 20140517 22:42:30< shadowm> We also established that iceiceice doesn't have them either, since git show didn't give him anything. 20140517 22:42:33< bumbadadabum> iceiceice: did you actually name yourself after the Dota player or is it just a coincidence? 20140517 22:42:44< bumbadadabum> just thought about this right now 20140517 22:43:26< iceiceice> i guess i use a few handles, involution and iceiceice 20140517 22:43:27< shadowm> Okay I'm going to assume nobody does. 20140517 22:43:45< iceiceice> the iceiceice one is not necessarily after the dota player, but i did know of him and i guess it snot a coincidence 20140517 22:43:46< shadowm> iceiceice: Your commits... should I preserve them? [y/n] 20140517 22:43:53< iceiceice> i have them in patch files dont worry 20140517 22:44:01< iceiceice> they are still in rebase mode... 20140517 22:44:02< shadowm> That's not an answer. 20140517 22:44:07< iceiceice> dont preserve 20140517 22:44:28< shadowm> In that case, the new starting point should be the parent of b7f9f37f4dfa, right? 20140517 22:44:46< iceiceice> what i was going to do was 20140517 22:44:50< iceiceice> commit 6a4ac2 20140517 22:44:51< iceiceice> and 20140517 22:44:58< iceiceice> 493f8d 20140517 22:45:03< iceiceice> in that order 20140517 22:45:09< iceiceice> from the patch files 20140517 22:45:25< shadowm> Huh, why does my log look completely different? 20140517 22:46:25-!- Guest64928 [~cib@p5DD21B1D.dip0.t-ipconnect.de] has quit [Ping timeout: 265 seconds] 20140517 22:46:29< iceiceice> ok maybe it wasnt clear from chat about 10 minutes ago, 20140517 22:46:34< shadowm> Did you already reset it? 20140517 22:46:45< iceiceice> i forcibly reset to the point just before vultraz's commits 20140517 22:46:51< iceiceice> to prevent anyone from further gettign bad refs 20140517 22:47:00< shadowm> So you already did it? 20140517 22:47:05< iceiceice> not the add vultraz commits part 20140517 22:47:33< iceiceice> but i am about to do that part ig uess 20140517 22:47:37< shadowm> Okay, then my involvement in this situation ends here. I thought it was still unsolved. 20140517 22:47:38< iceiceice> since no one has the refs 20140517 22:50:05< shadowm> You can do it, right? 20140517 22:50:12< iceiceice> ok i am pushing vultraz commits now 20140517 22:50:26< irker252> wesnoth: Charles Dang wesnoth:master 5cc1d2f9e2a1 / data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg: AOI S7: removed redundant difficulty-conditional recruit list http://git.io/ERJJ9Q 20140517 22:50:29< irker252> wesnoth: Charles Dang wesnoth:master 4613e5a619de / data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg: AOI S7: removed [ai] tag from player side http://git.io/yn1ZGg 20140517 22:51:04< iceiceice> ok that's that 20140517 22:51:14< iceiceice> i will write the list now 20140517 22:55:08-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140517 22:55:21-!- wesbot changed the topic of #wesnoth-dev to: 1.11.14 (1.12 beta 5) is too buggy to be announced | string+feature freeze active on 1.12 | 241 bugs, 344 feature requests, 28 patches | Logs: http://irclogs.wesnoth.org | Alternate logs: http://wesnoth.debian.net | Don't paste on IRC! Use a pastebin: http://pastebin.com | http://imagebin.org 20140517 22:56:03-!- Duthlet [~Duthlet@wesnoth/mp-mod/Duthlet] has quit [Quit: leaving] 20140517 23:20:39-!- mjs-de [~mjs-de@f048215213.adsl.alicedsl.de] has joined #wesnoth-dev 20140517 23:28:13< Coffee_irc> is it all good to push commits again? 20140517 23:31:36< gfgtdf> iceiceice: do you know whether there is a way to get a message to the logs/stderr in wml without showing it to the user ? 20140517 23:31:48< iceiceice> y its ok to push commits 20140517 23:32:04< iceiceice> gfgtdf: i dont know of it if there is 20140517 23:33:09< irker252> wesnoth: David Mikos wesnoth:1.12 92ccb25807f7 / changelog src/multiplayer_create_engine.cpp: Remove 'allow_new_game=no' entries from random map new game list http://git.io/1jHbTA 20140517 23:33:57< irker252> wesnoth: David Mikos wesnoth:master d1c196cbeeef / changelog src/multiplayer_create_engine.cpp: Remove 'allow_new_game=no' entries from random map new game list http://git.io/SWrwEw 20140517 23:50:05-!- RiftWalker [~nathan@ip24-252-126-205.no.no.cox.net] has quit [Ping timeout: 252 seconds] 20140517 23:51:57-!- RiftWalker [~nathan@ip24-252-126-205.no.no.cox.net] has joined #wesnoth-dev 20140517 23:58:09-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 252 seconds] 20140517 23:59:18< iceiceice> lol 20140517 23:59:27< iceiceice> Coffee_irc: your last commit ends in "beeef" 20140517 23:59:29< iceiceice> what are the odds --- Log closed Sun May 18 00:00:05 2014