59 Commits

Author SHA1 Message Date
proller
b25f3cf56c Fixes 2021-11-14 05:12:15 +03:00
proller
c235c087dd android_fm: .gitignore 2016-10-11 22:29:48 +03:00
proller
d603c25e5b Merge remote-tracking branch 'minetest/master' 2016-05-22 21:54:26 +03:00
HybridDog
0f184d77c8 Gitignore: ignore idea and ninja files 2016-05-22 08:22:37 +01:00
proller
c32a08c85e Merge commit 'e416738' into freeminer1 2016-04-30 03:17:10 +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
proller
6251198957 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/mg_decoration.cpp
2015-09-28 00:25:27 +03: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
alexxvk
cff5adedd7 Add default directory for screenshots
Create directory for screenshots  if directory not exists
2015-09-23 20:18:23 +06:00
alexxvk
10dc0aa8b7 Ignore client/servers_public.json 2015-09-22 07:05:57 +06:00
proller
a27044cf4d Merge commit 'e4bff8b'
Conflicts:
	.gitignore
	build/android/jni/Android.mk
	src/ban.h
	src/client.cpp
	src/client.h
	src/clientiface.cpp
	src/clientiface.h
	src/clientmap.cpp
	src/emerge.cpp
	src/environment.cpp
	src/environment.h
	src/httpfetch.cpp
	src/jthread/CMakeLists.txt
	src/jthread/jmutex.h
	src/jthread/jmutexautolock.h
	src/jthread/jthread.h
	src/jthread/pthread/jsemaphore.cpp
	src/jthread/win32/jsemaphore.cpp
	src/mapblock.cpp
	src/minimap.cpp
	src/minimap.h
	src/network/connection.cpp
	src/network/connection.h
	src/particles.cpp
	src/player.h
	src/porting.cpp
	src/porting.h
	src/porting_android.cpp
	src/profiler.h
	src/script/cpp_api/s_async.h
	src/script/cpp_api/s_base.h
	src/script/cpp_api/s_internal.h
	src/server.cpp
	src/server.h
	src/settings.cpp
	src/threading/semaphore.h
	src/threads.h
	src/util/container.h
	src/util/numeric.h
	src/util/thread.h
2015-09-15 17:31:35 +03: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
proller
2edbe6e264 Merge commit '4722534' 2015-08-04 20:50:07 +03:00
proller
9bd56ccf62 Merge commit 'c39a85a'
Conflicts:
	build/android/Makefile
2015-08-04 20:03:45 +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
proller
8e36e186e4 misc 2015-07-03 21:17:26 +03:00
proller
fdb98d0de1 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/cavegen.cpp
2015-07-01 15:35:48 +03: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
proller
f059248595 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/ban.h
	src/client.cpp
	src/game.cpp
	src/mapgen.cpp
	src/server.cpp
2015-05-21 04:48:22 +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
proller
4de9db74a5 Merge commit '181f7ba'
Conflicts:
	README.txt
	build/android/Makefile
	build/android/jni/Android.mk
	src/CMakeLists.txt
2015-05-12 17:32:57 +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
proller
fe85cd03a8 Merge remote-tracking branch 'minetest/master' 2015-05-01 15:17:12 +03:00
est31
aef1b41b02 Add .patch files to gitignore 2015-05-01 07:42:08 +02:00
proller
719b83d658 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/CMakeLists.txt
	src/noise.h
	src/test.cpp
	src/test.h
2015-04-27 16:08:18 +03:00
kwolekr
068d561a3c Update .gitignore 2015-04-26 15:40:19 -04:00
proller
8fe55fd123 Merge remote-tracking branch 'minetest/master'
Conflicts:
	misc/freeminer.desktop
	src/emerge.cpp
	src/map.cpp
	src/mapgen.h
	src/subgame.cpp
2015-03-08 05:30:39 +03:00
est31
40e248b9f9 Add more Android build files to .gitignore 2015-03-07 18:44:36 -05:00
proller
097ff70c68 Merge remote-tracking branch 'minetest/master'
Conflicts:
	src/mapblock_mesh.cpp
	src/script/lua_api/l_object.cpp
2015-02-25 17:23:12 +03:00
4Evergreen4
51057a56f5 Add src/network/CMakeFiles/ and src/client/CMakeFiles to gitignore 2015-02-23 16:50:28 +10:00
proller
82c5cefd9b Merge remote-tracking branch 'minetest/master' into stable
Conflicts:
	po/it/minetest.po
	src/camera.cpp
	src/clientiface.cpp
	src/map.cpp
	src/mapblock.h
	src/mapgen_v6.cpp
	src/nodedef.cpp
	src/noise.cpp
	src/noise.h
	src/server.cpp
	src/settings.cpp
	src/settings.h
2014-12-13 02:26:55 +03: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
donat_b
18c62d504c chg: dev: Add _build to .gitignore 2014-11-17 11:19:57 +03:00
proller
0307e489af Merge commit '1cc40c0'
Conflicts:
	src/config.h
	src/defaultsettings.cpp
	src/game.cpp
	src/main.cpp
2014-06-30 22:16:33 +04: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
proller
09012089b0 add +client/favoriteservers.json to .gitignore 2014-06-13 20:10:20 +04:00
proller
046a259d19 The line "minetest.conf" should be replaced with "freeminer.conf". 2014-01-28 16:10:34 +04: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