1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2024-12-14 10:13:13 +02:00
Commit Graph

3866 Commits

Author SHA1 Message Date
grilledham
0eb01d43a5 Merge pull request #1 from grilledham/rewrite
Rewrite
2017-08-12 05:23:53 +01:00
James Gillham
b9b780ffac Merge branch 'master' of https://github.com/Valansch/RedMew 2017-08-12 05:14:29 +01:00
James Gillham
189b32337b preset changes 2017-08-12 04:19:59 +01:00
James Gillham
f0be94bdab bug fixes 2017-08-12 02:12:10 +01:00
James Gillham
cc9e37cbc0 Shape and pattern rewrite 2017-08-12 01:20:08 +01:00
James Gillham
3fddddba8d preset changes 2017-08-11 04:40:40 +01:00
Valansch
3acd4d6a75 updated fish info 2017-08-10 23:15:47 +02:00
Maik Wild
c839f7aa68 Merged dev_neko into develop 2017-08-10 20:08:24 +02:00
Maik Wild
dd79f655f0 Implemented well 2017-08-10 20:04:43 +02:00
NekoBaron
cba455de24 Merge branch 'develop_neko' of https://github.com/Valansch/RedMew into develop_neko
# Conflicts:
#	map_layout.lua
Im CONFUSED BY CONFLICTS
2017-08-09 23:10:46 +01:00
NekoBaron
ac5843c8fd added new terrain type 2017-08-09 23:05:11 +01:00
James Gillham
25f4af16b5 added more presets 2017-08-08 12:34:42 +01:00
James Gillham
b3b1721e22 Added more presets and builders 2017-08-08 09:36:15 +01:00
Valansch
1e73818070 Merge pull request #36 from grilledham/master
Grid Islands
2017-08-06 02:18:54 +02:00
James Gillham
478648b335 commented out grid_islands 2017-08-06 01:14:21 +01:00
James Gillham
ec6a67d261 initial commit 2017-08-06 00:05:53 +01:00
Valansch
cf7df8542b Changed info text 2017-08-05 01:08:59 +02:00
Valansch
95c718e879 added mews island resort 2017-08-04 23:31:52 +02:00
Valansch
8d530d01b2 Merge branch 'master' into develop 2017-08-02 10:18:24 +02:00
Valansch
d87637f2a6 added list_utils.lua 2017-08-02 10:12:57 +02:00
Valansch
6884d80495 mv x_map.lua x_shape.lua
mv x_infinite.lua lattice.lua
rm cross.lua
2017-07-31 00:37:02 +02:00
Valansch
221964a75a Merge branch 'develop_neko' into develop
# Conflicts:
#	map_layout.lua
2017-07-31 00:17:48 +02:00
Valansch
10a9d4b1d0 Merge branch 'master' into develop 2017-07-30 23:46:21 +02:00
Valansch
2131f08b8b changed infinite_mazes.lua maze to use pythagoras for distance not max(x,y) 2017-07-30 23:46:15 +02:00
Valansch
9335e7a9ab fixed /tag crash 2017-07-30 23:08:44 +02:00
Valansch
dcdb487360 changed infinite_mazes.lua resources amount function 2017-07-30 22:17:10 +02:00
Valansch
baeeeefac3 Merge branch 'master' into develop 2017-07-30 21:23:57 +02:00
Valansch
e4873e2797 included infinite_mazes.lua in map_layout.lua
Changed default maze size
Changed default ore amounts
Changed resource amount logic a bit.
2017-07-30 21:23:44 +02:00
Valansch
8d770e3077 added options to config
global.scenario.config.logistic_research_enabled
global.scenario.config.enable_radar
2017-07-30 21:20:54 +02:00
Valansch
862f0db32a imported Hexicubes infinite_mazes.lua as is 2017-07-30 18:06:33 +02:00
Valansch
a558979cef Merge branch 'master' into develop 2017-07-30 18:01:09 +02:00
Valansch
a62674e147 fixed typo in follow.distance() which caused the function to return incorrect results 2017-07-30 18:00:28 +02:00
NekoBaron
66ebfeb93c added 2 map shapes 2017-07-29 11:07:08 +01:00
Valansch
13cf779921 updated regulars 2017-07-27 11:31:58 +02:00
Valansch
a9f794711e added cross made by neko 2017-07-27 11:25:10 +02:00
Valansch
faab85c865 Merge branch 'master' into develop 2017-07-27 11:18:49 +02:00
Valansch
189f7a79b5 removed /follow <target> because it doesnt work yet 2017-07-27 11:18:40 +02:00
Valansch
89fdc94dfc removed /follow selected_player because it doesnt work 2017-07-27 11:10:29 +02:00
Valansch
9fab174d98 implemented /follow.lua 2017-07-25 01:20:59 +02:00
NekoBaron
ce9293d0da neko tries to work out tortoise svn 2017-07-24 20:54:08 +01:00
Valansch
9fe48b4adf Merge pull request #21 from SilentSpike/perlin
Improve Perlin noise implementation
2017-07-24 11:07:52 +02:00
SilentSpike
ddddd79928 Improve Perlin noise implementation
- Optimise the gradient function
- Perform a bitwise AND operation instead of a modulo
- Comment code more clearly
- Store all the functions in the perlin table
2017-07-23 21:35:49 +01:00
Valansch
5114955d1b Merge branch 'master' into develop 2017-07-23 14:52:30 +02:00
Valansch
0ebc066b02 Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2017-07-23 14:52:15 +02:00
Valansch
041aec19f0 Implemented Thread.set_timeout and changed /walkabout behavior 2017-07-23 14:51:20 +02:00
Valansch
e161d8be4a removed shapes.lua 2017-07-23 10:08:06 +02:00
Valansch
ea5b3696b3 Fixed issue that caused linux users not to be able join the server 2017-07-23 10:05:58 +02:00
Valansch
4596e56468 implemented deconstruction control
also fixed on_tick nil pointer
2017-07-23 04:39:02 +02:00
Valansch
bad64b3301 fixed pull null pointer 2017-07-23 04:14:50 +02:00
Valansch
ca7abbebf3 removed fish_market_on_180_ticks() check if the its really tick % 180 == 0 2017-07-23 04:13:41 +02:00