Commit Graph

209 Commits (7871b448241ad65761043bdba8165a449294e7fa)

Author SHA1 Message Date
Schmappie Eldress 7871b44824 Merge branch 'dragonfire/master' into waspsaliva
This merge removes some redundant-looking code that was apparently
included in DFC upstream already.

This merge also reverts some whitespace & reformatting changes in the
`src/` directory so that a `git diff dragonfire/master` contains only
the essential differences.
2021-08-17 01:48:45 -05:00
Elias Fleckenstein f3e741dad1 Merge branch 'master' of https://github.com/minetest/minetest 2021-05-13 18:06:47 +02:00
Wuzzy 776015c350
Rename “Irrlicht” to “IrrlichtMt” in documentation 2021-04-23 21:37:45 +02:00
sfan5 5f4c78a77d Fix broken include check and correct Gitlab-CI script 2021-03-26 23:12:19 +01:00
Elias Fleckenstein 880c9768a9 Merge branch 'master' of https://github.com/minetest/minetest 2021-03-26 14:00:57 +01:00
sfan5 bb1c4badfb Clean up cmake DLL installation and other minor things 2021-03-12 20:55:51 +01:00
sfan5 91c9313c87 Switch Irrlicht dependency to our own fork
-> https://github.com/minetest/irrlicht
2021-03-09 21:53:17 +01:00
sfan5 dcb30a593d Set ENABLE_SYSTEM_JSONCPP to TRUE by default 2021-03-07 14:26:09 +01:00
sfan5 02d64a51ee Continue with 5.5.0-dev 2021-02-23 19:50:44 +01:00
sfan5 f3e51dca15 Bump version to 5.4.0 2021-02-23 19:50:37 +01:00
Elias Fleckenstein 1fbbb76825 Merge branch 'master' of https://github.com/minetest/minetest 2021-02-10 19:50:36 +01:00
sfan5 9c91cbf50c
Handle changes caused by CMake minimum version bump (#10859)
fixes #10806
2021-01-29 17:35:29 +01:00
cora e18ce94709 add -dragonfire version string for easy detection 2021-01-20 19:44:42 +01:00
Elias Fleckenstein 74f5f033e0 Add Custom version string 2021-01-20 16:55:46 +01:00
Elias Fleckenstein b2f629d8d3 Logo improvements 2021-01-11 14:26:03 +01:00
Elias Fleckenstein cca4254f7c Merge branch 'master' of https://github.com/minetest/minetest 2021-01-07 12:35:04 +01:00
sfan5 74762470b2 Fix some minor code issues all over the place 2020-12-24 13:44:54 +01:00
LoneWolfHT d5a481b4e6
Make installer create its own Minetest folder (#10445)
This changes the installer to create its own Minetest folder instead of having the user create it themselves. This prevents spewing the contents of Minetest everywhere when users change the install directory and expect the installer to create a folder to put it in
2020-12-18 19:38:27 +01:00
cron be80a15bad Merge Dragonfire
Dragonfire commit: 56d536ea5e
2020-12-09 20:36:09 +00:00
Elias Fleckenstein eb6aca8b4a Merged Minetest 2020-11-28 13:48:33 +01:00
cron cf97c5c246 core: change cmake project name
I think Windows buildbot still uses Dragonfire
2020-10-04 15:42:23 +00:00
flyc0r 0e9e1f3528 init 2020-10-04 03:37:08 +02:00
LoneWolfHT d3e327a853
Update wording of game descriptions in installer (#10441) 2020-09-29 19:39:36 +02:00
Elias Fleckenstein 5a8610c2f4 Added customizable keybindings, improved freecam, added special inventory keybind (by default ender inventory) 2020-07-18 20:01:17 +02:00
Elias Fleckenstein ffe3c2ae0d Update to minetest 5.4.0-dev 2020-07-18 13:53:15 +02:00
sfan5 2384c10e10 Continue with 5.4.0-dev 2020-07-09 22:04:22 +02:00
sfan5 057f0b82c2 Bump version to 5.3.0 2020-07-09 22:04:20 +02:00
Wuzzy 083b285f43
Rename “Minimal development test” to “Development Test” (#9928) 2020-05-26 00:17:52 +02:00
Elias Fleckenstein 68f9263a24 Hacked Client 2020-05-13 19:41:30 +02:00
Loïc Blot 7539267d37
Add an option to disable unittest build, & disable them on Docker build (#9677) 2020-04-16 20:43:49 +02:00
Hugo Locurcio 2349d31bae
Install the `locale` directory in a standard location without subfolder (#9618)
Other established FOSS projects don't seem to be doing this.
2020-04-10 16:08:48 +02:00
Elias Fleckenstein 90d8855069 GalwayGirl Client 2020-04-08 11:52:16 +02:00
sfan5 528b162d9f Continue with 5.3.0-dev 2020-04-05 18:31:52 +02:00
sfan5 24147d99c0 Bump version to 5.2.0 2020-04-05 18:31:50 +02:00
sfan5 b5f5e00b29 Install client_lua_api.txt documentation too
fixes #9104
2019-11-11 14:06:48 +01:00
sfan5 b7e358703f Don't install fonts on ENABLE_CLIENT=0 configurations 2019-10-14 21:24:23 +02:00
sfan5 894008ce6f Continue with 5.2.0-dev 2019-10-12 15:49:06 +02:00
sfan5 4e4fb4db2a Bump version to 5.1.0 2019-10-12 15:48:58 +02:00
ANAND 66ecfb5916 CMakeLists.txt: Remove references to Minecraft and Infiniminer (#8487) 2019-04-26 19:07:32 +02:00
sfan5 51662dabb4 Continue with 5.1.0-dev 2019-03-04 23:43:18 +01:00
sfan5 f9d1810b1e Bump version to 5.0.0 2019-03-04 23:43:14 +01:00
adrido 2322078fe4 Windows: Cpack wix installer (#6153)
Create CPack WIX msi Installer for RUN_IN_PLACE=0 builds
Correct paths on Windows for RUN_IN_PLACE=0
Install only required font files
Games have their own components, and "minimal" is optional
2018-10-26 21:37:51 +02:00
Loïc Blot ac6e8e2914
Version scheme change: 0.5.0 -> 5.0.0 (#7449)
* Version scheme change: 0.5.0 -> 5.0.0
2018-06-15 09:16:48 +02:00
Loïc Blot b28af0ed07 Verify compiler version before building anything (#6293)
GCC 4.9 and Clang 3.4 are the minimum
2017-08-24 17:16:55 +02:00
Loïc Blot c99dcbaca9 New version scheme (#6292)
* Version changes: current dev version is now 0.5.0

* This change permit to have multi branches with various versions
* Dev version is 0.5.0-dev and next release will be 0.5.0
2017-08-20 17:20:11 +02:00
rubenwardy a039d981ac Change README to Markdown format, add LICENSE.txt (#6244) 2017-08-18 10:47:40 +02:00
sfan5 4783ff956b Update list of installed files concerning server and non-RUN_IN_PLACE builds (#5976)
* mods/mods_here.txt should be present on servers
* client/serverlist/ can be omitted for RUN_IN_PLACE=0
* clientmods/ is not used on servers
2017-06-14 08:04:39 +02:00
Loic Blot bf6569b570 Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7
* Move Clang to Clang 3.6 & Clang 4.0
* LINT moves from Clang 3.9 to Clang 4.0
* Move XCode 7.3 to 8.0
* Use more travis tricks to install compilers instead of adding complexity to our build script
* Clang format fixes on checked files (compat Cpp11 instead of Cpp03)
* Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial)
* Drop mingw cmake generated files and add them to gitignore
2017-06-04 09:57:08 +02:00
ShadowNinja 63ca71e9d2 Continue with 0.4.16-dev 2017-06-03 14:42:10 -04:00
ShadowNinja 80dc961d24 Bump version to 0.4.16 2017-06-03 14:42:10 -04:00