MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,666 Commits
1 Branch
0 Tags
69 MiB
Commit Graph

4666 Commits (9671dcf094c86c5d625af01250b9b0d651dfad85)

Author SHA1 Message Date
OttoLidenbrock 9671dcf094 rename conf to multicraft.conf 2015-05-23 20:36:48 +10:00
OttoLidenbrock b160f07c0c Only allow multicraft game as game 2015-05-23 13:15:05 +10:00
OttoLidenbrock 631b7b60b0 Fix android build 2015-05-23 12:53:16 +10:00
OttoLidenbrock a755dd5a4c Change where games looks for mods from mods/ to files/ 2015-05-19 12:17:41 +10:00
OttoLidenbrock d711b8ae92 Fix accidental removal of credits 2015-05-17 01:05:23 +10:00
OttoLidenbrock 1d3362ff9e Remove version info top-left for main menu 2015-05-17 00:57:50 +10:00
OttoLidenbrock 16d1e7d8bc Remove "?" button from main menu 2015-05-17 00:37:38 +10:00
OttoLidenbrock 6dbf127a33 Fix PC build bug 2015-05-17 00:32:00 +10:00
OttoLidenbrock 45c0ebe585 Fix swimming bug 2015-05-17 00:30:22 +10:00
OttoLidenbrock 0f48362a95 Change inventory button size 2015-05-16 23:25:16 +10:00
Maksim Gamarnik e7d2a78585 Merge MultiCraft_game 
and change gitignore
 2015-05-15 16:43:28 +03:00
Maksim Gamarnik d3adbfab75 Mailmap update and remove old doc 2015-05-15 16:17:39 +03:00
Maksim Gamarnik d384442e74 Default Setting and Textures 
MultiCraft gamecontrol textures
Optimal settings
 2015-05-15 16:05:49 +03:00
