Commit Graph

53 Commits

Author SHA1 Message Date
Maksim Gamarnik 8cc092b177 Updated to Minetest ver. 0.4.15 2017-01-30 00:44:07 +02:00
Stefan a413e73b8d Add support for ads 2016-11-26 02:37:57 +02:00
sfan5 60c5679a07 iOS changed files (#41) 2016-11-06 00:14:16 +02:00
HybridDog 0f184d77c8 Gitignore: ignore idea and ninja files 2016-05-22 08:22:37 +01:00
Maksim Gamarnik 51cb15bc45 Merge minetest commits / WIP!
Java part WIP, pls, use prev commits!
2016-04-29 10:11:25 +03:00
ShadowNinja e41673820f Upgrade Android build to Gradle build system
The old Ant build system has been deprecated for a while and new development is focused on Gradle.
I also removed a hardcoded string that lint caught and moved the patch files to a subdirectory.
I left the JNI files in the root directory.
2016-04-28 12:28:42 -04:00
Maksim Gamarnik 3857a3b0bd Part III 2016-04-21 01:53:17 +03:00
Maksim Gamarnik 758af96b60 Merge release 2016-03-28 20:08:34 +03:00
Maksim Gamarnik 6960c318c4 Update Games
Fix .gitignore. OoPs)
2016-02-11 23:16:15 +02:00
Maksim Gamarnik e95b3b9d54 Add preloaded worlds 2016-02-07 03:33:44 +02:00
Maksim Gamarnik b05a829924 Fix 2015-12-15 14:05:18 +02:00
Maksim Gamarnik 9012ac8f22 Update
Sync all Minetest commits
2015-11-10 13:49:24 +02:00
Tim 89e8f3a918 Update .gitignore to ignore symlinks to non-static Minetest directories and sort into an editor section
[ci skip]
2015-09-26 21:28:50 +02:00
ShadowNinja e4bff8be94 Clean up threading
* Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
2015-08-23 22:04:06 -04:00
Maksim Gamarnik ef5f3e2615 Fix nodes, upd textures 2015-08-11 14:06:00 +03:00
est31 47225346be Android: fix sound issue, and gitignore
Previously, sound failed due to errors with hardfp abi build
instructions. As the problem couldn't be found, the softfp
compatible abi was chosen instead.

This move will cause a small performance overhead, but due to the
abi being armeabi-v7a, the internal calculations will still be done
using the FPU.

We also fix some issues with ABI information passing. However, the
fixes aren't sufficient to get sound working.

The patch also fixes an issue with the gitignore file.
2015-08-02 19:23:17 +02:00
est31 c39a85a88d Android: Add githash header to spare rebuilds after new commits
Before, android_version.h got changed at every new commit. Now, we
only change it with new minetest releases. Analogous to how cmake
does it,  we add an android_version_githash.h file that communicates
the git hash to C++ code.

Also, unify VERS_MAJOR, VERS_MINOR and VERS_PATCH variable
calculation inside the whole makefile.
2015-08-01 20:42:07 +02:00
est31 d75009a758 Add android tools environment to gitignore
Previously, if you did `make envpaths` (as described in README.android), the new file got listed by git as new file.
2015-07-01 04:12:55 +02:00
est31 efd52d6b53 Add more swp files to gitignore
Specifically, the added rule matches .kate-swp files.
2015-05-31 23:20:58 +10:00
est31 8135f89e21 Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.

Conflicts:
	README.txt
	build/android/Makefile
2015-05-31 23:13:54 +10:00
Maksim Gamarnik c7b69b0483 Small change 2015-05-23 14:40:31 +03:00
est31 5b03857c62 Add more swp files to gitignore
Specifically, the added rule matches .kate-swp files.
2015-05-18 21:24:57 +02:00
Maksim Gamarnik 6df7918aea Merge MultiCraft_game
and change gitignore
2015-05-15 16:43:28 +03:00
est31 181f7baa45 Add LibGMP
Uses system provided libgmp if found, if not it falls back to mini-gmp.
2015-05-11 17:48:33 +02:00
Maksim Gamarnik 102e9bea51 Wvm add 2015-05-10 18:03:54 +10:00
est31 b015971d3b Add .patch files to gitignore 2015-05-04 16:51:58 +10:00
est31 aef1b41b02 Add .patch files to gitignore 2015-05-01 07:42:08 +02:00
kwolekr 068d561a3c Update .gitignore 2015-04-26 15:40:19 -04:00
est31 40e248b9f9 Add more Android build files to .gitignore 2015-03-07 18:44:36 -05:00
4Evergreen4 51057a56f5 Add src/network/CMakeFiles/ and src/client/CMakeFiles to gitignore 2015-02-23 16:50:28 +10:00
Jürgen Doser 83830e8682 Add basic support for generating API documentation using Doxygen
If CMake is run and Doxygen is found, add a make target called "doc",
which builds API documention in doc/html. This target is not included
in the default "all" target, you have to explicitly run "make doc" to
generate the documentation.

