1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-27 03:00:38 +01:00
Commit Graph

180 Commits

Author SHA1 Message Date
Ombridride
31f8354649 Update MFF_game "README" again 2015-03-03 19:45:50 +01:00
Ombridride
8f5dd6e2e6 update MFF_game "README.txt" 2015-03-03 19:44:20 +01:00
539113c778 fix infotool crash when unknow node 2015-03-03 19:31:30 +01:00
Ombridride
30ac1e2c6c Add mossy cobble uncraft
mossycobble => stone
2015-03-03 19:28:47 +01:00
Ombridride
f572fedea9 Mossycobble fixes in node.lua 2015-03-03 19:15:57 +01:00
LeMagnesium
c0926d33cc Merge remote-tracking branch 'origin/master'
Conflicts:
	minetestforfun_game/minetest.conf
2015-03-03 19:01:23 +01:00
LeMagnesium
969080ab81 Fixed typos and changed sinking speed's value 2015-03-03 18:58:33 +01:00
Ombridride
6469bc5200 Update minetest.conf 2015-03-03 18:55:38 +01:00
Ombridride
7ed90a8651 Merge minetest_game - Update node.lua 2015-03-03 18:31:52 +01:00
LeMagnesium
d9c182cf9d Changed all the LIGHT_MAX calls to default.LIGHT_MAX
- Avoided crash by using the real variable instead of its old name
2015-03-03 18:22:38 +01:00
LeMagnesium
3ae94073c4 Updated minetestforfun_game, part 3
- Merged :
	Removed weird constants in default
	Add tree growing functions to game_api.txt
2015-03-03 16:04:42 +01:00
LeMagnesium
c4c6e9fe44 Updated minetestforfun_game, part 2
- Merged :
	Add crafting grid result arrow to creative inventory
	Simple biomes for mgv5/mgv7. Uses get_mapgen_params
2015-03-03 15:51:09 +01:00
LeMagnesium
afa51785fb Updated minetestforfun_game, part 1
- Merged :
	Change furnace fire icons
	Add Obsidian / Obsidian brick stairs & slabs
2015-03-03 15:43:04 +01:00
639584ec06 callback for torches in water 2015-03-03 00:19:08 +01:00
LeMagnesium
908082e9ba Re-increased amount of sticks given for a default:wood
- Avoided conflict between building_blocks:sticks and default:wood by changing
  the default:wood's recipe and output
2015-02-26 09:18:19 +01:00
LeMagnesium
ecb9d17a33 Decreased the number of sticks given from group:wood
- In the craft inventory, putting, from now, an item from the group:wood won't give you 9 sticks anymore but 4. In fact, 4 sticks give you a wooden plank item, part of
  the group:wood, and this wooden plank gives you back 9 sticks, which could be used to craft again some wooden planks, etc...
2015-02-25 21:17:23 +01:00
Gael-de-Sailly
92d20a7e61 Turn glass into glasslike_framed_optional drawtype 2015-02-22 18:17:27 +01:00
LeMagnesium
c539cc15e2 Removed commented old lines from code 2015-02-19 16:57:24 +01:00
LeMagnesium
63a6c26de6 Added sethome handlers using minetest.[de]serialize minetest.serialize and minetest.deserialize provide a faster way to write and read input, it turnes useless the repeat .. until statement, and then, make the read faster. 2015-02-19 16:57:24 +01:00
LeMagnesium
6f2f57a913 Remove .env calls in sethome 2015-02-18 19:12:36 +01:00
LeMagnesium
fd7c1c2980 Reversed typo from latest commit 2015-02-14 15:38:58 +01:00
LeMagnesium
2daad79502 Added separated real/nether timers 2015-02-14 15:27:52 +01:00
2d7941209f debug et ajout de timer dans sethome 2015-02-12 17:19:53 +01:00
LeMagnesium
f2a6d646aa Removed two global variables
Thanks to crabman for having warned me.
2015-02-11 16:04:38 +01:00
Gael-de-Sailly
8adbc1031c Store any book in bookshelves, not only default:book 2015-02-09 14:19:30 +01:00
LeMagnesium
fffef558bb Added return statement in bookshelf's callbacks 2015-02-08 22:30:54 +01:00
Ataron
09977a198b New Moon texture 2015-02-07 16:53:21 +01:00
LeMagnesium
030e104df3 Added spawn's timer and reduced interval for home
- HOME_INTERVAL is now 20 minutes
- Added spawn's timer : interval is 10 minutes
2015-02-06 19:59:09 +01:00
LeMagnesium
218882457b Merged GUI/console homes' handlers
- Added timer to unified_inventory's GUI go_home by 'merging' it
- Merged GUI/console sethome by addind all sethome's functions and variables in home[], unified_inventory calls home.sethome and home.tohome
- Added sethome in unified_inventory's mandatory dependencies
2015-02-06 14:46:53 +01:00
LeMagnesium
696f96b0f0 Added timer to home mod
- Added a time handler to avoid players to use /home too many times
- Timer's interval is set by HOME_INTERVAL in minetestforfun_game/mods/home/init.lua
- Added debug messages to show in the logs when a player teleport to home or try within the forbidden timer's interval
2015-02-03 11:24:42 +01:00
LeMagnesium
60602f60c0 Merge branch 'sand' of http://github.com/Gael-de-Sailly/minetest-minetestforfun-server into Gael-sand 2015-01-30 18:24:49 +01:00
Gael-de-Sailly
09ef071c81 Fixed sand replacing non-buildable-to nodes on place 2015-01-30 14:32:51 +01:00
Ombridride
a149bc8c08 encore des petits ajustements... 2015-01-29 00:20:09 +01:00
LeMagnesium
618adecf2b Fixed global vas errors and updated beginners_chest with license 2015-01-25 22:34:03 +01:00
LeMagnesium
70d7d0fee7 Updated moreores mod : NOT RUNNING YET 2015-01-24 19:28:26 +01:00
Ombridride
e3b992264d small fix - unification 2015-01-23 19:57:44 +01:00
Ombridride
71607ba18b Smalls fixs on unification pickaxe 2015-01-21 22:54:51 +01:00
Ombridride
202d50632c unification Pickaxe 2015-01-21 22:38:36 +01:00
LeMagnesium
24bbb848e7 Made superapples harder to craft
- Changed craft recipe for default:superapple, now using :
	"default:apple","default:mese","default:mese"
