Commit Graph

2604 Commits (master)

Author SHA1 Message Date
rarkenin 5b997ba643 Add LICENSE file via addalicense.com 2013-10-01 12:53:28 -07:00
Robert Arkenin 8205186e93 Particles fixup 2013-03-29 09:48:45 -04:00
Robert Arkenin c3a2d10c18 Fix up conflicts
Merge branch 'master' of https://github.com/rarkenin/minetest

Conflicts:
	doc/lua_api.txt
	src/particles.cpp
2013-03-29 09:07:12 -04:00
Robert Arkenin 1232875543 fix up branch 2013-03-29 09:01:41 -04:00
Robert Arkenin 5f84f82498 Grabbing updates 2013-03-29 08:57:38 -04:00
rarkenin 1a2a9cb08f Merge pull request #9 from minetest/master
Pull particles and other stuff
2013-03-23 16:12:55 -07:00
Jeija e1ff5b1361 Allow spawning particles from the server, from lua
Spawn single particles or make use of ParticleSpawner for many randomly spawned particles.
Accessible in Lua using minetest.spawn_particle and minetest.add_particlespawner.
Increase Protocol Version to 17.

Conflicts:
	src/clientserver.h
2013-03-23 23:16:29 +01:00
PilzAdam ab57fdac44 Move rightclickable to the proper place 2013-03-23 23:15:30 +01:00
Jürgen Doser dacc8cdb3a Include backface_culling flag in serialization format for TileDefs
This way flowing liquids actually show the backface when specified to
do so. Without this, TileDefs where by default initialized with
backface_culling = true and never set otherwise.

For backwards compatibility, an old client connected to a new server,
or a new client connected to an old server will behave like before
i.e., backface_culling is always true.
2013-03-23 23:10:47 +01:00
Mukul Sati ca7043e52d Set of changes to build mineTest using Visual Studio 11.0. These affect
the following:
1. String concatenation in guiMainMenu.cpp - it is required for all
individual strings to be of the same type <unicode/non-unicode>; adding
explicit L qualifier before the other strings.
2. Correcting type of BlockMakeData to struct in place of class forward
declarations. This information is used for name decoration by Visual
Studio, leading to linker errors in case of mismatches.
3. Windows headers define max as a macro somewhere, leading to a compile
time error in profiler.h; using () around function to prevent macro match
from occurring.
2013-03-24 00:53:10 +04:00
RealBadAngel 6f8d40ef5d 6d facedir 2013-03-23 21:31:05 +01:00
proller 2318d19bb4 Merge pull request #563 from proller/guest
Random guest name and finite liquid checkbox
2013-03-23 08:21:30 -07:00
proller f98d0433f9 Random guest name and finite liquid checkbox 2013-03-23 19:17:08 +04:00
rarkenin cc9a47f557 Merge pull request #8 from proller/guest
Pull guest name and liquid config
2013-03-23 08:11:32 -07:00
proller c4149a79eb guest name
liquid finite checkbox
2013-03-23 18:13:49 +04:00
rarkenin 87ba41c6df Merge pull request #7 from minetest/master
Get singlenode mapgen
2013-03-22 16:39:12 -07:00
Perttu Ahola 34b185e955 Add singlenode mapgen; generates solely the node 'mapgen_singlenode', defaults to air 2013-03-22 19:16:51 +02:00
rarkenin f1f9aa91b9 Merge pull request #6 from BlindBanana/luajit
Get LuaJit from BlindBanana fork
2013-03-22 05:41:14 -07:00
rarkenin 44db00268a Merge pull request #5 from minetest/master
Grab cmake list updates
2013-03-22 05:15:14 -07:00
Perttu Ahola b6dcadeb79 CMakeLists.txt: Add games/common to be installed when available 2013-03-22 07:46:48 +02:00
BlindBanana 93af87054a - CMakeLists extended to support build with luajit
configure cmake with "-DLUAJIT" to build minetest
  with luajit instead of the normal lua
