1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-19 00:30:35 +01:00
Commit Graph

263 Commits

Author SHA1 Message Date
LeMagnesium
7dbe1cf02a Merge 'New flower textures' 2014-12-14 22:13:32 +01:00
LeMagnesium
db0aa37152 Merge "Rewrite furnace" 2014-12-14 22:05:45 +01:00
Ombridride
d47d4dddb0 Tweak the breathless sound
commit 6d6b3e0f07
2014-12-14 21:49:11 +01:00
Ombridride
22059a77c4 Texture tweaks
(water)
commit 4a551eb143
2014-12-14 21:46:52 +01:00
Ombridride
1692b7bb94 Tweak the texture of jungleleaves
commit 91d40bdb02
2014-12-14 21:45:19 +01:00
Ombridride
5366cb9c62 Make jungle leaves use allfaces_optional drawtype
commit a0e09da761
2014-12-14 21:43:59 +01:00
Ombridride
7f110b4dc2 Tweak again some post effect colours
commit 7e798df2fa
2014-12-14 21:42:48 +01:00
Ombridride
e816fb5f42 Merge server to github 02 2014-12-11 18:53:24 +01:00
Ombridride
887473124e Merge server to github 2014-12-11 18:53:00 +01:00
LeMagnesium
af23cdfb4c Removing bug line : gravel's sound
MUST BE DEBUGGED
2014-12-10 23:46:17 +01:00
LeMagnesium
8b3abd1b43 Rollback again, something is crashing the server.. 2014-12-10 23:31:28 +01:00
LeMagnesium
4de7f3e484 Let's do a step forward
- Commits :
	b0871dfe0f (Not really because the reverts were done in my last commit)
	c1043f0120
	35a13c8faf
	6679190d44
	eae0c1bc2e
	ef566a5fe1
	85bd085ab8
	254ec74625
	99feb28ec3
	d6b270e197
	b4a95f223f
	69d4d5dcad
	d7a5dcbb29
	48dd18d49a
	8c2391d5ac
  Are done again. (Ok, no all of them only those concerning default and reverted mods)

TODO: Still missing the three next commits

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-12-10 17:04:10 +01:00
LeMagnesium
2155ecc638 OK, ROLLBACK!
- All the modifications done before 7845fd5f1f are reverted
- Merged commits from http://github.com/minetest/minetest_game from 10 days ago to today. (concerning default mod)

TODO: Merge the other mods which have been reverted.
      Add all the commits of Ombridride after the 7845fd5f1f one.

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-12-10 16:49:14 +01:00
LeMagnesium
beb7e8e900 Grass textures fixed 2014-12-09 19:49:39 +01:00
LeMagnesium
b0794d51d2 Acid is not renewable anymore
- default:acid_source isn't registered as a renewable liquid anymore
2014-12-09 19:11:31 +01:00
LeMagnesium
e80df61377 Reverting bad update reversion
- Putting back the asked textures instead of current ones
2014-12-09 19:04:50 +01:00
Ombridride
35a13c8faf forgot the default/fire update/merge
simplement un changement de fonctions utilisé
2014-12-09 13:38:01 +01:00
Ombridride
c1043f0120 merge the functions.lua update
functions.lua :
- abm des cactus et papyrus modifiées (la pousse est plus lente)
- abm des papyrus modifiée (ne pousse que sur la dirt/dirt with grass)

(Le reste c’est des prises de Carbone)
2014-12-09 13:32:48 +01:00
Ombridride
b0871dfe0f Reverse bad update from minetest_game
- game.conf (MAJ OK)
- default/boat/ (MAJ OK)
- craftitems.lua (MAJ OK)
- furnace.lua (not tweaked because it’s a total rewrite from
minetest_game)
- init.lua (petites modifs et remise du son/texte à la connexion de
nouveaux joueurs)
- player.lua (reprise des modifs de carbone sur l’animation du
personnage)
- tools.lua (on remet l’ancien)
- default/doors (MAJ OK, crafts modifiés)
- default/dye (MAJ OK)
- default/fire (MAJ OK)
- default/stairs (MAJ OK)