If graphviz is installed, in particular, if the "dot" binary is found,
doxygen is configured to generate various kinds of diagrams. Note that
due to this, the first run of doxygen can take a while.
2014-12-12 14:59:57 -05:00
sapier 1cc40c0a7c Add support for Android 2.3+
There have been plenty of ppl involved in creating this version.
I don't wanna mention names as I'm sure I'd forget someone so I
just tell where help has been done:
- The partial android versions done by various ppl
- Testing on different android devices
- reviewing code (especially the in core changes)
- testing controls
- reviewing texts

A big thank you to everyone helping this to be completed!
2014-06-29 18:17:56 +02:00
Kahrl 8bc7ea61b9 Show git hash in version string at top left corner of window 2013-09-28 21:30:17 +02:00
bcnjr5 64befefcfc Add Code::Blocks project and build files to .gitignore 2013-06-03 04:30:59 +02:00
sapier ab43377577 Move scriptapi to separate folder (by sapier)
On the lua side, notably minetest.env:<function>(<args>) should now
be replaced by minetest.<function>(<args>).
The old way is and will stay supported for a long time.

Also:
Update and clean up lua_api.txt (by celeron55)
Move EnvRef to lua and remove add_rat and add_firefly (by kahrl)
Add separate src/util/CMakeLists.txt, other minor fixes (by kahrl)
2013-05-25 00:51:02 +02:00
kwolekr 8ec3fc35c6 Add Mapgen V7, reorganize biomes 2013-04-07 00:50:21 -04:00
Juhani Numminen 450e7ef0c5 Git-ignore SQLite build files 2013-03-19 16:20:13 +01:00
ShadowNinja 350596b94f Add cloud menu background by Krisi, configurable with the menu_clouds option.
Also add a menuheader, menusplash, menufooter_clouds, and allow HD menu footers.
And finally don't git-ignore textures/base/.
2013-03-13 21:18:40 -04:00
PilzAdam aa77ee66c5 Change libjson to libjsoncpp in .gitignore 2013-03-06 17:09:28 -05:00
proller ee07c3f7cf new auto masterserver 2013-02-22 02:04:53 +04:00
Ilya Zhuravlev 30b9a4d6b4 Add Freetype support 2013-02-14 18:46:08 +01:00
Perttu Ahola 862d76b617 Move games/minetest to games/minimal and update README.txt 2012-03-26 23:28:19 +03:00
Perttu Ahola a9a923e4da Update/fix .gitignore 2012-03-25 15:52:08 +03:00
Perttu Ahola 2de91f11fb Add mods/mesetint/mods_here.txt to be installed on RUN_IN_PLACE builds 2012-03-20 01:19:47 +02:00
Perttu Ahola 97b693052c Flatten share/ and user/ in the source and for the RUN_IN_PLACE build 2012-03-20 00:08:00 +02:00
Garrosh ac69a3561a Added Kate backup file scheme to .gitignore for Kate users 2012-01-24 22:38:00 -05:00
Perttu Ahola dcedfdacd1 Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola 3028bbb95b Updated .gitignore to ignore vim swap files 2011-08-12 00:33:24 +03:00
Sebastian Rühl 9d09103e48 Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
Conflicts:
	.gitignore
	CMakeLists.txt
	data/heart.png
	src/CMakeLists.txt
	src/game.cpp
	src/guiMainMenu.cpp
	src/inventory.cpp
	src/map.cpp
	src/mapblock.cpp
	src/mapnode.cpp
	src/mapnode.h
	src/materials.cpp
	src/server.cpp

Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
2011-06-26 12:24:32 +02:00
Perttu Ahola 7538b4c620 New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo) 2011-06-25 04:25:14 +03:00