| Time |
Nick |
Message |
| 00:02 |
paramat |
for minetest (not mtgame) is it always necessary for a PR branch to be rebased on latest master before merging, even when there are no conflicts? |
| 00:03 |
sofar |
if you can merge you can merge, is my feeling |
| 00:04 |
sofar |
I just don't like the merge commits, so I end up manually squashing them |
| 00:07 |
paramat |
i admit i will often merge mtgame PRs if they are a little behind master but there are no conflicts |
| 00:15 |
sofar |
there's no correlation between actual risk to code and how easy the merge goes |
| 00:15 |
sofar |
could be a trivial merge but completely conflicting PRs |
| 00:15 |
sofar |
could be a broken merge but trivially non-conflicting PR |
| 00:16 |
sofar |
same like the mushroom one we had yesterday |
| 00:16 |
sofar |
blew up badly, just because they touched :) |
| 00:18 |
|
zat joined #minetest-dev |
| 00:31 |
|
PenguinDad joined #minetest-dev |
| 01:03 |
paramat |
now merging 3518 3543 trivial lua_api.txt updates |
| 01:13 |
paramat |
merged |
| 01:13 |
sofar |
excellent |
| 01:13 |
sofar |
I might take a stab this weekend at ItemStack metaRefs |
| 01:13 |
sofar |
it'll be a lot of c++ refactoring to reuse the nodemetaref code for itemstackmetaref |
| 01:14 |
sofar |
then those 2 classes can both use the same underlying metaref methods |
| 01:14 |
sofar |
with just different code to fetch and store the metadata |
| 01:32 |
|
lezzy joined #minetest-dev |
| 01:33 |
lezzy |
https://github.com/minetest/minetest/pull/3548 |
| 01:33 |
lezzy |
there now merge it, you cant deny me this one! |
| 01:33 |
lezzy |
ill be back ^^ |
| 01:38 |
|
jin_xi joined #minetest-dev |
| 01:43 |
paramat |
hehe i don't dare refuse it =D |
| 01:43 |
kaadmy |
colo->color |
| 01:48 |
|
lezzy joined #minetest-dev |
| 02:26 |
paramat |
now merging 3533 3548 |
| 02:31 |
|
lezzy2 joined #minetest-dev |
| 02:32 |
|
everamzah joined #minetest-dev |
| 02:33 |
paramat |
merged |
| 02:34 |
paramat |
feels good to be down to a mere 120 PRs |
| 02:53 |
|
paramat left #minetest-dev |
| 02:54 |
|
codus joined #minetest-dev |
| 03:04 |
|
behalebabo joined #minetest-dev |
| 03:08 |
|
Lunatrius` joined #minetest-dev |
| 03:22 |
|
Sokomine joined #minetest-dev |
| 03:30 |
|
kaeza joined #minetest-dev |
| 03:32 |
kaeza |
yay for merge time. too bad (at least) two trivial PRs are completely ignored (game#689 and game#768) |
| 03:33 |
kaeza |
sfan5, ShadowNinja, ^ |
| 03:36 |
kaeza |
also see game#662 |
| 03:37 |
kaeza |
okay, disregard 662. It's clearly WIP |
| 03:56 |
VanessaE |
welcome to minetest dev :P |
| 05:23 |
Skyduskguy |
how can i get the pos of an entity? |
| 05:23 |
Skyduskguy |
I want to set a node with an entity |
| 05:24 |
Skyduskguy |
place_node rather |
| 05:26 |
everamzah |
i'm guessing try #minetest or #minetest-mods ... also maybe getpos() but i dunno |
| 05:27 |
Skyduskguy |
this is dev? |
| 05:27 |
everamzah |
#minetest-dev, yes. |
| 05:27 |
Skyduskguy |
so am i in a bad spot? |
| 07:53 |
|
leat joined #minetest-dev |
| 08:43 |
|
Hunterz joined #minetest-dev |
| 09:14 |
|
Obani joined #minetest-dev |
| 09:30 |
|
nrzkt joined #minetest-dev |
| 09:57 |
|
VargaD joined #minetest-dev |
| 10:18 |
|
leat joined #minetest-dev |
| 10:28 |
|
technics joined #minetest-dev |
| 10:36 |
|
Calinou joined #minetest-dev |
| 10:36 |
|
red-001 joined #minetest-dev |
| 10:41 |
|
jin_xi joined #minetest-dev |
| 11:13 |
|
proller joined #minetest-dev |
| 11:23 |
|
Amaz joined #minetest-dev |
| 11:36 |
|
Fixer joined #minetest-dev |
| 11:41 |
|
proller joined #minetest-dev |
| 12:19 |
|
RealBadAngel joined #minetest-dev |
| 12:26 |
|
proller joined #minetest-dev |
| 12:32 |
RealBadAngel |
Skyduskguy, if obj is an entity just do obj:getpos() |
| 12:43 |
|
kaeza joined #minetest-dev |
| 12:56 |
|
CraigyDavi joined #minetest-dev |
| 13:00 |
|
Krock joined #minetest-dev |
| 13:16 |
|
est31 joined #minetest-dev |
| 13:18 |
|
Lunatrius joined #minetest-dev |
| 13:23 |
|
proller joined #minetest-dev |
| 13:26 |
|
turtleman joined #minetest-dev |
| 13:30 |
|
Ritchie joined #minetest-dev |
| 13:32 |
|
celeron55 joined #minetest-dev |
| 13:36 |
|
Fixer_ joined #minetest-dev |
| 13:43 |
|
celeron55 joined #minetest-dev |
| 13:51 |
|
rubenwardy joined #minetest-dev |
| 14:05 |
|
Taoki joined #minetest-dev |
| 14:12 |
|
proller joined #minetest-dev |
| 14:39 |
|
proller joined #minetest-dev |
| 14:53 |
|
H-H-H joined #minetest-dev |
| 15:03 |
|
blaze joined #minetest-dev |
| 15:10 |
|
kaadmy joined #minetest-dev |
| 15:13 |
|
ElectronLibre joined #minetest-dev |
| 15:14 |
sfan5 |
http://sprunge.us/MhjV?diff pushing in 10 mins |
| 15:15 |
est31 |
fine with me |
| 15:15 |
est31 |
probably we should still ship the old urls though |
| 15:15 |
est31 |
so that it works with legacy distros |
| 15:15 |
est31 |
but thats minetest.github.io repo problem |
| 15:42 |
|
EvergreenTree joined #minetest-dev |
| 15:50 |
sfan5 |
merging https://github.com/minetest/minetest/pull/2485 now (previously approved by est31) |
| 15:56 |
sfan5 |
merging https://github.com/minetest/minetest/pull/3460 now (est31 approved and announced that he would merge it in 2-3 days .. 3 days ago) |
| 16:03 |
|
Gael-de-Sailly joined #minetest-dev |
| 16:27 |
|
rubenwardy joined #minetest-dev |
| 17:12 |
|
est31 joined #minetest-dev |
| 17:12 |
|
Darcidride joined #minetest-dev |
| 17:28 |
|
kaeza joined #minetest-dev |
| 17:29 |
|
kaeza joined #minetest-dev |
| 17:31 |
|
jin_xi joined #minetest-dev |
| 17:32 |
|
kaeza joined #minetest-dev |
| 17:33 |
|
book` joined #minetest-dev |
| 17:44 |
|
blaze joined #minetest-dev |
| 17:58 |
|
hmmmm joined #minetest-dev |
| 18:03 |
|
proller joined #minetest-dev |
| 18:14 |
|
est31 joined #minetest-dev |
| 18:18 |
|
EvergreenTree joined #minetest-dev |
| 18:28 |
|
rubenwardy joined #minetest-dev |
| 18:35 |
|
rubenwardy_ joined #minetest-dev |
| 18:40 |
|
troller joined #minetest-dev |
| 19:00 |
|
rubenwardy joined #minetest-dev |
| 19:02 |
|
rubenwardy_ joined #minetest-dev |
| 19:05 |
|
DFeniks joined #minetest-dev |
| 19:06 |
|
rubenwardy joined #minetest-dev |
| 19:23 |
|
Soni joined #minetest-dev |
| 19:41 |
|
GhostDoge joined #minetest-dev |
| 20:03 |
|
rubenwardy_ joined #minetest-dev |
| 20:08 |
|
codus joined #minetest-dev |
| 20:29 |
|
diemartin joined #minetest-dev |
| 21:07 |
ShadowNinja |
https://github.com/minetest/minetest/pull/3434 seem fine? (check disable_anticheat) |
| 21:12 |
ShadowNinja |
It's trivial enough that I'll merge it myself in a bit. |
| 21:54 |
|
EvergreenTree joined #minetest-dev |
| 22:45 |
|
paramat joined #minetest-dev |
| 23:05 |
|
red-001 joined #minetest-dev |
| 23:15 |
|
paramat left #minetest-dev |
| 23:33 |
|
BrandonReese joined #minetest-dev |