Mg, c’est à faire :
- default/textures/ (j’ai fait une bêtise, faut remettre les textures
grass/grass_side du minetest_game, et le water/water animated de
carbone)
2014-12-09 13:17:31 +01:00
LeMagnesium
b8a1cac0cb Update minetestforfun_game with minetest_game
- I hope there is no problem. I see a lot of new stuff in the vanilla
  game. I keep a backup on another computer to restore the state of the
  repository if there is a problem.
2014-12-08 22:44:21 +01:00
Ombridride
7845fd5f1f Add a Sun and Moon default texture 2014-12-08 20:20:29 +01:00
Ombridride
6d6b3e0f07 tweak the breathless sound
(-10 decibel)
2014-12-08 19:55:09 +01:00
Ombridride
11ebb56017 Remove indev ore generations
(Minetest_game / Carbone)
2014-12-08 19:43:33 +01:00
Ombridride
4a551eb143 Texture tweaks
(Carbone)
2014-12-08 19:42:14 +01:00
Ombridride
91d40bdb02 tweak the texture of jungleleaves
(Carbone)
2014-12-08 19:39:09 +01:00
Ombridride
a0e09da761 Make jungle leaves use allfaces_optional drawtype 2014-12-08 19:37:39 +01:00
Ombridride
7e798df2fa Tweak again some post effect colours
(Carbone)
2014-12-08 19:35:48 +01:00
Ombridride
7c142fb42d Tweak some post effect colours
(Carbone)
2014-12-08 19:33:25 +01:00
Ombridride
57cd06f3e1 Merge server with github 2014-12-08 02:11:35 +01:00
Ombridride
e76a36a9ac merge server with github 2014-12-08 02:11:04 +01:00
LeMagnesium
be3e7d76e0 Adding acid bucket and its texture
- You can now use all items in group:ingot to craft a bucket
- You can now take acid with the bucket
2014-12-05 18:46:03 +01:00
Ombridride
4cb7305d9b Add a texture for the "acid source bucket"
« bucket_acid »
2014-12-05 18:28:55 +01:00
Ombridride
734dff15ba Add a breathless sound for sprint mod
And delete a temporary file
2014-12-05 13:02:35 +01:00
LeMagnesium
2850a4c243 Modifications for sprint and moretrees
- Moretrees' leaves aren't walkable anymore
- Adding the snore sound in default
- Adding snore sound's play when stamina has run out (on both e and w
  sprint)
- I don't know why mud mods/snow/config.txt has been modified
2014-12-04 17:59:35 +01:00
LeMagnesium
0440ca1933 Removing or modifying coin drops
- Removing drops of coins from nodes diggable by hand
- Changing drops of coins for default ores

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-30 01:03:26 +01:00
Ombridride
aa5266d5c4 New doors texture by Esteban
Pull request but didn't pushed for the moment...
Forum topic : https://forum.minetest.net/viewtopic.php?f=3&t=10282
Pull request : https://github.com/minetest/minetest_game/pull/327
2014-11-30 00:06:13 +01:00
Ombridride
14b93fe4fb Revert minetestforfun_texture just for
Just for steel textures
2014-11-29 23:39:10 +01:00
LeMagnesium
fe926d914b Updating textures
(I've got a backu-up if some of them aren't good)

Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-29 19:41:01 +01:00
LeMagnesium
45c8275af3 Erratum : The desired value was 1.5
- The desired value for acid's hurts was 1.5 Hp, so 3 units. Sorry.
2014-11-18 20:09:39 +01:00
LeMagnesium
76b1a12770 Changing acid damages per second
- The acid now hurts you 3 Hp per second.
2014-11-18 19:59:53 +01:00
LeMagnesium
825757192c Removing a few useless stuff
- Removing old commented code pieces
2014-11-17 19:33:23 +01:00
LeMagnesium
5366401bdc Sethome now REALLY working
- Finally this @*!@#! sethome works, in both the real and the nether
  world, with multiple players.