OttoLidenbrock e1c0f2c996 Fix previous Makefile commit (it didn't work) 2015-05-15 21:54:05 +10:00
Maksim Gamarnik e5dc9a55b3 New SQLite on Android build 2015-05-15 14:47:40 +03:00
OttoLidenbrock 7c0da7369e Only include files.zip in APK 2015-05-15 21:45:05 +10:00
OttoLidenbrock f07521fc1b add ver.txt 2015-05-15 21:16:20 +10:00
OttoLidenbrock 9f4ecd7cb4 Remove usage of pushd/popd from android makefile so Debian can work (assuming zip is installed) 2015-05-15 20:49:54 +10:00
OttoLidenbrock 03c0287bfb Fix builtin/init.lua 2015-05-15 20:15:58 +10:00
OttoLidenbrock 83a4fc0138 Update English in strings.xml 2015-05-15 19:06:20 +10:00
OttoLidenbrock fd755232d9 Make sure there is always a delay after digging before a node can be placed 2015-05-13 17:41:46 +10:00
Megaf af2b8ed17d Merge resolution 
Replaced libjpeg dependency on apt-get, it should be libjpeg-dev instead of libjpeg8-dev.

On Debian 8...
```
Package libjpeg8-dev is not available, but is referred to by another package.
This may mean that the package is missing, has been obsoleted, or
is only available from another source
However the following packages replace it:
  libjpeg62-turbo-dev
```
Using libjpeg-dev should make the OS select the most appropriate lib to be installed.
These are the packages available on Debian 8.
```
libjpeg-dev - Development files for the JPEG library [dummy package]
libjpeg-turbo-progs - Programs for manipulating JPEG files
libjpeg-turbo-progs-dbg - Programs for manipulating JPEG files (debugging symbols)
libjpeg62-turbo - libjpeg-turbo JPEG runtime library
libjpeg62-turbo-dbg - Debugging symbols for the libjpeg-turbo JPEG library
libjpeg62-turbo-dev - Development files for the libjpeg-turbo JPEG library
libturbojpeg1 - TurboJPEG runtime library - SIMD optimized
libturbojpeg1-dbg - TurboJPEG runtime library - SIMD optimized (debugging symbols)
libturbojpeg1-dev - Development files for the TurboJPEG library

```
This seems to work on all current Debian versions, Wheezy, Jessie and Sid.
https://packages.debian.org/wheezy/libjpeg-dev
https://packages.debian.org/jessie/libjpeg-dev
https://packages.debian.org/stretch/libjpeg-dev

Im not sure if Ubuntu has this dummy package.

http://packages.ubuntu.com/search?keywords=libjpeg-dev

Perhaps this should be further discussed.

libjpeg8-dev -> libjpeg-dev

Conflicts:
	README.txt
 2015-05-13 17:04:24 +10:00
Craig Robbins f10151a70c Change lower limit of display_gamma to 1.0 (linear light) 
Now matches function comment
 2015-05-13 17:01:56 +10:00
kwolekr 19f7ff2ac8 Schematics: Add per-node force placement option 2015-05-13 17:01:54 +10:00
kwolekr 2f421fe45b Fix typo in WieldMesh::setItem() 2015-05-13 17:01:52 +10:00
kwolekr 60baf537a3 Ensure that Map::findNodesWithMetadata() reports nodes strictly within the node-granular area 2015-05-13 17:01:49 +10:00
kwolekr 702ef59e07 Replace Wieldmesh::setItem assertion that could be triggered by the server with an error 2015-05-13 17:01:47 +10:00
est31 a1649ec2ab Fix release build warning 2015-05-13 17:01:42 +10:00
kwolekr 692fdd26c0 Fix compilation for non-client builds, and fix signed comparison warning 2015-05-13 17:01:35 +10:00
kwolekr e0fde4ed5f Tests: Add schematic unittests 
Improve schematic file-saving interface
Add ability to create temporary test files
 2015-05-13 17:01:33 +10:00
est31 191aeca86b Gracefully handle PacketErrors 2015-05-13 17:01:30 +10:00
kwolekr 97636d54b6 Fix missing Y component assignment in check_v3f 2015-05-13 17:01:28 +10:00
paramat 9e52d0bb6d Conf.example: Update recommended maximum cloud radius to 26 2015-05-13 17:01:24 +10:00
Kevin Ott 330c1cf828 Remove duplicate lua_getfield() in c_converter.cpp 
Fixes #2678
 2015-05-13 17:01:22 +10:00
kwolekr 4d5237fc9f Schematics: Add indent-with-space option for schematic Lua table serialization 2015-05-13 17:01:19 +10:00
kwolekr ab896a72b3 NodeResolver: Remove NodeResolveMethod 
This simplifies NodeResolver logic and makes some interfaces cleaner.
 2015-05-13 17:01:16 +10:00
ShadowNinja eb0b917858 Fix connection speed unit names 2015-05-13 17:01:13 +10:00
ShadowNinja e701b35926 Fix error messages for type-checking Lua reading functions 2015-05-13 17:01:10 +10:00
ShadowNinja dc3227dc9f Improve Redis error messages 2015-05-13 17:01:08 +10:00
kwolekr 276bf01a20 Fix build on Debian broken by b45df9d (missing include, somehow?) 2015-05-13 17:01:05 +10:00
kwolekr 2d8c101372 NodeDefManager: Improve const-correctness of interfaces 
- Add ability to explicitly reset NodeResolve state (useful for unittesting)
- Remove non-essential NodeResolve methods modifying state from INodeDefManager
- Add const qualifier to NodeDefManager and ContentFeatures serialize
 2015-05-13 17:01:02 +10:00
kwolekr bd168fd717 Add core.find_nodes_with_meta() script API 2015-05-13 17:00:59 +10:00
kwolekr 3c1ae54646 Tests: Add NodeResolver unittests 
Minor misc. NodeResolver cleanups
Prefix faux content type constants for testing with t_ to avoid
confusion or name collisions
 2015-05-13 17:00:53 +10:00
ShadowNinja ab9e4ec586 Make Git version detection use VERSION_STRING instead of tags 
This fixes the problem where 0.4.12-dev versions were erroneously shown as
0.4.11-dev because the tag was added on a separate branch.  It also fixes a
similar issue when builders didn't fetch new tags when updating.

This also removes the number-of-commits-since-tag field, since it's
incompatible with this.  Said field doesn't seem to be useful anyway if you
have the commit hash.
 2015-05-13 17:00:50 +10:00
ShadowNinja ef6b034e72 Fix GCC compiler warning 2015-05-13 17:00:47 +10:00
Jay Arndt 9093acabbe Stop NetworkPacket methods from producing bloated packets 2015-05-13 17:00:45 +10:00
Mahmut Elmas d63e3806f0 Update Turkish Language 
Added some new translations
Fixed some overlenght lines
 2015-05-13 17:00:42 +10:00
est31 440a4286eb Cache enable_3d_clouds flag 
Small improvement on clouds rendering performance
 2015-05-13 17:00:40 +10:00
paramat 7bb003acca Clouds: Make cloud area radius settable in .conf 2015-05-13 17:00:37 +10:00
Maksim Gamarnik 0598e2169e New MainMenu, update WversionManager, Makefile change 
New MainMenu by 4aiman
WVersionManager - 1.3
Makefile - rename output apk
 2015-05-12 10:59:17 +03:00