Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,025 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

7025 Commits (65f7ca383e2456aa22a816a93a7527635d229fa1)

Author SHA1 Message Date
Elias Fleckenstein 4b327bcf99 Minor fix to prevent writing the damage reason approval field into MCL damage reason and calling passive damage handlers on dead players 2021-05-05 14:41:23 +02:00
Elias Fleckenstein 35a2a2b912 Workaround to prevent double death messages 2021-05-05 13:27:30 +02:00
Elias Fleckenstein f53ff8418f mcl_damage: HP check guard in non-modifier on_hpchange callback and usage of raw tostring for deactivated objects for death messages 2021-05-05 13:24:23 +02:00
Elias Fleckenstein 1bd647507b Add proper end crystal death message 2021-05-05 13:20:06 +02:00
Elias Fleckenstein f5b2a5f5c1 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-05 09:25:20 +02:00
Elias Fleckenstein be0cf5788d mcl_util.deal_damage: Only deal damage to players / mobs that are not already dead 2021-05-05 09:24:51 +02:00
Elias Fleckenstein 52ebc3343f Merge pull request 'Add Real Maps' (#1700) from real_maps into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1700
 2021-05-05 06:21:36 +00:00
Elias Fleckenstein a9817fea4b Merge branch 'master' into real_maps 2021-05-05 08:21:01 +02:00
Elias Fleckenstein 70db02306f Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-05 08:19:59 +02:00
Elias Fleckenstein 0ff4780066 Merge pull request 'Make compasses and clocks work in itemframes and when dropped' (#1711) from compass_and_clock into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1711
 2021-05-05 06:19:21 +00:00
Elias Fleckenstein f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
Elias Fleckenstein 75d9450002 Make compasses point upwards when dropped as an item 2021-05-04 10:24:08 +02:00
Elias Fleckenstein cb2bc52cbb Merge branch 'master' into compass_and_clock 2021-05-04 10:10:24 +02:00
Elias Fleckenstein 0d29688b13 Fix creeper explosion values 2021-05-04 09:54:18 +02:00
Elias Fleckenstein 78ce97aaf6 Fix creeper explosion values 2021-05-04 09:53:28 +02:00
Elias Fleckenstein 3b3d67a99c Make clocks work when dropped 2021-05-04 09:16:42 +02:00
Elias Fleckenstein 7513bc600a Merge branch 'master' into compass_and_clock 2021-05-04 09:04:50 +02:00
Elias Fleckenstein f96258ca5c Fix mob heads not showing their texture when worn as head armor 2021-05-04 09:01:53 +02:00
Elias Fleckenstein 33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Elias Fleckenstein 2c5eca3999 Make clocks work in itemframes 2021-05-04 08:49:21 +02:00
AFCMS f0ec64528c Merge branch 'master' into luacheck-script 2021-05-03 23:24:55 +02:00
AFCMS cbb014ed38 basic working script 2021-05-03 22:11:49 +02:00
Elias Fleckenstein 74e3c6555d Globalize mcl_clock API 2021-05-03 13:43:46 +02:00
Elias Fleckenstein ecc2010fe5 Make compasses work in itemframes 2021-05-03 11:22:47 +02:00
Elias Fleckenstein 5bb1657bd8 Add moving marker for the player 2021-05-03 10:46:59 +02:00
Elias Fleckenstein f063d14caf Add craft predict for map copying 2021-05-02 19:30:27 +02:00
Elias Fleckenstein 02da1abcf9 Merge branch 'master' into real_maps 2021-05-02 19:24:52 +02:00
Elias Fleckenstein 0d287001f7 Fix tt snippet to update wield filled maps as well 2021-05-02 19:18:30 +02:00
Benjamin Schötz f528b31d48 Added french, spanish, russian translation for killerbunny-nametag 2021-05-02 18:02:51 +02:00
Benjamin Schötz a77f99a1ec Sets killerbunny-label in a translateable way 2021-05-02 18:02:35 +02:00
AFCMS 45965c0799 Merge branch 'master' into luacheck-script 2021-05-02 17:57:05 +02:00
Elias Fleckenstein 1eaf662833 Add updated tga_encoder 2021-05-02 17:47:46 +02:00
Elias Fleckenstein 63d4e57a8d Correct typo (ninetest -> minetest) 2021-05-02 17:19:11 +02:00
Elias Fleckenstein ecea8f1662 Prevent placing of wielded maps 2021-05-02 17:14:57 +02:00
Elias Fleckenstein ef08977112 Copy stack before accessing it in add_item 2021-05-02 17:11:33 +02:00
Elias Fleckenstein 1f87874870 Make it look like the player is holding the map in their hand 2021-05-02 17:03:39 +02:00
Elias Fleckenstein 9a3ae17564 Make maps show their image when in itemframes 2021-05-02 16:04:48 +02:00
Elias Fleckenstein bd74dbe321 Revert "Use PNG instead of TGA" 
This reverts commit ca9cd8cbe0.
The TGA was faster and produced smaller files.
 2021-05-02 13:03:18 +02:00
Elias Fleckenstein ca9cd8cbe0 Use PNG instead of TGA 2021-05-02 12:55:04 +02:00
Elias Fleckenstein d9a670dcb8 Show empty map in creative inv, but don't show filled map there 2021-05-02 12:24:22 +02:00
Elias Fleckenstein f22b3fd457 Implement copying maps 2021-05-02 12:23:29 +02:00
Elias Fleckenstein 1079ab74d4 Stack filled maps that have the same metadata 2021-05-02 11:42:16 +02:00
Code-Sploit 8c2f5bc3d2 Fix #1706 2021-05-02 08:31:26 +00:00
Code-Sploit 445af4e4c9 Remove unnessacary comments in mcl_smithing_table/init.lua 2021-05-02 08:11:11 +00:00
NO11 f430ebcc8d Add #924, cactus breaks minecart 2021-05-01 17:29:08 +00:00
Elias Fleckenstein 2228b30658 Add API to create filled map 2021-05-01 17:36:51 +02:00
Elias Fleckenstein e11185638f Remove obsolete 'import sys' from python script 2021-05-01 17:24:07 +02:00
Elias Fleckenstein 1ed6aeca5e Remove map_background.png 2021-05-01 17:22:48 +02:00
Elias Fleckenstein 5d3e74c844 Remove useless tga_encoder files 2021-05-01 17:20:23 +02:00
Elias Fleckenstein c6e80b5882 Add Real Maps 2021-05-01 16:52:16 +02:00