I've done it! 👍
2014-11-17 19:31:06 +01:00
Ombridride
2e895a7790 Merge server with github repository
Pas mal de changement n’ont pas été pushé sur le github du serveur,
voici l’occasion de faire une bonne synchronisation :)
2014-11-16 22:23:16 +01:00
LeMagnesium
5e94b24fca Undo sethome modifications
- Replacing modified sethome by 0.4.10-release's sethome.
2014-11-16 16:55:13 +01:00
LeMagnesium
59bee675a1 Removing a mysterious message
- Removing a mysterious message in crafting.lua (maybe sent from space..)
2014-11-15 00:50:22 +01:00
LeMagnesium
05086b77d7 Merge http://github.com/Ataron/minetest-minetestforfun-server into Ataron-master
Conflicts:
	minetestforfun_game/mods/default/crafting.lua
2014-11-14 22:23:57 +01:00
LeMagnesium
ebae847132 Removing useless craft recipes
- Removing craft recipes using/creating tools with moreores items, or from moreores items
- Changing craft recipe for default:bronze_ingot, now using copper ingot and steel ingot
Signed-off-by: LeMagnesium <mg.minetest@gmail.com>
2014-11-14 20:25:06 +01:00
Ataron
6af63a7e5d Enlevement du silver et du tin deja existants dans moreores 2014-11-14 18:47:49 +01:00
LeMagnesium
27836d2835 Removing all the olds minetest.env calls
- All the minetest.env calls removed

It took me about 2 hours, but I did it, and it works!
2014-11-08 18:36:57 +01:00
LeMagnesium
2a5fc1ea55 - Skin updates
- Sethome FINALLY fixed :yay:

Coming soon : Removing all the minetest.env calls. 👍
2014-11-08 16:36:02 +01:00
Ombridride
b48e22437e Small changes in "node.lua" for ice 2014-11-03 23:22:33 +01:00
Ombridride
72ad0dc7b7 - Delete useless files/mods
- Add builtin_falling (by Davedevils) for an amazing bugfix
- Tweak node.lua from the subgame MFF and « sea » mod for
builtin_falling
- Remove news.lua from _misc
- Remove _misc_me (empty now)
- Add a new mod named « news » and tweak this mod, it works now, add
texture for the news (Thank you Davedevils)
2014-11-03 01:46:14 +01:00
LeMagnesium
53588bf528 Sethome modifications
- (I hope) sethome works
2014-11-01 16:23:22 +01:00
LeMagnesium
cdd55a16f1 Home fix
- Now using nether_players file
2014-11-01 14:01:46 +01:00
LeMagnesium
699d4f96c5 Sethome working in the nether, factions too.
- Sethome depends on nether
- There is a home in the nether and another in the real world
- Factions no longer use mobf missing API
- Players' skin refreshed after only 2min
2014-11-01 13:00:59 +01:00
Ombridride
4095267604 Suppression de Screwdriver du subgame 2014-10-31 00:38:17 +01:00
Ombridride
4ec51fa5ce screwdriver 2014-10-31 00:31:39 +01:00
Ombridride
bd3d29e8d8 Update screwdriver and xban
- Suppression de xban premier du nom, xban2 prend le relai,
- Supression de screwdriver(base_game)
- Ajout de Screwdriver(redo)
2014-10-31 00:31:08 +01:00
Ombridride
f5057845fe Delete the _farming mod from the sub game
Le renommer ne sert à rien, autant le supprimer…
2014-10-30 23:46:24 +01:00
Ombridride
41fe12d4d7 remove an unecessary duplication
for .farming in the subgme
2014-10-30 23:42:51 +01:00
Ombridride
65b06ed4ca Rename the game mod farming to _farming
Because of conflicts with farming(redo)
2014-10-30 23:26:32 +01:00
LeMagnesium
9660a2fc60 Removing snow in the nether, farming modified
- Now, impossible to see snow generated in the nether
- Minimum light level needed to grow wheat and cotton is now 11
2014-10-30 22:06:48 +01:00
Ombridride
232b274c55 initial commit
subgame + mods
2014-10-28 18:01:32 +01:00