mod.compassgps: Update to Git commit ec96e18...
https://github.com/Kilarin/compassgps/tree/ec96e18
This commit is contained in:
Jordan Irwin
parent
91168a286d
commit
a4ff54b255
@ -103,7 +103,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
||||
* [drawers][] ([MIT / CC0 / CC BY][lic.drawers]) -- version: [279d0ab Git][ver.drawers] *2018-06-18*
|
||||
* [more_chests][] ([GPL][lic.gpl2.0]) -- version [c597779 Git][ver.more_chests] *2017-02-27*
|
||||
* tools/
|
||||
* [compassgps][] ([WTFPL][lic.wtfpl] / [CC0][lic.cc0] / [CC BY-SA][lic.ccbysa]) -- version: [96892a0 Git][ver.compassgps] *2015-07-31* ([patched][patch.compassgps]) ***UPDATES***
|
||||
* [compassgps][] ([WTFPL][lic.wtfpl] / [CC0][lic.cc0] / [CC BY-SA][lic.ccbysa]) -- version: [ec96e18 Git][ver.compassgps] *2018-02-12*
|
||||
* [tools_obsidian][] ([LGPL / CC BY-SA][lic.tools_obsidian]) -- version: [f77fd79][ver.tools_obsidian] *2016-03-19* ([patched][patch.tools_obsidian])
|
||||
* [workbench][] ([LGPL / WTFPL](mods/tools/workbench/LICENSE)) -- version: [bd14f59 Git][ver.workbench] *2017-08-08*
|
||||
* transport/
|
||||
@ -409,7 +409,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
||||
[ver.christmas]: https://github.com/TheZenKitteh/minetest-christmas/tree/d3bd872
|
||||
[ver.cleaner]: https://github.com/AntumMT/mod-cleaner/tree/68222b1
|
||||
[ver.coloredwood]: https://github.com/minetest-mods/coloredwood/tree/bd490be
|
||||
[ver.compassgps]: https://github.com/Kilarin/compassgps/tree/96892a0
|
||||
[ver.compassgps]: https://github.com/Kilarin/compassgps/tree/ec96e18
|
||||
[ver.crafting_bench]: https://github.com/minetest-mods/crafting_bench/tree/ca21489
|
||||
[ver.craftguide]: https://github.com/minetest-mods/craftguide/tree/1.1
|
||||
[ver.crops]: https://github.com/minetest-mods/crops/tree/v1
|
||||
@ -503,7 +503,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
|
||||
[patch.bridges]: https://github.com/AntumMT/mod-bridges/tree/ba8f71a
|
||||
[patch.castle_weapons]: https://github.com/AntumMT/mod-castle_weapons/tree/669db13
|
||||
[patch.christmas]: https://github.com/AntumMT/mod-christmas/tree/7ffdc67
|
||||
[patch.compassgps]: https://github.com/AntumMT/mod-compassgps/tree/b900f30
|
||||
[patch.craftguide]: https://github.com/AntumMT/mod-craftguide/tree/3930813
|
||||
[patch.drawers]: https://github.com/AntumMT/mod-drawers/tree/a77f809
|
||||
[patch.enchanting]: https://github.com/AntumMT/mod-enchanting/tree/7a01f2f
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
This mod creates a customizable compass with user settable bookmarks and shared and admin bookmarks in multiplayer.
|
||||
|
||||
**Compass GPS version 2.7**
|
||||
**Compass GPS version 2.7 fork 1**
|
||||
|
||||
Echo created a compass mod back in 2012: [https://forum.minetest.net/viewtopic.php?id=3785](https://forum.minetest.net/viewtopic.php?id=3785)<p>
|
||||
PilzAdams made a modification of it, which I can not find the source to, I don't know how much of PilzAdams changes made it into the later versions of Echo's mod.<p>
|
||||
@ -139,6 +139,7 @@ If you use this mod, please consider reviewing it on the MineTest Mod Database.<
|
||||
[https://forum.minetest.net/mmdb/mod/compassgps/](https://forum.minetest.net/mmdb/mod/compassgps/)
|
||||
|
||||
**Changelog:**<p>
|
||||
2.7 fork 1 HUD fixes
|
||||
2.7 bug fix: in a catastrophic server crash, compassgps_settings or bookmarks file could exist, but be empty. When the file exists but is empty, the table it is loaded into ends up as nil instead of empty and that causes the server to crash on startup. NOT GOOD! With bug fix, if file exists but is empty, server will start but not crash and new contents for empty file will be created. a message will appear in the debug informing server owner to restore bookmarks from backup if possible.<p>
|
||||
2.6 bug fix from myoung008, type causing crashes when entering bad color.<p>
|
||||
2.5 bug fix from TeTpaAka fix bug when static_spawnpoint is invalid<p>
|
||||
|
||||
@ -34,6 +34,9 @@ function write_to_cgpsmap(itemstack, user)
|
||||
end
|
||||
textlist_bookmark[user:get_player_name()] = list
|
||||
local formspec = "size[9,10;]"..
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"button_exit[2,2;5,0.5;write;"..S("Write to cgpsmap").."]"..
|
||||
"textlist[0,3.0;9,6;bookmark_list;"..list..";"..bkmrkidx.."]"
|
||||
minetest.show_formspec(user:get_player_name(), "compassgps:write", formspec)
|
||||
@ -44,9 +47,12 @@ end
|
||||
function read_from_cgpsmap(itemstack, user, meta)
|
||||
--print("read_from_cgpsmap")
|
||||
local formspec = "size[9,5]"..
|
||||
"button_exit[2,3;5,0.5;read;"..S("copy bookmark to your compassgps").."]"
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"button_exit[3,3;4,0.5;read;"..S("Copy bookmark to compassgps").."]"
|
||||
if itemstack~=nil then
|
||||
formspec=formspec.. "button_exit[3.1,4;2.6,0.8;rename;"..S("rename bookmark").."]"
|
||||
formspec=formspec.. "button_exit[3.1,4;2.6,0.8;rename;"..S("Rename bookmark").."]"
|
||||
else
|
||||
itemstack=ItemStack("compassgps:cgpsmap_marked 1")
|
||||
if meta then
|
||||
@ -59,8 +65,8 @@ function read_from_cgpsmap(itemstack, user, meta)
|
||||
end
|
||||
selected_cgpsmap[user:get_player_name()] = itemstack
|
||||
|
||||
formspec=formspec.."label[2,0.5;"..S("bookmark pos:").." ("..meta["x"]..","..meta["y"]..","..meta["z"]..")]"..
|
||||
"field[2,2;5,0.5;name;"..S("bookmark name:")..";"..meta["bkmrkname"].."]"
|
||||
formspec=formspec.."label[2,0.5;"..S("Bookmark pos:").." ("..meta["x"]..","..meta["y"]..","..meta["z"]..")]"..
|
||||
"field[2,2;5,0.5;name;"..S("Bookmark name:")..";"..meta["bkmrkname"].."]"
|
||||
minetest.show_formspec(user:get_player_name(), "compassgps:read", formspec)
|
||||
--print("read_from_cgpsmap end")
|
||||
end
|
||||
|
||||
@ -29,7 +29,7 @@ end
|
||||
local hud_default_x=0.4
|
||||
local hud_default_y=0.01
|
||||
local hud_default_color="FFFF00"
|
||||
local compass_default_type="a"
|
||||
local compass_default_type="c"
|
||||
local compass_valid_types={"a","b","c"}
|
||||
local activewidth=8 --until I can find some way to get it from minetest
|
||||
local max_shared=10 --how many shared bookmarks a user with shared_bookmarks priv can make.
|
||||
@ -406,7 +406,10 @@ function compassgps.get_confirm_formspec(playername,bkmrkidx)
|
||||
local bkmrk=textlist_bkmrks[playername][bkmrkidx]
|
||||
|
||||
return "compassgps:confirm_remove", "size[8,2;]"..
|
||||
"label[0,0.2;"..S("Remove bookmark: ")..compassgps.bookmark_name_string(bkmrk).." ?]"..
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"label[0,0.2;"..S("Remove: ")..compassgps.bookmark_name_string(bkmrk).." ?]"..
|
||||
"button[0,0.7;4,1;confirm_remove_yes;"..S("Yes").."]"..
|
||||
"button[4,0.7;4,1;confirm_remove_no;"..S("No").."]"
|
||||
end
|
||||
@ -1214,41 +1217,44 @@ function compassgps.get_compassgps_formspec(name)
|
||||
end
|
||||
local telebutton=""
|
||||
if player_privs["teleport"] then
|
||||
telebutton="button[4,9.3;3,1;teleport;"..S("teleport to bookmark").."]"
|
||||
telebutton="button[6,9.3;3,1;teleport;"..S("teleport to bookmark").."]"
|
||||
end
|
||||
local sharedbutton=""
|
||||
if player_privs["shared_bookmarks"] and not singleplayer then
|
||||
sharedbutton="button[2.3,0.7;2.3,1;new_shared_bookmark;"..S("create shared").."]"
|
||||
sharedbutton="button[2.4,0.7;2.2,1;new_shared_bookmark;"..S("create shared").."]"
|
||||
end
|
||||
local adminbutton=""
|
||||
if player_privs["privs"] and not singleplayer then
|
||||
adminbutton="button[4.6,0.7;2.3,1;new_admin_bookmark;"..S("create admin").."]"
|
||||
adminbutton="button[4.5,0.7;2.1,1;new_admin_bookmark;"..S("create admin").."]"
|
||||
end
|
||||
|
||||
local checkboxes=""
|
||||
if not singleplayer then
|
||||
checkboxes="label[3.65,1.75;"..S("Show:").."]"..
|
||||
"checkbox[4.35,1.4;show_private;"..S("Private")..";"..view_type_P[name].."]"..
|
||||
"checkbox[4.35,1.7;show_shared;"..S("Shared")..";"..view_type_S[name].."]"..
|
||||
"checkbox[4.35,2.0;show_admin;"..S("Admin")..";"..view_type_A[name].."]"
|
||||
checkboxes="label[3.85,1.75;"..S("Show:").."]"..
|
||||
"checkbox[7.55,1.4;show_private;"..S("Private")..";"..view_type_P[name].."]"..
|
||||
"checkbox[7.55,1.7;show_shared;"..S("Shared")..";"..view_type_S[name].."]"..
|
||||
"checkbox[7.55,2.0;show_admin;"..S("Admin")..";"..view_type_A[name].."]"
|
||||
end
|
||||
|
||||
return "compassgps:bookmarks", "size[9,10;]"..
|
||||
"field[0,0.2;5,1;bookmark;"..S("bookmark")..":;]"..
|
||||
"button[5.5,0;2.25,0.8;settings;"..S("Settings").."]"..
|
||||
"button[0,0.7;2.3,1;new_bookmark;"..S("create bookmark").."]"..
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"field[0.3,0.2;5,1;bookmark;"..S("bookmark name")..":;]"..
|
||||
"button[6.5,0;2.25,0.8;settings;"..S("Settings").."]"..
|
||||
"button[0,0.7;2.5,1;new_bookmark;"..S("Create bookmark").."]"..
|
||||
sharedbutton..
|
||||
adminbutton..
|
||||
"button[6.9,0.7;2.4,1;remove_bookmark;"..S("remove bookmark").."]"..
|
||||
"button[6.5,0.7;2.5,1;remove_bookmark;"..S("Remove bookmark").."]"..
|
||||
"label[0,1.75;"..S("Sort by:").."]"..
|
||||
"textlist[1,1.75;1.2,1;sort_type;"..S("name")..","..S("distance")..";"..sortdropdown.."]"..
|
||||
"label[2.4,1.75;"..S("Dist:").."]"..
|
||||
"textlist[3,1.75;.5,1;distance_type;3d,2d;"..distdropdown.."]"..
|
||||
checkboxes..
|
||||
"textlist[0,3.0;9,6;bookmark_list;"..list..";"..bkmrkidx.."]"..
|
||||
"button[0,9.3;3,1;find_bookmark;"..S("find selected bookmark").."]"..
|
||||
"textlist[0,3.0;8.8,6;bookmark_list;"..list..";"..bkmrkidx.."]"..
|
||||
"button[0,9.3;3.3,1;find_bookmark;"..S("Show selected bookmark").."]"..
|
||||
telebutton
|
||||
|
||||
|
||||
end --get_compassgps_formspec
|
||||
|
||||
|
||||
@ -1257,6 +1263,9 @@ function compassgps.get_settings_formspec(name)
|
||||
local player = minetest.get_player_by_name(name)
|
||||
|
||||
return "compassgps:settings", "size[8,4;]"..
|
||||
default.gui_bg..
|
||||
default.gui_bg_img..
|
||||
default.gui_slots..
|
||||
"button[1,0.2;2.25,1;hud_pos;"..S("Change hud:").."]"..
|
||||
"field[3.6,0.5;1.2,1;hudx;X:("..hud_default_x..");"..hud_pos[name].x.."]"..
|
||||
"field[4.8,0.5;1.2,1;hudy;Y:("..hud_default_y..");"..hud_pos[name].y.."]"..
|
||||
|
||||
@ -41,15 +41,15 @@ compassgps: hud color not valid hex number = compassgps: HUD Farbe ist keine zul
|
||||
compassgps: hud coords are not numeric. Change to between 0 and 1 = compassgps: HUD Koordinaten sind keine Zahlen. Ändern sie diese zu Werten zwischen 0 und 1.
|
||||
compassgps: hud coords out of range, hud will not be displayed. Change to between 0 and 1 to restore = compassgps: HUD Koordinaten sind außerhalb des zulässigen Bereichs. Ändern sie diese zu Werten zwischen 0 und 1 um das HUD wiederherzustellen.
|
||||
compassgps:%s invalid bookmark = compassgps.%s ungültiger Wegpunkt
|
||||
create admin = Erstelle Administratorwegpunkt
|
||||
create bookmark = Erstelle Wegpunkt
|
||||
create shared = Erstelle geteilten Wegpunkt
|
||||
Create admin = Erstelle Administratorwegpunkt
|
||||
Create bookmark = Erstelle Wegpunkt
|
||||
Create shared = Erstelle geteilten Wegpunkt
|
||||
current position : = Momentane Position :
|
||||
distance = Entfernung
|
||||
find selected bookmark = Finde den ausgewählten Wegpunkt
|
||||
Show selected bookmark = Zeigen den ausgewählten Wegpunkt
|
||||
list_bookmarks: Lists all bookmarks of a player = list_bookmarks: Zeigt alle Wegpunkte eines Spielers.
|
||||
name = Name
|
||||
remove bookmark = Entferne den Wegpunkt
|
||||
Remove bookmark = Entferne den Wegpunkt
|
||||
remove bookmark playername\=%s bkmrkidx\=%s = Entferne den Wegpunkt Spielername\=%s bkmrkidx\=%s
|
||||
removed %s = %s entfernt.
|
||||
set_bookmark: Sets a location bookmark for the player = set_bookmark: Setzt einen Wegpunkt für den Spieler.
|
||||
@ -58,6 +58,7 @@ you can not remove someone elses bookmark: = Sie können den Wegpunkt eines ande
|
||||
CompassGPS Map (blank) = CompassGPS Karte (leer)
|
||||
CompassGPS Map (marked) = CompassGPS Karte (markiert)
|
||||
Write to cgpsmap = Schreibe auf die Karte
|
||||
copy bookmark to your compassgps = Kopiere den Wegpunkt in ihren Kompass.
|
||||
bookmark name: = Name des Wegpunkts:
|
||||
bookmark pos: = Position des Wegpunkts:
|
||||
Copy bookmark to compassgps = Kopiere den Wegpunkt in Kompass.
|
||||
Bookmark name: = Name des Wegpunkts:
|
||||
Bookmark pos: = Position des Wegpunkts:
|
||||
Rename bookmark = Lesezeichen umbenennen
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user