| 00:21.32 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 00:26.49 | blast007 | the latest 2.4 doesn't even build... |
| 00:27.23 | blast007 | ListServerConnection.cxx: In member function âvoid ListServerLink::addMe(PingPacket, std::string, std::string, std::string)â: |
| 00:27.26 | blast007 | ListServerConnection.cxx:387:39: error: cannot convert âstd::shared_ptr<NetHandler>â to âNetHandler*â in initialization |
| 00:27.54 | Flash | did you get everything? |
| 00:28.27 | blast007 | meaning? |
| 00:28.48 | blast007 | I did a git pull --rebase |
| 00:29.06 | blast007 | was a clean git repo (no build files) |
| 00:29.35 | blast007 | Flash: and you need to remove all your uses of nullptr |
| 00:29.46 | Flash | I was told that was OK |
| 00:30.23 | blast007 | I don't recall you specifically asking about that |
| 00:30.38 | Flash | As Jeff says, I've asked about 4 times |
| 00:30.40 | blast007 | GCC 4.4 does not support nullptr |
| 00:31.16 | Flash | presents hand for slapping |
| 00:32.26 | blast007 | also, if there's going to be a lot of whitespace and style changes, it's probably better to not include fixes in the same changeset |
| 00:33.38 | Flash | I know... XCode didn't do what I expected. |
| 00:33.47 | Flash | didn't intend to commit half of that |
| 00:34.32 | Not-fe6 | [02bzflag-import-3] 07jwmelto pushed 031 commit to 03v2_4_x [+0/-0/±2] 13http://git.io/-AdHwA |
| 00:34.33 | Not-fe6 | [02bzflag-import-3] 07Jim Melton 0365653c9 - Fix the build |
| 00:53.34 | Patlabor221 | Flash, shared_ptr is ok, not nullptr |
| 00:53.54 | Patlabor221 | you shoudl probalby be working in 2.6 |
| 00:54.04 | Patlabor221 | or a branch |
| 00:54.58 | Not-fe6 | [02bzflag-import-3] 07jwmelto pushed 031 commit to 03v2_4_x [+0/-0/±3] 13http://git.io/oRFDJQ |
| 00:54.59 | Not-fe6 | [02bzflag-import-3] 07Jim Melton 035508099 - Remove nullptr |
| 01:43.53 | *** join/#bzflag noyb (~noyb@cpe-172-248-224-184.socal.res.rr.com) |
| 01:54.32 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 02:06.54 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 02:33.33 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 02:35.14 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:80a4:6058:dcf8:744a) |
| 02:58.50 | spldart | :~ |
| 03:07.36 | Flash | can someone help me revert everything from the past two days? |
| 03:10.19 | Patlabor221 | you can't just rollback to the date? |
| 03:10.27 | Flash | I don't know git that well |
| 03:10.37 | Patlabor221 | did anyone else commit anything? |
| 03:10.47 | Flash | yes, one |
| 03:11.03 | Patlabor221 | was it in a file you modified? |
| 03:11.08 | Flash | no |
| 03:11.25 | Patlabor221 | then you should be able to rollback the other files |
| 03:13.06 | Patlabor221 | reset then push everthing but the files in that commit I'd think |
| 03:56.25 | Notify | 03BZFlag:Allejo * 8836 /Server_Permissions: Added info about jitterwarn and packetlosswarn |
| 03:57.45 | allejo | Flash, git revert <hash> |
| 04:03.46 | Patlabor221 | they should make it git oops |
| 04:15.52 | *** join/#bzflag apeman1 (~Victor@222-155-41-238.jetstream.xtra.co.nz) |
| 04:16.15 | *** part/#bzflag apeman1 (~Victor@222-155-41-238.jetstream.xtra.co.nz) |
| 04:25.26 | allejo | what? |
| 04:37.28 | Patlabor221 | you don't do a revert for a good reason :) |
| 04:50.14 | allejo | hmm? |
| 04:50.24 | allejo | ohhhhh i get it... "git oops |
| 04:50.29 | allejo | took me a while... |
| 04:54.49 | Patlabor221 | or git nonononononnononononono |
| 04:55.12 | Patlabor221 | undoing someone else's change should be git nope |
| 05:01.28 | allejo | too many "no's" to remember :p |
| 06:24.35 | Patlabor221 | so just like most command line options :) |
| 06:43.14 | *** join/#bzflag noyb (~noyb@cpe-172-248-224-184.socal.res.rr.com) |
| 08:22.21 | *** join/#bzflag thrakt (cz3141@gateway/shell/devio.us/x-mbshhaoiagznoddu) |
| 09:40.24 | allejo | current trunk is broken. should the changes be reverted? or wait for a fix to be committed? |
| 12:13.08 | *** join/#bzflag gnu-sense (~gnu-sense@c-98-223-179-205.hsd1.in.comcast.net) |
| 13:57.53 | *** join/#bzflag delusional (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 14:06.22 | *** join/#bzflag delusion_ (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 14:19.42 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 14:31.51 | *** join/#bzflag therealtbe (~AresHandl@pool-74-109-244-171.pitbpa.fios.verizon.net) |
| 14:35.57 | *** join/#bzflag delusional (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 15:11.24 | *** join/#bzflag delusion_ (~delusiona@pool-173-71-173-74.pitbpa.fios.verizon.net) |
| 15:55.43 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:eda5:1a7b:c502:a3d9) |
| 15:57.51 | *** join/#bzflag zlsa (~zlsa@static-205-157-147-198.ded.unwiredbb.net) |
| 16:20.32 | *** join/#bzflag Snake12534 (uid45641@gateway/web/irccloud.com/x-atgdwenpftoxtjxb) |
| 16:49.51 | *** join/#bzflag Patlabor221 (~JeffM@2605:e000:7d02:c700:eda5:1a7b:c502:a3d9) |
| 18:41.07 | *** join/#bzflag spldart (ac380fad@bzflag/contributor/spldart) |
| 18:41.07 | *** mode/#bzflag [+v spldart] by ChanServ |
| 18:41.18 | *** join/#bzflag Patlabor221_ (uid48618@gateway/web/irccloud.com/x-uvrxaqcvnjgileeu) |
| 19:57.23 | *** join/#bzflag I_Died_Once (~I_Died_On@2601:5:9880:327:847f:158d:ff0a:381e) |
| 19:57.37 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 20:58.42 | *** join/#bzflag JeffM (~Jeffery@2605:e000:7d02:c700:65ee:df2f:2e79:43eb) |
| 21:08.11 | Not-fe6 | [02bzflag-import-3] 07jwmelto pushed 031 commit to 03v2_4_x [+0/-0/±1] 13http://git.io/9t5qhw |
| 21:08.14 | Not-fe6 | [02bzflag-import-3] 07Jim Melton 03471f9d4 - Before I started mucking around in here, the second NetHandler ctor was indexing through random memory. The default time initialization prevents most clients from joining. Fixed to initialize to current time. |
| 22:15.42 | Flash | JeffM: is v2_6_x supposed to compile? Or more precisely, link? |
| 22:15.58 | JeffM | havent' tried in a while |
| 22:16.02 | JeffM | and on what platform? |
| 22:16.12 | Flash | I'm on OS X and it isn't linking. |
| 22:16.13 | JeffM | but yes, generaly everything we check in should compile |
| 22:16.24 | JeffM | OSX is not tested very much |
| 22:16.34 | JeffM | what is it giving an error on? |
| 22:16.54 | Flash | DialogData ... either the library not added or the code doesn't exist |
| 22:17.17 | Flash | I was about to grep and got distracted |
| 22:17.39 | JeffM | since we don't build on OSX, the files were probalby never added to it's proejct |
| 22:17.45 | JeffM | it is not based on the makefile anymore |
| 22:17.56 | Flash | I see the file in common ... that's odd. |
| 22:18.02 | Flash | I'll play with it more later |
| 22:18.09 | JeffM | seeing the file on disk is not the same |
| 22:18.25 | JeffM | is it in the project and flagged as being part of the build? |
| 22:19.33 | Flash | I see libcommon.a as part of the build. |
| 22:19.48 | Flash | but everything is red... I'll dig later |
| 22:31.22 | JeffM | red is generaly not a good color |
| 22:48.03 | blast007 | I don't have a Mac, so any added files have to be added to the Xcode project by someone else.. not even sure if I bothered with the Makefiles though |
| 22:48.46 | JeffM | imagine a system were you could just use visual studio files on every system :) |
| 23:29.13 | delusion_ | I've got 2.4.2 2.4.3-nogamma2 and 2.4.3-SDL2 none of them work on yosemite. the nogamma one was OK with yosemite-preview. ... interesting that config.cfg is an empty file |
| 23:31.27 | JeffM | build debug and see why |
| 23:32.21 | delusion_ | been a few years since i built |
| 23:33.51 | JeffM | since OSX can only be run on computers made by a single company, it can't be expected that we test on it very often |
| 23:34.17 | JeffM | doesn't help that the Apple Tax is quite high |
| 23:37.18 | delusion_ | iTax |
| 23:37.54 | JeffM | only one of the PC devices they sell starts with i anymore |
| 23:37.59 | JeffM | it's all "power" |
| 23:38.06 | JeffM | or "mac" |
| 23:38.07 | JeffM | or both |
| 23:38.09 | JeffM | ;) |
| 23:38.23 | JeffM | actualy don't do power anymore |
| 23:38.35 | JeffM | macbook, mac mini, mac pro, macbook |
| 23:38.39 | JeffM | and the iMac |
| 23:39.28 | delusion_ | iPad, iPod, Itunes, iPhone, then Mac and Watch |
| 23:39.47 | JeffM | I don't count the movile devices |
| 23:39.53 | delusion_ | ah, they are still calling it iMac |
| 23:39.55 | JeffM | they are not sold like PCs |
| 23:40.16 | JeffM | I can't buy any kinda of phone or tablet with my choice of OS |
| 23:40.29 | JeffM | they are not intedned to be use the same way as a PC |
| 23:40.47 | JeffM | you kinda buy them with all the bits bundled |
| 23:41.09 | JeffM | that and we don't target them so it's not really reasonable to discuss |
| 23:41.48 | JeffM | should totaly build his capstone project for iOS :) |
| 23:55.30 | delusion_ | I fixed it by finding an aloder copy of config.cfg and placing it in the correct location |
| 23:56.15 | delusion_ | i have no idea how the one in /library/bzflag got emptied |
| 23:56.36 | JeffM | there have been fixes in git to corupted config file creation |
| 23:56.43 | JeffM | building from source may fix it |
| 23:56.52 | delusion_ | it's fixed |
| 23:57.01 | JeffM | what you did is not a real fix |
| 23:57.07 | JeffM | it is a workaround |
| 23:57.13 | JeffM | another peson may not be able to do that |