2013-03-21 22:40:51 +01:00
BlindBanana e2021ccb61 - add luajit Version 2.0.1
with hotfix: http://luajit.org/download/v2.0.1_hotfix1.patch
  included
2013-03-21 22:36:29 +01:00
BlindBanana 3415f3350c - fix syntax for luajit 2013-03-21 22:34:44 +01:00
rarkenin 13a918d1bb Merge branch 'master' of https://github.com/minetest/minetest into mergestuff1
Conflicts:
	util/buildbot/buildwin32.sh

Fixed buildwin merge
2013-03-21 16:48:11 -04:00
Perttu Ahola c2250d95c4 Support game-specific minetest.conf 2013-03-21 22:22:15 +02:00
Perttu Ahola adc52f3f3c lua_api.txt: Document paths, games and common mod loading 2013-03-21 20:04:00 +02:00
Perttu Ahola 0a568a6037 Update buildwin32.sh to get minetest/common 2013-03-21 19:45:20 +02:00
Perttu Ahola 0747c285cd Update README.txt to instruct to get minetest/common too 2013-03-21 19:43:08 +02:00
Perttu Ahola 306d1ab866 Common mods support
Implement "common mods", includeable from
  {$user,$share}/games/common/$modname
by using the game.conf setting
  common_mods = $modname,$modname2,...
2013-03-21 18:56:42 +02:00
rarkenin 998ee7a4c9 Merge pull request #3 from minetest/master
Grab some commits
2013-03-19 17:09:22 -07:00
rarkenin be5ae9be5d Update CMakeLists.txt 2013-03-19 16:33:37 -03:00
Splizard 9b5bb5c755 Allow falling nodes to pass through solid "buildable_to" nodes. 2013-03-19 16:38:56 +01:00
Juhani Numminen 450e7ef0c5 Git-ignore SQLite build files 2013-03-19 16:20:13 +01:00
kwolekr 8f0d29f931 Fix Map::initBlockMake to actually use chunksize setting 2013-03-18 22:19:02 -04:00
PilzAdam d6026a5fee Prevent passing nil to unpack() in minetest.after 2013-03-19 00:15:41 +01:00
rarkenin 41550a19af Update player.cpp 2013-03-18 09:38:19 -03:00
rarkenin 858d691595 Update player.cpp 2013-03-18 09:10:29 -03:00
rarkenin 1261f208b9 Fix semicolon error 2013-03-18 08:43:11 -03:00
rarkenin 60928d1fec Add setting for acceleration
Now, shift will speed you up without triggering anticheat/
2013-03-18 08:30:22 -03:00
rarkenin 98491cab0e Add setting for acceleration 2013-03-18 08:29:04 -03:00
kwolekr 939397dd6e Add jungle grass to jungles 2013-03-17 23:08:11 -04:00
rarkenin 52ad8c5dad Last deathscreen fixup. 2013-03-17 20:27:56 -03:00
rarkenin 5faa9407b9 Add identification labels, other fixes 2013-03-17 19:20:37 -03:00
rarkenin 08d2e85a98 More fixes 2013-03-17 19:12:37 -03:00
rarkenin 2389a0299b Remove deathscreen disabler as that causes trouble
You will now take damage from being punched or other things server-side, but nothing client-side.
2013-03-17 18:53:11 -03:00
rarkenin 133e6562e5 Merge pull request #2 from minetest/master
Grab updates
2013-03-17 13:30:27 -07:00
rarkenin 25829c6dbc Update light.cpp 2013-03-17 16:37:10 -03:00
rarkenin 7851dc187c Remove post effect color 2013-03-17 16:36:03 -03:00
rarkenin 646ec7416c Fix up light 2013-03-17 16:30:43 -03:00
Ilya Zhuravlev d207d359d1 Don't erase modified_blocks 2013-03-17 21:17:13 +04:00