dragonfire-client-waspsaliva/src
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
..
client Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
content Fix format 2021-05-13 08:24:07 +02:00
database PlayerDatabaseFiles: Fix segfault while saving a player 2021-01-29 18:02:40 +01:00
gui Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
irrlicht_changes Fix two CMake build issues 2021-04-21 20:26:43 +02:00
mapgen Fix broken `BiomeGen` abstraction (#11107) 2021-03-23 15:43:26 +01:00
network Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
script Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
server Merge branch 'master' of https://github.com/minetest/minetest 2021-05-13 18:06:47 +02:00
threading Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
unittest Merge branch 'master' of https://github.com/minetest/minetest 2021-05-13 18:06:47 +02:00
util Add `minetest.colorspec_to_colorstring` (#10425) 2021-04-23 21:37:24 +02:00
CMakeLists.txt Use Irrlicht functions to query npot texture support 2021-05-05 22:49:44 +02:00
activeobject.h Removed some obsolete code (#10562) 2021-01-21 18:17:09 +00:00
activeobjectmgr.h Merge branch 'master' of https://github.com/minetest/minetest 2021-03-26 14:00:57 +01:00
ban.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
ban.h init 2020-10-04 03:37:08 +02:00
chat.cpp Drop wide/narrow conversion functions 2021-02-02 20:46:08 +01:00
chat.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
chat_interface.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
chatmessage.h init 2020-10-04 03:37:08 +02:00
clientiface.cpp Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00
clientiface.h Fix build for newer versions of GCC (#11246) 2021-05-06 19:24:30 +02:00
cloudparams.h init 2020-10-04 03:37:08 +02:00
cmake_config.h.in init 2020-10-04 03:37:08 +02:00
cmake_config_githash.h.in init 2020-10-04 03:37:08 +02:00
collision.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
collision.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
config.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
constants.h Consistently use "health points" (#10868) 2021-01-27 18:42:02 +00:00
content_mapnode.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
content_mapnode.h init 2020-10-04 03:37:08 +02:00
content_nodemeta.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
content_nodemeta.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
convert_json.cpp Sort out cURL timeouts and increase default 2021-04-02 00:19:39 +02:00
convert_json.h Sort out cURL timeouts and increase default 2021-04-02 00:19:39 +02:00
craftdef.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
craftdef.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
daynightratio.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
debug.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
debug.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
defaultsettings.cpp Merge branch 'dragonfire/master' into waspsaliva 2021-08-17 01:48:45 -05:00
defaultsettings.h Settings: Proper priority hierarchy 2021-01-29 17:32:35 +01:00
emerge.cpp Fix broken `BiomeGen` abstraction (#11107) 2021-03-23 15:43:26 +01:00
emerge.h Fix broken `BiomeGen` abstraction (#11107) 2021-03-23 15:43:26 +01:00
environment.cpp Merged Minetest 2020-11-28 13:48:33 +01:00
environment.h init 2020-10-04 03:37:08 +02:00
exceptions.h Remove dead code (#10845) 2021-01-22 15:09:26 +00:00
face_position_cache.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
face_position_cache.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
filesys.cpp fix: extractZipFile is not part of Client but more generic. 2021-05-06 16:01:52 +02:00
filesys.h fix: extractZipFile is not part of Client but more generic. 2021-05-06 16:01:52 +02:00
gamedef.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
gameparams.h init 2020-10-04 03:37:08 +02:00
gettext.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
gettext.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
gettime.h init 2020-10-04 03:37:08 +02:00
httpfetch.cpp Sort out cURL timeouts and increase default 2021-04-02 00:19:39 +02:00
httpfetch.h init 2020-10-04 03:37:08 +02:00
hud.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
hud.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
inventory.cpp Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00
inventory.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
inventorymanager.cpp Fix wrong number of items in allow_metadata_inventory_put/take callbacks (#10990) 2021-02-23 19:36:55 +01:00
inventorymanager.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
irr_aabb3d.h init 2020-10-04 03:37:08 +02:00
irr_ptr.h Improve irr_ptr (#10808) 2021-01-24 14:40:34 +00:00
irr_v2d.h init 2020-10-04 03:37:08 +02:00
irr_v3d.h init 2020-10-04 03:37:08 +02:00
irrlichttypes.h Irrlicht support code maintenance 2021-03-31 13:15:47 +02:00
irrlichttypes_bloated.h init 2020-10-04 03:37:08 +02:00
irrlichttypes_extrabloated.h init 2020-10-04 03:37:08 +02:00
itemdef.cpp Use place_param2 client-side for item appearance & prediction (#11024) 2021-03-09 00:56:53 +01:00
itemdef.h Use place_param2 client-side for item appearance & prediction (#11024) 2021-03-09 00:56:53 +01:00
itemgroup.h init 2020-10-04 03:37:08 +02:00
itemstackmetadata.cpp Sanitize ItemStack meta text 2021-01-28 21:33:10 +00:00
itemstackmetadata.h init 2020-10-04 03:37:08 +02:00
light.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
light.h init 2020-10-04 03:37:08 +02:00
log.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
log.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
main.cpp refacto: RenderingEngine is now better hidden 2021-05-03 19:49:19 +02:00
map.cpp Merge branch 'master' of https://github.com/minetest/minetest 2021-02-10 19:50:36 +01:00
map.h Merge branch 'master' of https://github.com/minetest/minetest 2021-02-10 19:50:36 +01:00
map_settings_manager.cpp Server: properly delete ServerMap on interrupted startups 2021-02-05 18:38:34 +01:00
map_settings_manager.h Settings: Proper priority hierarchy 2021-01-29 17:32:35 +01:00
mapblock.cpp Allow configuring block disk and net compression. Change default disk level. 2020-12-15 10:15:25 -08:00
mapblock.h Remove dead code (#10845) 2021-01-22 15:09:26 +00:00
mapnode.cpp Put torch/signlike node on floor if no paramtype2 (#11074) 2021-04-20 19:50:03 +02:00
mapnode.h Degrotate support for mesh nodes (#7840) 2021-03-30 00:25:11 +02:00
mapsector.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
mapsector.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
metadata.cpp init 2020-10-04 03:37:08 +02:00
metadata.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
modchannels.cpp init 2020-10-04 03:37:08 +02:00
modchannels.h init 2020-10-04 03:37:08 +02:00
modifiedstate.h init 2020-10-04 03:37:08 +02:00
mtevent.h Darwin platform build fix (#10376) 2020-09-09 19:12:03 +02:00
nameidmapping.cpp init 2020-10-04 03:37:08 +02:00
nameidmapping.h init 2020-10-04 03:37:08 +02:00
nodedef.cpp Merge branch 'master' of https://github.com/minetest/minetest 2021-05-13 18:06:47 +02:00
nodedef.h refacto: remove get_gui_env & draw_load_screen from RenderingEngine singleton 2021-05-03 19:49:19 +02:00
nodemetadata.cpp Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00
nodemetadata.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
nodetimer.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
nodetimer.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
noise.cpp Fix broken `BiomeGen` abstraction (#11107) 2021-03-23 15:43:26 +01:00
noise.h Fix broken `BiomeGen` abstraction (#11107) 2021-03-23 15:43:26 +01:00
objdef.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
objdef.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
object_properties.cpp Add nametag background setting and object property (#10937) 2021-02-17 19:51:28 +00:00
object_properties.h Add nametag background setting and object property (#10937) 2021-02-17 19:51:28 +00:00
particles.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
particles.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
pathfinder.cpp Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00
pathfinder.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
player.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
player.h Merged Minetest 2020-11-28 13:48:33 +01:00
porting.cpp Add open user data button to main menu (#10579) 2020-12-19 13:27:15 +00:00
porting.h Slap u64 on everything time-y (#10984) 2021-02-24 12:05:17 +01:00
porting_android.cpp Add open user data button to main menu (#10579) 2020-12-19 13:27:15 +00:00
porting_android.h Add open user data button to main menu (#10579) 2020-12-19 13:27:15 +00:00
profiler.cpp Minor profiler fixes. 2020-12-23 14:48:08 -08:00
profiler.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
raycast.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
raycast.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
reflowscan.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
reflowscan.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
remoteplayer.cpp RemotePlayer: Remove Settings writer to Files database 2021-01-29 17:32:35 +01:00
remoteplayer.h Settings: Proper priority hierarchy 2021-01-29 17:32:35 +01:00
rollback.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
rollback.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
rollback_interface.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
rollback_interface.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
serialization.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
serialization.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
server.cpp Translate builtin (#10693) 2021-03-05 16:29:48 +01:00
server.h Server: properly delete ServerMap on interrupted startups 2021-02-05 18:38:34 +01:00
serverenvironment.cpp Include tile definitions in get_node_def; Client-side minetest.object_refs table 2021-05-11 14:07:30 +02:00
serverenvironment.h Remove dead code (#10845) 2021-01-22 15:09:26 +00:00
serverlist.cpp Use JSON for favorites, move server list code to Lua (#10085) 2021-01-22 15:08:57 +00:00
serverlist.h Use JSON for favorites, move server list code to Lua (#10085) 2021-01-22 15:08:57 +00:00
settings.cpp Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00
settings.h Settings: Push groups in to_table as well 2021-03-01 12:14:41 +01:00
settings_translation_file.cpp Update minetest.conf.example and dummy translation file 2021-02-23 19:03:34 +01:00
skyparams.h init 2020-10-04 03:37:08 +02:00
sound.h init 2020-10-04 03:37:08 +02:00
staticobject.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
staticobject.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
terminal_chat_console.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
terminal_chat_console.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
texture_override.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
texture_override.h init 2020-10-04 03:37:08 +02:00
tileanimation.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
tileanimation.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
tool.cpp Serialize tool capabilities JSON without whitespace 2021-03-20 22:06:17 +01:00
tool.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
translation.cpp Reduce empty translation error to infostream 2021-02-07 16:03:48 +00:00
translation.h init 2020-10-04 03:37:08 +02:00
version.cpp Improve --version output to include Lua(JIT) version 2021-01-21 00:52:31 +01:00
version.h init 2020-10-04 03:37:08 +02:00
voxel.cpp Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
voxel.h Revert "Make Lint Happy" 2020-11-04 16:57:41 +01:00
voxelalgorithms.cpp Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00
voxelalgorithms.h Reserve vectors before pushing and other code quality changes (#11161) 2021-04-05 13:38:31 +02:00