Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,071 Commits 1 Branch 0 Tags
Commit Graph

157 Commits

Author SHA1 Message Date
Maksim Gamarnik
6a46c7bf60 Merge 2016-05-07 23:57:42 +03:00
Ekdohibs
4d9dbceb39 Run unescape_enriched *after* unescape_string. 
Doing it the other way round was a mistake, since it breaks
minetest.formspec_escape with escape sequences that contain
special characters.
 2016-05-07 08:33:21 +02:00
Ekdohibs
d5c3db9c41 Make dropdowns show the string that was their argument. 
This makes it work even if it contains escape sequences,
which didn't work before.
 2016-05-07 08:33:21 +02:00
Maksim Gamarnik
75a555f90c Fix merge prev commits and fix bugs 
Android: mpir, x86 flags, range view, fix favorite server icon, other
 2016-05-03 04:21:56 +03:00
Maksim Gamarnik
51cb15bc45 Merge minetest commits / WIP! 
Java part WIP, pls, use prev commits!
 2016-04-29 10:11:25 +03:00
Ekdohibs
48939df9a5 Escape more strings: formspecs, item descriptions, infotexts... 
Also, change the escape character to the more standard \x1b
Thus, it can be used in the future for translation or colored text,
for example.
 2016-04-24 03:54:11 +10:00
Xunto
21079cc8eb Fix bug that was leading to oversized tooltips containing multiline text when it have multiple lines 2016-04-23 21:12:53 +10:00
Maksim Gamarnik
3857a3b0bd Part III 2016-04-21 01:53:17 +03:00
Maksim Gamarnik
4e40dc5bef Merge remote-tracking branch 'upstream1/master' 2016-03-21 01:45:56 +02:00
ShadowNinja
93887043d9 Clean up Strfnd 
Changes:
  * Fix indentation.
  * Pass strings by const reference.
  * Merge Strfnd and WStrfnd into one class instead of copying them.
  * Remove trailing spaces.
  * Fix variable names.
  * Move to util.
  * Other miscellaneous style fixes.
 2016-03-19 21:27:57 -04:00
Maksim Gamarnik
4ee5e23518 Merge remote-tracking branch 'upstream/master' 2016-02-15 05:10:11 +02:00
RealBadAngel
c17c40a0f5 Formspec: fix broken irrlicht 1.7 build 
Fixes #3701.
 2016-02-13 22:19:01 +01:00
RealBadAngel
5ca48a35a6 Formspec: recreate item_image_button pressed state for its image and label 2016-02-13 02:35:52 +01:00
Maksim Gamarnik
ae66c6a782 Merge Minetest commits 2016-02-11 22:35:23 +02:00
RealBadAngel
baa7c8f8ad FormSpec: Add StaticTextSpec and superimpose over item image buttons 2016-02-09 03:03:55 -05:00
Maksim Gamarnik
8bdc501068 Fix 2016-02-09 00:52:07 +02:00
Maksim Gamarnik
4be9d9a393 Merge, part 1/2 2016-02-09 00:26:22 +02:00
est31
16c7008771 small drawItemStack cleanup 
-> Replace the three bool params with an enum
-> Add struct for the static content, leads to less repetition
-> cache enable_animations setting
 2016-02-08 00:35:24 +01:00
RealBadAngel
6cd2b3b445 Use meshes to display inventory items 2016-02-07 19:51:55 +01:00
Maksim Gamarnik
b05a829924 Fix 2015-12-15 14:05:18 +02:00
Maksim Gamarnik
e150219b9d Merge last minetest commits 2015-11-27 12:57:52 +02:00
BlockMen
36855522a5 Fix scrollbars 2015-11-12 17:38:15 +01:00
Maksim Gamarnik
9012ac8f22 Update 
Sync all Minetest commits
 2015-11-10 13:49:24 +02:00
ShadowNinja
96cc5b34fe Use warningstream for log messages with WARNING 
Remove DTIME macro and its uses, too
 2015-10-14 01:36:48 -04:00
est31
41d896d5c2 Clear list rings when loading a new formspec 
Fixes a bug where the old list ring remained when a new formspec
was displayed over the old one. This created the list-ring of the new formspec
to be partly ignored.

Thanks to @VanessaE to report the bug, and @DonBatman to produce the code that
exposed it.
 2015-10-10 17:10:52 +02:00
