Minetest logo

IRC log for #minetest-dev, 2014-10-25

| Channels | #minetest-dev index | Today | | Google Search | Plaintext

All times shown according to UTC.

Time Nick Message
02:20 Zeno` joined #minetest-dev
02:42 Zeno` seems I shouldn't discuss things with karhl at 3AM (my time) in the morning
02:43 Zeno` I am having trouble rebasing (or merging master) https://github.com/minetest/minetest/pull/1756
02:44 Zeno` I could make a new branch, revert game.cpp and rebase against that but I don't know if that's frowned upon
02:44 Zeno` and then add the changes karhrl and I discussed manually
02:47 Zeno` any advise?
02:51 blaaaaargh joined #minetest-dev
02:52 Zeno` Can the commit be reverted and kahrl and I will discuss again?
02:54 Zeno` hmmmm, ShadowNinja?
02:56 ShadowNinja Zeno`: You can probably run `git rebase master <your branch name>`, select everything from your branch, and then add the change manually.  There might be a flag to `git rebase` to tell it to chose changes from your branch over the master branch always.
02:56 Zeno` hmm
02:56 Zeno` Such a simple thing I thought it'd be easy to fix but it's a mess :(
02:57 Zeno` What about: <Zeno`> I could make a new branch, revert game.cpp and rebase against
02:57 Zeno` add changes manually (easy), delete old branch, rename temp branch, force push
02:57 Zeno` or is that even worse?
03:05 Zeno` actually I may be able to ignore game.cpp
03:29 Zeno` hmm
03:50 Miner_48er joined #minetest-dev
03:54 chchjesus joined #minetest-dev
04:15 zat joined #minetest-dev
04:37 Zeno` ok fixed
04:53 Simcra joined #minetest-dev
04:53 Simcra o/
05:35 sfan5 joined #minetest-dev
05:38 sfan5_ joined #minetest-dev
05:45 mos_basik joined #minetest-dev
05:45 mos_basik joined #minetest-dev
06:16 OldCoder What is player breath?
06:48 kilbith joined #minetest-dev
07:02 kilbith left #minetest-dev
07:14 Zeno` joined #minetest-dev
07:25 proller joined #minetest-dev
07:29 VanessaE joined #minetest-dev
07:33 ImQ009 joined #minetest-dev
07:59 Hunterz joined #minetest-dev
08:06 GrimKriegor joined #minetest-dev
08:06 kilbith_ joined #minetest-dev
08:17 darkrose joined #minetest-dev
08:20 nore joined #minetest-dev
08:21 selat joined #minetest-dev
08:23 ImQ009 joined #minetest-dev
08:25 CraigyDavi` joined #minetest-dev
08:33 CraigyDavi`` joined #minetest-dev
08:54 chchjesus__ joined #minetest-dev
08:59 Amaz joined #minetest-dev
09:03 proller joined #minetest-dev
09:13 iqualfragile joined #minetest-dev
09:17 casimir joined #minetest-dev
09:22 selat joined #minetest-dev
09:29 iqualfragile joined #minetest-dev
09:40 PenguinDad joined #minetest-dev
09:42 iqualfragile joined #minetest-dev
09:43 Simcra joined #minetest-dev
09:48 iqualfragile joined #minetest-dev
10:47 kilbith joined #minetest-dev
11:10 Du_Draig joined #minetest-dev
11:24 DuDraig joined #minetest-dev
11:49 iqualfragile joined #minetest-dev
12:16 hintss joined #minetest-dev
12:21 GhostDoge joined #minetest-dev
12:24 johnnyjoy joined #minetest-dev
12:47 BlockMen joined #minetest-dev
12:47 shadowzone joined #minetest-dev
12:49 iqualfragile_ joined #minetest-dev
12:53 Amaz joined #minetest-dev
13:09 iqualfragile joined #minetest-dev
13:19 kilbith joined #minetest-dev
13:20 iqualfragile joined #minetest-dev
13:28 iqualfragile joined #minetest-dev
13:35 Zeno` Hi can anyone join linuxgaming.us and see if their RAM continually increases?
13:37 iqualfragile joined #minetest-dev
13:40 Zeno` It's probably here: https://github.com/minetest/minetes​t/blob/master/src/client.cpp#L1745
13:40 Zeno` to 1758
13:40 Zeno` and surrounding
13:42 kilbith surely the RAM lacks from the meshes
13:43 Zeno` kilbith, I don't think it does
13:43 Zeno` Otherwise I'd see it in other places
13:44 Zeno` in that section of code I can't find (yet) where that newly allocated memory is freed
13:44 Zeno` I'm happy to be wrong though :)
13:44 kilbith be aware that the mesh handling is still buggy
13:44 kilbith RBA & VanessaE can confirm
13:46 Zeno` Yeah it is
13:46 Zeno` But this doesn't seem related
13:46 shadowzone joined #minetest-dev
13:46 Zeno` Mesh stuff should not be touching that part of the code I linked
13:47 Zeno` ok, I know why but I'm not gonna tell
13:48 Zeno` because I don't want my refactor of the_game() messed up again before it's merged
13:54 shadowzone joined #minetest-dev
13:58 prozacgod joined #minetest-dev
14:01 hmmmmm joined #minetest-dev
14:09 proller joined #minetest-dev
14:25 iqualfragile joined #minetest-dev
14:50 proller oh, again sapier code 8(
14:50 proller im about client.cpp#L1745
14:55 Zeno` hmm, I was look at that just before
14:55 Zeno` looking*
14:56 Calinou joined #minetest-dev
14:56 proller ops, wrong alert. it was e1ff5b13619666e5b987ecf4faaf294400ffd979
14:56 Zeno` and what is that?
14:58 Zeno` meh, same thing
14:58 Zeno` wow, that was ages ago
15:01 proller ClientEvent system is.. strange
15:02 proller its have lot of new and few of delete
15:02 proller and its whole useless
15:06 kahrl why are you talking to yourself?
15:06 kahrl oh nvm, you were talking to proller who I ignored
15:07 Calinou joined #minetest-dev
15:07 Zeno` haha
15:13 shadowzone joined #minetest-dev
15:29 iqualfragile joined #minetest-dev
15:52 hmmmmmm joined #minetest-dev
16:03 gravgun joined #minetest-dev
16:05 hassage joined #minetest-dev
16:07 Megaf joined #minetest-dev
16:15 johnnyjoy joined #minetest-dev
16:16 zat joined #minetest-dev
16:16 Krock joined #minetest-dev
16:16 hmmmmm joined #minetest-dev
16:20 rubenwardy joined #minetest-dev
17:01 ImQ009 joined #minetest-dev
17:14 ImQ009 joined #minetest-dev
17:15 proller joined #minetest-dev
17:17 shadowzone joined #minetest-dev
17:26 exio4_ joined #minetest-dev
17:32 ImQ009 joined #minetest-dev
17:37 alexxs joined #minetest-dev
18:01 Krock Well, what's the actual status of #1732 (client-side saving of maps)? I would like to see it merged.
18:01 ShadowBot https://github.com/minetest/minetest/issues/1732 -- Add (optional) client-side saving of server map to disk by sfan5
18:01 Krock ye thx, ShadowBot.
18:04 Amaz +1
18:05 Calinou 3 week old slice of pizza in your fridge
18:05 Amaz O.o
18:05 Krock some pizza have a long durability
18:06 GhostDoge Calinou: It's still edible ;)
18:06 Krock ^
18:07 exio4 it is pizza
18:07 exio4 you can always eat it..
18:08 Krock and at a time, the tomatoes turn into cheese-colored things
18:09 RiZom-91 joined #minetest-dev
18:10 RiZom-91 Hi all!
18:10 shadowzone joined #minetest-dev
18:11 RiZom-91 I saw some lua code where people get a node with minetest.get_node_or_nil(pos) and see if node is walkable by registering a new item with this node name
18:11 RiZom-91 is there a better way to do this pls?
18:13 Krock so you want to check if a node is walkable?
18:13 RiZom-91 yes
18:14 Krock minetest.registered_nodes[minete​st.get_node(pos).name].walkable
18:14 Krock there you go.
18:15 RiZom-91 oh sorry I just understand that this command does not actually register a new node... xD
18:15 RiZom-91 Thx you
18:15 Krock :P
18:18 hintss joined #minetest-dev
18:35 rubenwardy joined #minetest-dev
18:43 Calinou joined #minetest-dev
19:59 gravgun joined #minetest-dev
20:16 chchjesus__ joined #minetest-dev
20:23 shadowzone joined #minetest-dev
21:05 prozacgod joined #minetest-dev
21:25 shadowzone joined #minetest-dev
21:33 shadowzone joined #minetest-dev
22:00 prozacgod joined #minetest-dev
22:27 exio4 joined #minetest-dev
22:48 alexxs joined #minetest-dev
23:18 iqualfragile joined #minetest-dev
23:20 MikeFair_ joined #minetest-dev
23:27 Antiheld joined #minetest-dev
23:27 shadowzone joined #minetest-dev
23:27 Antiheld Hi
23:30 Antiheld left #minetest-dev
23:39 hmmmm joined #minetest-dev
23:46 shadowzone joined #minetest-dev
23:55 hintss joined #minetest-dev

| Channels | #minetest-dev index | Today | | Google Search | Plaintext