2015-01-20 21:32:21 +01:00
Ombridride
bb42a3be06 Add acid to the “acid” group
(From Carbone)
2015-01-01 12:41:01 +01:00
LeMagnesium
a638096ce3 Implementation of multiple buckets handler
- Uncommented and changed a bit the lines of Casimir's redefinition of bucket:bucket_empty in ./minetestforfun_game/mods/bucket/init.lua to implement multiple buckets handle system, commented in an old commit (it was buggy, or something). The system has been modified a bit to prevent bugs from incompatibility between carbone's api (which the definition has been copied from) and minetestforfun_game's one.
2014-12-27 19:33:22 +01:00
LeMagnesium
5af89270ec Remove debug line in init.lua 2014-12-27 18:35:33 +01:00
Ombridride
bb3165a013 Sword unification in "moreore mod"
silver + mithril
2014-12-23 22:19:29 +01:00
Ombridride
5071301b77 Sword unification in our subgame 2014-12-23 22:14:34 +01:00
LeMagnesium
5b4b115f54 Oops.. Let's fix the grass
- Fixing grass and peeble anihilation.
2014-12-20 22:23:40 +01:00
LeMagnesium
283530ad6f Water lakes are now delivered without grass!
- Water removes grass, pebbles and flowers under it
2014-12-18 21:00:50 +01:00
LeMagnesium
5314a1d30b Down the water, tweak the u-boots, exclude nodes
- Dungeon masters cannot destroy nodes in excluded table neither nodes of
  group unbreakable, neither nether's nodes.
- Tweak of a global variable in seawrecks (aka. choosen_ingot)
- Highlandpools create real lakes now, and not water flower over the
  floor.
2014-12-18 20:09:07 +01:00
Le_Docteur
66ea50d703 Removed garbage in 'bucket/init.lua'. 2014-12-17 17:38:41 +01:00
Le_Docteur
5e2d139d9f Fixed: dereferencement of uninitialized global variable. 2014-12-17 17:35:30 +01:00
Le_Docteur
2d30ca67bb Both furnaces moved to 'default/furnace.lua' with updated formspecs to keep Carbone's semi-transparent background. 2014-12-17 17:29:04 +01:00
Le_Docteur
f618237c98 Moved global variables into the "default" list/class. 2014-12-17 09:20:37 +01:00
Ombridride
204f66b311 Small tweak about Mese ore generation 2014-12-15 03:26:54 +01:00
Ombridride
825917ebd4 Tweak diamond ore generation
- Trouvable à partir de -256 en petite quantité
- Trouvable à partir de -512 en quantité décente
- Trouvable à partir de -1024 en grande quantité « parfois »
- Chunk énorme de diamants réduit de moitié
2014-12-15 03:24:35 +01:00
Ombridride
a806d9b55b Tweak growing chance of cactus and papyrus
- 1 tick / minute
- 25% chance of growth / tick
2014-12-15 03:07:32 +01:00
Ombridride
146142fc13 Tweak doors mod 2014-12-15 03:01:39 +01:00
LeMagnesium
a921fb4b97 Merge... some random commits 2014-12-15 00:04:45 +01:00
LeMagnesium
7126d2af7f Merge "Set param2 to 1 if player places leaves" 2014-12-14 23:53:42 +01:00
LeMagnesium
87f013bf28 Merge TenPlus1's screwdriver and new minetest.conf.example 2014-12-14 23:46:05 +01:00
LeMagnesium
af82dbf873 Merge Remove remains of finite liquids in bucket 2014-12-14 23:35:47 +01:00
LeMagnesium
4ad72bfdd4 Merge Give 4 obsidianbrick for 4 obsidian (but 2) 2014-12-14 23:28:29 +01:00
LeMagnesium
1eb510dfd3 Merge "Add pinetree by sfan5" 2014-12-14 23:13:59 +01:00
LeMagnesium
29b65dafc0 Merge "Add 3D signs" 2014-12-14 23:02:24 +01:00
LeMagnesium
386816df66 Merge "Add obsidianbrick" and farming's soil's texture 2014-12-14 22:57:29 +01:00
LeMagnesium
eb249b1e2a Merge game_api.txt 2014-12-14 22:46:13 +01:00
LeMagnesium
201bde2152 Merge pine and dye's visibility fix 2014-12-14 22:41:55 +01:00
LeMagnesium
57b2df5054 Merge various fire's bug fixs and doors textures 2014-12-14 22:33:57 +01:00
LeMagnesium
a0987886e7 Merge flowers' mapgen's global variables' tweaking
... and New ladder texture
2014-12-14 22:22:03 +01:00
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