*** tpb has joined #tp | 00:00 | |
*** ChanServ sets mode: +o tpb | 00:00 | |
*** mithro has quit IRC | 00:28 | |
*** mithro has joined #tp | 00:31 | |
mithro | llnz: I saw you merged the branches in tpserver-cpp? | 00:38 |
---|---|---|
mithro | can I delete the branches? | 00:39 |
llnz | mithro, i'm not sure, i think there might be some more changes in the risk branch | 00:40 |
mithro | okay | 00:42 |
mithro | it won't let me delete the branch if there are un-merged changes | 00:42 |
llnz | config can be remove, i know it's up to date | 00:45 |
llnz | tae probably can be removed | 00:45 |
* llnz must email a little more feedback to nuleren sometime | 00:46 | |
llnz | sometime you should document how you set up the branches on the server | 00:47 |
llnz | oh, btw, the sloc page isn't updating anymore | 00:47 |
llnz | guess it needs fresh clones from git (instead of cg) | 00:48 |
*** llnz has left #tp | 00:49 | |
*** llnz has joined #tp | 00:49 | |
llnz | wrong button | 00:49 |
llnz | brb, going to linux | 01:14 |
*** llnz has quit IRC | 01:14 | |
CIA-18 | jphr tpserver-cpp * rce9fd36121e3 /modules/games/risk/ (bugs.txt colonize.cpp): | 01:27 |
CIA-18 | Updated bugs text and fixed bug in colonize.cpp that caused a crash during a certain situation. | 01:27 |
CIA-18 | - The situation mentioned is when a bid to colonize a planet was placed from a planet with only 1 unit remaining, becoming an invalid bid | 01:27 |
CIA-18 | llnz tpserver-cpp * rbf7a91a770de /modules/games/risk/ (bugs.txt colonize.cpp): Merge commit 'origin/risk' | 01:27 |
*** llnz has joined #tp | 01:31 | |
llnz | mithro: all branches fully merged | 01:31 |
mithro | okay | 01:31 |
mithro | cool | 01:31 |
*** JLafont has quit IRC | 01:39 | |
* llnz wanders off | 01:41 | |
llnz | later all | 01:41 |
*** llnz has quit IRC | 01:41 | |
*** mithro has quit IRC | 03:15 | |
*** mithro has joined #tp | 03:18 | |
*** nash has quit IRC | 03:23 | |
*** tuna has quit IRC | 06:48 | |
*** Iwanowitch has joined #tp | 07:22 | |
mithro | hey Iwanowitch | 07:48 |
mithro | how goes everything? | 07:48 |
mithro | ezod: ping? | 07:49 |
Iwanowitch | mithro: Heya. I'm busy enjoying holidays. :) | 08:04 |
*** mithro has quit IRC | 08:30 | |
*** mithro has joined #tp | 08:52 | |
*** mithro has quit IRC | 09:29 | |
*** mithro has joined #tp | 09:30 | |
*** peres has joined #tp | 10:03 | |
*** JLafont has joined #tp | 12:20 | |
*** Ohm_ has joined #tp | 12:56 | |
ezod | mithro: pong, back :) | 14:10 |
*** peres has quit IRC | 14:23 | |
*** mithro_ has joined #tp | 14:56 | |
*** mithro has quit IRC | 14:56 | |
*** mithro_ has quit IRC | 15:31 | |
*** mithro_ has joined #tp | 15:31 | |
*** Iwanowitch has quit IRC | 16:39 | |
*** llnz has joined #tp | 17:06 | |
llnz | morning all | 17:13 |
*** mithro__ has joined #tp | 18:06 | |
*** mithro_ has quit IRC | 18:06 | |
*** tuna-fish has joined #tp | 18:08 | |
*** tuna-fish is now known as tuna | 18:08 | |
llnz | brb | 18:31 |
*** llnz has quit IRC | 18:31 | |
*** llnz has joined #tp | 18:34 | |
*** mithro__ has quit IRC | 18:52 | |
*** mithro__ has joined #tp | 18:53 | |
*** Iwanowitch has joined #tp | 19:52 | |
*** mithro__ has quit IRC | 20:12 | |
*** mithro has joined #tp | 20:38 | |
*** tuna has quit IRC | 21:05 | |
*** tuna-fish has joined #tp | 21:06 | |
*** tuna-fish is now known as tuna | 21:06 | |
*** peres has joined #tp | 21:31 | |
*** peres has left #tp | 21:59 | |
*** mithro has quit IRC | 22:08 | |
*** Iwanowitch has quit IRC | 22:17 | |
*** nash_ has joined #tp | 22:25 | |
*** Lukstr has quit IRC | 22:58 | |
*** mithro has joined #tp | 23:37 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!