| Time |
Nick |
Message |
| 00:51 |
|
dexter0 joined #minetest-dev |
| 01:01 |
VanessaE |
can we get some time on this code please? |
| 01:01 |
VanessaE |
https://github.com/minetest/common/pull/28 |
| 01:02 |
VanessaE |
before the code disappears I mean. |
| 01:03 |
VanessaE |
relevant discussion in #minetest: http://irc.minetest.ru/minetest/2013-04-17#i_3024654 |
| 03:14 |
|
salamanderrake joined #minetest-dev |
| 04:28 |
|
VanessaE joined #minetest-dev |
| 06:23 |
|
emptty joined #minetest-dev |
| 07:10 |
|
emptty1 joined #minetest-dev |
| 07:14 |
|
ImQ009 joined #minetest-dev |
| 08:02 |
|
emptty joined #minetest-dev |
| 08:17 |
|
darkrose joined #minetest-dev |
| 08:17 |
|
darkrose joined #minetest-dev |
| 08:26 |
|
emptty joined #minetest-dev |
| 08:35 |
|
darkrose joined #minetest-dev |
| 08:47 |
|
VanessaE joined #minetest-dev |
| 09:37 |
|
darkrose joined #minetest-dev |
| 09:40 |
|
PilzAdam joined #minetest-dev |
| 09:52 |
|
darkrose joined #minetest-dev |
| 10:13 |
|
BlockMen joined #minetest-dev |
| 10:13 |
BlockMen |
celeron55, https://github.com/celeron55/minetest.net_dokutemplate/pull/7 |
| 10:14 |
BlockMen |
and to the small layout change. i will take a look at it again. |
| 10:14 |
|
BlockMen left #minetest-dev |
| 10:21 |
|
VanessaE joined #minetest-dev |
| 10:24 |
|
proller joined #minetest-dev |
| 11:12 |
|
jojoa1997|Tablet joined #minetest-dev |
| 11:19 |
|
Calinou joined #minetest-dev |
| 12:21 |
|
emptty joined #minetest-dev |
| 12:28 |
celeron55 |
VanessaE: here's the patches in a place that doesn't disappear: https://gist.github.com/celeron55/5403847 https://gist.github.com/celeron55/5403850 https://gist.github.com/celeron55/5403852 |
| 12:33 |
|
iqualfragile joined #minetest-dev |
| 12:48 |
|
nyuszika7h joined #minetest-dev |
| 12:59 |
|
emptty1 joined #minetest-dev |
| 13:18 |
|
hmmmm joined #minetest-dev |
| 13:21 |
|
Zeg9 joined #minetest-dev |
| 13:38 |
|
ImQ009 joined #minetest-dev |
| 13:54 |
|
Exio joined #minetest-dev |
| 14:16 |
|
serengeor joined #minetest-dev |
| 14:34 |
|
OWNSyouAll joined #minetest-dev |
| 14:50 |
|
iqualfragile joined #minetest-dev |
| 14:52 |
|
ImQ009 joined #minetest-dev |
| 15:05 |
|
Jordach joined #minetest-dev |
| 15:05 |
|
Jordach joined #minetest-dev |
| 15:18 |
|
Calinou joined #minetest-dev |
| 15:38 |
|
jojoa1997|Tablet joined #minetest-dev |
| 15:45 |
|
rubenwardy joined #minetest-dev |
| 16:23 |
|
Zeg9 joined #minetest-dev |
| 16:27 |
|
dexter0 joined #minetest-dev |
| 16:30 |
|
iqualfragile1 joined #minetest-dev |
| 17:10 |
|
emptty joined #minetest-dev |
| 17:16 |
|
emptty joined #minetest-dev |
| 17:30 |
celeron55 |
https://github.com/minetest/minetest/pull/575 |
| 17:30 |
celeron55 |
are there problems with this? |
| 17:31 |
Taoki |
Did the GIT server move again? It's not getting any new commits for days |
| 17:31 |
Taoki |
Or was there nothing merged in master for so long? |
| 17:31 |
PilzAdam |
celeron55, there are probably rebase conflicts |
| 17:32 |
celeron55 |
Taoki: it's a bit quiet right now; and no, core is not going to be moved again in years, i predict |
| 17:32 |
Taoki |
ok |
| 17:32 |
proller |
maybe try astyle on new files in /pull/575 ? |
| 17:35 |
celeron55 |
wut, all the changes are in some odd merge commits |
| 17:35 |
celeron55 |
why is this screwed up like this |
| 17:36 |
PilzAdam |
celeron55, people tend to srew pull requests up by merging master into the branch instead of rebasing it |
| 17:37 |
celeron55 |
is there a way to revert it to be sane? |
| 17:39 |
celeron55 |
linus is right in that diffs are almost the best way to handle contributions... apparently better than using git wrongly, too |
| 17:40 |
PilzAdam |
one way that works: revert a master branch to the commit were the pull request is based on, cherry-pick the not-merge commit from the pull request, rebase |
| 17:41 |
celeron55 |
i'm surprised there even is a way |
| 17:41 |
PilzAdam |
I once had to make that for Jeija for his particlespawner branch |
| 17:41 |
PilzAdam |
it wasnt fun |
| 17:46 |
|
BackupCoder joined #minetest-dev |
| 18:05 |
PilzAdam |
were is the falling damage event triggered? |
| 18:06 |
PilzAdam |
oh, nvm, found it |
| 18:06 |
|
sudobash joined #minetest-dev |
| 18:09 |
|
aheinecke joined #minetest-dev |
| 18:33 |
|
rubenwardy1 joined #minetest-dev |
| 18:39 |
|
serengeor joined #minetest-dev |
| 18:53 |
|
emptty joined #minetest-dev |
| 19:00 |
|
VanessaE joined #minetest-dev |
| 19:05 |
VanessaE |
celeron55: good call, for some reason it just didn't occur to me to pastebin/gist the code. |
| 19:05 |
VanessaE |
(of course now 0gb has decided not to retire from Minetest, so the point may be moot :) ) |
| 19:11 |
|
Calinou joined #minetest-dev |
| 19:15 |
|
STHGOM joined #minetest-dev |
| 19:16 |
|
STHGOM left #minetest-dev |
| 19:16 |
|
StrayBytes joined #minetest-dev |
| 19:16 |
|
StrayBytes joined #minetest-dev |
| 19:21 |
celeron55 |
i think we should have an automatic bot that would scrape all pull requests and save them and their edit history |
| 19:21 |
|
rubenwardy1 left #minetest-dev |
| 19:21 |
celeron55 |
that way we wouldn't have to deal with contributors messing up those with merges and other things |
| 19:22 |
celeron55 |
or deleting them |
| 19:22 |
celeron55 |
also i think github should do this for us but they don't |
| 19:34 |
VanessaE |
celeron55: point of note, the games section lacks a clear rule regarding -ND and the like. I'll copy that over from the Mod Releases section. |
| 19:39 |
VanessaE |
Adding this to the end of the post: http://pastebin.com/CPd2c9GD |
| 19:39 |
VanessaE |
(plus a few minor highlight changes for consistency with the Mod Releases one) |
| 19:40 |
|
sapier joined #minetest-dev |
| 19:43 |
VanessaE |
fixed a copy&paste error, and posted. |
| 19:47 |
|
proller joined #minetest-dev |
| 20:29 |
hmmmm |
[01:30 PM] <celeron55> are there problems with this? |
| 20:29 |
hmmmm |
oh my god don't tell me you merged it yett |
| 20:29 |
hmmmm |
you were going to do that but you didn't because it wouldn't automatically merge |
| 20:29 |
hmmmm |
phew |
| 20:30 |
hmmmm |
like, first off, i'd like sapier to put them into separate directories scriptapi and modapi instead of shitting up the main source dir |
| 20:30 |
hmmmm |
and there was something else too |
| 20:31 |
sapier |
own directorys? Am I allowed to create thoses? :-) |
| 20:31 |
hmmmm |
don't go overboard please |
| 20:31 |
hmmmm |
just scriptapi and modapi |
| 20:31 |
sapier |
:-) |
| 20:31 |
hmmmm |
also |
| 20:31 |
sapier |
of course |
| 20:31 |
hmmmm |
are you still interested in that pull even? |
| 20:31 |
hmmmm |
you're not as pushy about it anymore |
| 20:32 |
sapier |
I am interested, but I didn't expect it to be included very soon ... I don't want to be too pushy |
| 20:32 |
sapier |
-o |
| 20:33 |
hmmmm |
see, the thing about that is, it'll mess up all of the current work being done that involves some sort of scriptapi addition |
| 20:33 |
hmmmm |
and there are a lot of pull requests with that |
| 20:33 |
hmmmm |
also the lua hud thing |
| 20:33 |
hmmmm |
https://github.com/minetest/minetest/pull/656 <-- this is a good idea |
| 20:34 |
hmmmm |
also, that ought to be done with saplings, but we'll worry about that later |
| 20:34 |
hmmmm |
it's much more involved |
| 20:35 |
hmmmm |
the sapling grow abm should be in lua |
| 20:35 |
hmmmm |
i don't understand why it isn't |
| 20:36 |
hmmmm |
grass, yes i can see, water flowing, i can see that too |
| 20:38 |
|
sapier joined #minetest-dev |
| 20:40 |
sapier |
I'd volonteer to merge all of the old changes but maybe we should announce some date where new additions should be added to new version only |
| 20:41 |
sapier |
as I don't want to merge new changes for months just to abadon everything by some time |
| 20:45 |
celeron55 |
hmmmm: whip up a date when the hud stuff is done; then the final scriptapi cleanup should be done |
| 20:47 |
ShadowNinja |
Should be closed: https://github.com/minetest/minetest/issues/643 |
| 21:02 |
|
sapier1 joined #minetest-dev |
| 21:18 |
VanessaE |
damn it. We need some kind of default hand tool for cutting - not a sword, but something like a handsaw. |
| 21:19 |
VanessaE |
(something that would make sense when used in a recipe) |
| 21:48 |
iqualfragile1 |
celeron55: https://github.com/minetest/minetest/pull/648 may i redirect some attention to that pull request? |
| 23:05 |
|
sapier left #minetest-dev |