David Jones
34b7a147dc Change i++ to ++i 2015-08-25 18:33:52 -04:00
Maksim Gamarnik
d77ea9be46 LGPL 2.1 to 3.0 on all files 2015-08-14 01:26:28 +03:00
Kahrl
6c0c27f662 Fix intlGUIEditBox leak and uninitialized value in Mapper (reported by valgrind) 2015-08-10 08:41:45 +02:00
est31
2c1fd29884 Add MoveSomewhere inventory action 
Improve shift+click experience
 2015-06-23 20:18:41 +02:00
est31
ea1b17b88f Don't print an error for valid listring[] formspec 2015-06-18 04:25:11 +02:00
est31
7a90b31b30 GUIFormSpecMenu::OnEvent code style update and small refactor 
* Make method (more) consistent with current code stlye
* Move index into loop constructor after @rubenwardy's suggestion
* Cache inv_s->getList(s.listname), which removes a possibly bad scenario
of inv_s being null.
* Properly check for validity
 2015-06-16 20:33:07 +02:00
est31
c977fbd928 Add list-rings 
Adds list-rings, a method to implement item sending between inventories via shift-click.
Nice insider feature: a ring consisting of a single inventory list serves as nice clean-up method.
Also adds them to minimal game, and the standard inventory.
Craft output slots are not supported.
 2015-06-16 14:51:26 +02:00
Ilya Zhuravlev
b6387b4e0f Use utf-8 in formspecs 2015-06-13 19:49:55 +02:00
est31
617a3d426f Make split method static 2015-06-01 17:04:21 +02:00
kwolekr
6c28863c37 Replace instances of std::map<std::string, std::string> with StringMap 
Also, clean up surrounding code style
Replace by-value parameter passing with const refs when possible
Fix post-increment of iterators
 2015-05-31 23:21:19 +10:00
kwolekr
da34a2b33e Replace instances of std::map<std::string, std::string> with StringMap 
Also, clean up surrounding code style
Replace by-value parameter passing with const refs when possible
Fix post-increment of iterators
 2015-05-19 16:10:49 -04:00
Craig Robbins
9527984dbc Move globals from main.cpp to more sane locations 
Move debug streams to log.cpp|h

Move GUI-related globals to clientlauncher

Move g_settings and g_settings_path to settings.cpp|h

Move g_menuclouds to clouds.cpp|h

Move g_profiler to profiler.cpp|h
 2015-04-01 23:04:25 +10:00
kwolekr
ddf96c7a17 Fix some minor details from 6d61375 2015-04-01 00:19:10 -04:00
Aaron Suen
6d61375cc7 Clean scaling pre-filter for formspec/HUD. 2015-04-01 00:01:05 -04:00
Craig Robbins
de6d5ce2cd Disable double-click -> ESC translation for main menu 2015-03-14 23:41:42 +10:00
est31
140245a76f Unescape tooltip texts 
Previously, tooltips didn't unescape escaped formspec texts.
Item descriptions that trigger tooltips like inside inventories or for item_image_button
don't need to get unescaped, as they don't get set using formspec, but from lua.
 2015-03-11 14:33:07 +01:00
Craig Robbins
e74b8da54e Stop formspecs closing with double-click in empty area 
Behaviour on Android remains the same until other alternatives can be devised (if possible)

See #2425 (and the many other -- now closed -- issues reporting this feature as a bug)
 2015-03-09 12:42:25 +10:00
Craig Robbins
ced6d20295 For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives 2015-03-07 22:41:47 +10:00
Loic Blot
0d1eedcccc Replace std::list to std::vector into tile.cpp (m_texture_trash) and move tile.hpp to src/client/ 2015-03-05 11:59:40 +01:00
Loic Blot
5a5854ea9d Move hex.h to util/ 2015-02-21 14:32:35 +01:00
ngosang
dd2bb950be Fix Exit to OS button focus in Pause Menu 2015-02-10 21:23:16 +10:00
ShadowNinja
9e2a9b55e1 Reduce gettext wide/narrow and string/char* conversions 2015-02-05 03:24:22 -05:00
onkrot
0fd1ee0380 Performance fixes. 2015-01-13 23:48:56 +10:00
sapier
de3888ca09 Remove automatic consistent formspec size <-> font size (now has to be done manually) 
Set builtin formspecs to autoscale in order to get consistent formspec look and feel
Uncouple label positioning from font size (May break some formspecs but is required to allow manual font adjustment)
 2015-01-09 18:46:24 +01:00
Kahrl
2ab97a7821 Fix logic of checkbox formspec element validity checking 2015-01-09 16:57:54 +01:00