Next - development branch with lot of unmerged pulls

For people working on the C++ code.
proller
Member
Posts: 186
Joined: Sat Jan 26, 2013 15:22

Next - development branch with lot of unmerged pulls

by proller » Post

!!!
this topic and branch is outdated.
Development of all features continued here - http://freeminer.org/ , https://github.com/freeminer/freeminer
!!!

30+ various changes.
More features, faster, better, less bugs.
But need testing from you.

Windows msvs build by xyz http://minetest.setun.net/next/minetest-0.4.8-next.zip
or
git clone --recursive -b next https://github.com/proller/minetest.git minetest_next
cd minetest_next
cmake . -DRUN_IN_PLACE=1

branch here:
minetest: https://github.com/proller/minetest/tree/next
minetest_game: https://github.com/proller/minetest_game/tree/next

merge report: https://github.com/proller/minetest/blo ... report.log

some pulls skipped with conflicts: https://github.com/proller/minetest/blo ... netest.log

Automatic merging every day

if you want to update this branch:
git pull
git submodule update --init --recursive


most important changes:
- 99% lag-free. optimized server, can handle 50-100-... players, no problems with laggy mods, even on slow hardware (ARM)
- much faster on client (vbo, can eat memory), increased view,send range
- nicer looks (#799)
- better dynamic weather and liquids
- less bugs
- weather defined water or ice on map generation. (freezed oceans if low temperature)
and dirt_with_snow instead of dirt_with_grass when too cold.
- weather defined tree and flowers growing
- cave trees in huge caves (indev mapgen)
- optimized falling (much less mid-air stuck, limited max falling speed)
- fixed and optimized headless client (you can run 30-50 bots on one PC)
- hell (very hot at -30500), anything melting and burning

API changes:
new node groups: freeze melt hot cold (define temperatures) how to use here -https://github.com/proller/minetest_game/compare/dynamic
minetest.register_abm({..., action(...,...,...,...,neighbor) -- who founded from neighbors
minetest.register_abm({...,neighbors_range = 4 -- find neighbors around, max nodes (for melting snow in 4x4 area around torch or something else)
Last edited by proller on Fri Nov 29, 2013 12:17, edited 1 time in total.

User avatar
sfan5
Moderator
Posts: 3935
Joined: Wed Aug 24, 2011 09:44
GitHub: sfan5
IRC: sfan5
Location: Germany

by sfan5 » Post

Making a windows build right now...

Edit:
http://sfan.sf.funpic.de/minetest-build ... t-win32.7z
Last edited by sfan5 on Mon Aug 26, 2013 17:51, edited 1 time in total.
Mods: Mesecons | WorldEdit | Nuke & Minetest builds for Windows (32-bit & 64-bit)

User avatar
Casimir
Member
Posts: 1174
Joined: Fri Aug 03, 2012 16:59
GitHub: CasimirKaPazi

by Casimir » Post

Zeg9:wieldlight 816
MirceaKitsune:sun_moon_coloring 799
Thank you. Compiling now.

User avatar
hoodedice
Member
Posts: 1374
Joined: Sat Jul 06, 2013 06:33
GitHub: hoodedice
IRC: hoodedice
In-game: hoodedice
Location: world
Contact:

by hoodedice » Post

Nice. I've been waiting for this.
7:42 PM - Bauglio: I think if you go to staples you could steal firmware from a fax machine that would run better than win10 does on any platform
7:42 PM - Bauglio: so fudge the stable build
7:43 PM - Bauglio: get the staple build

User avatar
Inocudom
Member
Posts: 3096
Joined: Sat Sep 29, 2012 01:14
IRC: Inocudom
In-game: Inocudom

by Inocudom » Post

proller wrote:branch here: https://github.com/proller/minetest/tree/next

list of included pulls here:
https://github.com/proller/minetest/blo ... ext.pl#L35

Successful merged branches here: https://github.com/proller/minetest/commits/next

some pulls skipped on conflicts. (todo: commit conflict log)

failed merges:
fail Zeg9:wieldlight 1 https://github.com/minetest/minetest/pull/816
fail khonkhortisan:diagonal_rail 1 https://github.com/minetest/minetest/pull/528
fail Novatux:master 1 https://github.com/minetest/minetest/pull/606
fail BlockMen:hotbar 1 https://github.com/minetest/minetest/pull/849
fail ShadowNinja:protection_support 1 https://github.com/minetest/minetest/pull/856



can somebody make windows build?
These look like very significant fixes to the game. Why were they forgotten? Also, will this testing build be able to test RealBadAngel's parallax mapping? People might like it more if they understand what it does.
You can now find my videos at BitChute: https://www.bitchute.com/channel/some_cheeky_jinuskian/

Nore
Developer
Posts: 501
Joined: Wed Nov 28, 2012 11:35
GitHub: Ekdohibs

by Nore » Post

I rebased #606 against current master.

proller
Member
Posts: 186
Joined: Sat Jan 26, 2013 15:22

by proller » Post

updated, #606 included

User avatar
PilzAdam
Member
Posts: 4026
Joined: Fri Jul 20, 2012 16:19
GitHub: PilzAdam
IRC: PilzAdam
Location: Germany

by PilzAdam » Post

This should go into Unofficial Engine Development.

User avatar
BlockMen
Developer
Posts: 768
Joined: Fri Mar 01, 2013 17:24
GitHub: BlockMen
Location: Germany

by BlockMen » Post

proller wrote: failed merges:
fail minetest BlockMen:hotbar 1 https://github.com/minetest/minetest/pull/849
umm... #849 is already upstream?

https://github.com/minetest/minetest/co ... 6c0da9bfab

Nore
Developer
Posts: 501
Joined: Wed Nov 28, 2012 11:35
GitHub: Ekdohibs

by Nore » Post

I rebased #688, so you can merge it now.

User avatar
sfan5
Moderator
Posts: 3935
Joined: Wed Aug 24, 2011 09:44
GitHub: sfan5
IRC: sfan5
Location: Germany

by sfan5 » Post

Mods: Mesecons | WorldEdit | Nuke & Minetest builds for Windows (32-bit & 64-bit)

proller
Member
Posts: 186
Joined: Sat Jan 26, 2013 15:22

by proller » Post


User avatar
Wuzzy
Member
Posts: 4069
Joined: Mon Sep 24, 2012 15:01
GitHub: Wuzzy2
IRC: Wuzzy
In-game: Wuzzy

by Wuzzy » Post

You wanted testing?
You get testing!

Diagonal rails: WTF, I placed them like in the screenshots but the rails don’t arrange in any diagonal shape. The rails just behave like normal.

Volumentric Fog: This is awesome, much better than before.

Math mapgen: I do not know how to use the other configurations. What file do I have to change?

Free fall: It is inacceptable. I fall down 2000 nodes and only lose some heats. It goes up to 9.5 hearts. This appears again and again. This fall was not interrupted by unloaded blocks (they got loaded at the first fall). I would expect to fucking die after falling down a height like this. Also the claim that I can teleport to (0,30000,0) and fall down without speed loss is sadly false, because I regulary collide with block borders.

Weather: How do I use this? I added “weather = 1” to the minetest.conf?
My creations. I gladly accept bitcoins: 17fsUywHxeMHKG41UFfu34F1rAxZcrVoqH

proller
Member
Posts: 186
Joined: Sat Jan 26, 2013 15:22

by proller » Post

Diagonal rails: tried, works for me.

Math mapgen: yes, it need to describe too.
someshing working:
mg_math = {"generator":"menger_sponge", "iterations":7, "size":100, "invert":0}
also intresting values to play: "scale":0.01, "distance":0.01

Free fall: very strange, press f5 - what is your fall speed?
or maybe you can record video (with f5 debug info)?

weather = 1
liquid_finite = 1
water starts freezing-melting depend on current temp.
and you can try correct rain-snow mod: https://github.com/proller/minetest-mod ... ee/weather (!! weather branch !!)



also you can try build something from sand/gravel

User avatar
PilzAdam
Member
Posts: 4026
Joined: Fri Jul 20, 2012 16:19
GitHub: PilzAdam
IRC: PilzAdam
Location: Germany

by PilzAdam » Post

Wuzzy wrote:Diagonal rails: WTF, I placed them like in the screenshots but the rails don’t arrange in any diagonal shape. The rails just behave like normal.
Have you updated minetest_game for that too?

User avatar
Casimir
Member
Posts: 1174
Joined: Fri Aug 03, 2012 16:59
GitHub: CasimirKaPazi

by Casimir » Post

When I do

Code: Select all

git clone https://github.com/proller/minetest/tree/next.git
I get

Code: Select all

Klone nach 'next'...
fatal: https://github.com/proller/minetest/tree/next.git/info/refs?service=git-upload-pack not found: did you run git update-server-info on the server?
Did the same for minetest-plus just a second before and it worked.

proller
Member
Posts: 186
Joined: Sat Jan 26, 2013 15:22

by proller » Post

added some submodule magic:
git clone --recursive -b next https://github.com/proller/minetest.git minetest_next

it will fetch minetest_game with minetest-mod-weather
Last edited by proller on Sun Oct 13, 2013 21:15, edited 1 time in total.

User avatar
Wuzzy
Member
Posts: 4069
Joined: Mon Sep 24, 2012 15:01
GitHub: Wuzzy2
IRC: Wuzzy
In-game: Wuzzy

by Wuzzy » Post

PilzAdam wrote:
Wuzzy wrote:Diagonal rails: WTF, I placed them like in the screenshots but the rails don’t arrange in any diagonal shape. The rails just behave like normal.
Have you updated minetest_game for that too?
I have taken the minetest_game from proller’s repository, so I think the answer is “Yes.”.
My creations. I gladly accept bitcoins: 17fsUywHxeMHKG41UFfu34F1rAxZcrVoqH

proller
Member
Posts: 186
Joined: Sat Jan 26, 2013 15:22

by proller » Post

Wuzzy wrote:I have taken the minetest_game from proller’s repository, so I think the answer is “Yes.”.
with 'next' branch?
try now
git pull
git submodule update --init --recursive

User avatar
MirceaKitsune
Member
Posts: 867
Joined: Sat May 21, 2011 22:31
GitHub: MirceaKitsune
IRC: Taoki
In-game: MirceaKitsune
Location: Romania, Bucharest
Contact:

by MirceaKitsune » Post

The Next branch is a good idea! Great way to get things tested more quickly. I checked out the latest GIT and gave it a shot. Analyzed 4 of the features I found important, and this is what I think about them:

- Sun / Moon colored fog: I already know how it works since I coded it :) At this stage I think it's ready and should be added to Minetest master. The view with it is very beautiful, and it will enhance visuals greatly.

- VBO: As usual, playing with this enabled enhances FPS greatly. I militated for it to be added, and am looking forward to them moment when it will finally be in. This time I don't believe I noticed any memory leaks either, though I didn't test intensively.

- Diagonal rails: Tried them out a little. They look fine to me, and I see nothing to object to. They might be a bit more than we need however. Overall I'm neither for or against this one.

- Weather: The idea is great and I've long waited to see rain and snow in Minetest! I think the latest version of the mod is clearly on the right track, but IMO it still has issues. Primarily the particle system, which is very laggy and doesn't properly handle showing / hiding precipitation indoor / outdoor. I also think weather needs some sounds, but finding and looping a few shouldn't be hard at this stage.

User avatar
Inocudom
Member
Posts: 3096
Joined: Sat Sep 29, 2012 01:14
IRC: Inocudom
In-game: Inocudom

by Inocudom » Post

I don't think VBO has any effect on glass, leaves, and nodeboxes.
You can now find my videos at BitChute: https://www.bitchute.com/channel/some_cheeky_jinuskian/

User avatar
MirceaKitsune
Member
Posts: 867
Joined: Sat May 21, 2011 22:31
GitHub: MirceaKitsune
IRC: Taoki
In-game: MirceaKitsune
Location: Romania, Bucharest
Contact:

by MirceaKitsune » Post

Inocudom wrote:I don't think VBO has any effect on glass, leaves, and nodeboxes.
Hard to test how much those alone affect performance. But looking at a normal landscape, FPS is still almost double for me with VBO.

What I remember VBO does is storing instances of a mesh on the video card, rather than the CPU having to stream them to the GPU every single frame. This uses less resources and GPU bandwidth, which obviously means a lot more speed.

User avatar
Inocudom
Member
Posts: 3096
Joined: Sat Sep 29, 2012 01:14
IRC: Inocudom
In-game: Inocudom

by Inocudom » Post

I asked Fess to make a 64-bit build of this fork of Minetest.
You can now find my videos at BitChute: https://www.bitchute.com/channel/some_cheeky_jinuskian/

User avatar
MirceaKitsune
Member
Posts: 867
Joined: Sat May 21, 2011 22:31
GitHub: MirceaKitsune
IRC: Taoki
In-game: MirceaKitsune
Location: Romania, Bucharest
Contact:

by MirceaKitsune » Post

I posted more observations and suggestions on the weather system in this post. As a bonus, here are some screenshots of rain combined with volumetric fog colors:
+ Spoiler

User avatar
webdesigner97
Member
Posts: 1327
Joined: Mon Jul 30, 2012 19:16
GitHub: webD97
IRC: webdesigner97
In-game: webdesigner97
Location: Cologne, Germany
Contact:

by webdesigner97 » Post

The download doesn't work anymore?
Edit: works again
Last edited by webdesigner97 on Mon Oct 14, 2013 09:53, edited 1 time in total.

Post Reply

Who is online

Users browsing this forum: No registered users and 1 guest