1360 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maik Wild	ed58437b9a	Merge branch 'scenario/diggy' of github.com:iltar/RedMew into scenario/diggy	2018-10-13 15:03:04 +02:00
Maik Wild	a445b5719c	fixed double crack warning and implemented kill siwtch	2018-10-13 15:02:18 +02:00
grilledham	29d1235f7f	Merge branch 'scenario/diggy' of https://github.com/iltar/RedMew into scenario/diggy	2018-10-13 13:54:01 +01:00
Lynn	891dcfc56d	Adjusted threshold with 0.01 and message	2018-10-13 14:53:54 +02:00
Lynn	7090f5a904	Revert collapse fix due to corrupted stress levels ... This commit can be reverted again later, but we need a playable version right now :D This reverts commit 5c6f92a5bc.	2018-10-13 14:46:02 +02:00
Maik Wild	5c6f92a5bc	optimized collapse: collapses now happen every 80 ticks	2018-10-13 14:24:51 +02:00
Lynn	ba739a8563	Merge branch 'develop' into scenario/diggy	2018-10-13 00:26:28 +02:00
Lynn	4148e4c950	Some minor fixes and tweaks to go live	2018-10-13 00:21:20 +02:00
Lynn	0d4ed60d5b	Fixed noise used map desync and refresh GUI	2018-10-12 19:37:16 +02:00
Lynn	029a2b38fd	Added functional GUI for stone sent	2018-10-11 22:17:25 +02:00
Lynn	440327b882	Minor perf update	2018-10-11 20:13:42 +02:00
Lynn	b165acdfcc	Fixed some more desyncs and math/table references	2018-10-11 19:43:04 +02:00
Lynn	4311a35c10	Fixed desync issues due to global state	2018-10-10 23:05:48 +02:00
Lynn	ad24aeeef2	Added buffs from the market and rebalanced the market prices/items	2018-10-10 20:49:49 +02:00
grilledham	59df4cefa0	updated regs	2018-10-09 15:32:29 +01:00
Maik Wild	5d5c22c109	fixed cave collapse causing stress corruption	2018-10-09 15:50:42 +02:00
Valansch	8e28e40143	Merge pull request #226 from Valansch/sqrt_cleansing ... Removed several math.sqrt in codebase	2018-10-09 11:44:39 +02:00
Maik Wild	2e904925fb	_Merge branch 'scenario/diggy' of github.com:iltar/RedMew into scenario/diggy	2018-10-09 01:26:29 +02:00
Maik Wild	2f37961075	optimized quadrant and stressmap	2018-10-09 01:26:24 +02:00
Lynn	764a0fab99	Show a popup on the first mine explaining cave-ins	2018-10-08 22:57:29 +02:00
Lynn	93794d1591	Disallow deconstruction requests for support beams	2018-10-08 22:13:45 +02:00
Lynn	8a0838cddb	Merge branch 'develop' into scenario/diggy	2018-10-08 21:27:15 +02:00
grilledham	3f77f8a737	Merge pull request #228 from iltar/only-add-market-item-when-enabled ... Only add the market item when market is enabled	2018-10-08 20:25:24 +01:00
Lynn	d764b33644	Merge branch 'develop' into scenario/diggy	2018-10-08 21:22:25 +02:00
Lynn	9ab7679171	Only add the market item when market is enabled	2018-10-08 21:17:13 +02:00
Lynn	4879639272	Disable the market and coin collection	2018-10-08 21:14:58 +02:00
Lynn	82d4025079	Don't automatically open a room twice after collapse	2018-10-08 20:40:32 +02:00
Lynn	788b473894	Merge branch 'scenario/diggy' of github.com:iltar/RedMew into scenario/diggy	2018-10-08 17:43:16 +02:00
grilledham	1632f81d13	added /popup-player cmd + hooks to show popus programmatically.	2018-10-07 23:22:03 +01:00
Maik Wild	3fa5fa6504	fixed collapse delay	2018-10-07 21:02:30 +02:00
Maik Wild	03501204ae	removed water strengh	2018-10-07 20:58:08 +02:00
Maik Wild	8623338c0b	fixed merge conflicts	2018-10-07 20:56:39 +02:00
Maik Wild	11d4bf5130	added pillars when rooms open	2018-10-07 20:51:07 +02:00
Lynn	2eb258e6c5	Minor water spawn tweak	2018-10-07 19:59:37 +02:00
Lynn	4d0a3b9e7f	Tweaked stress values and fixed a bug regarding tile placement	2018-10-07 19:40:30 +02:00
Lynn	36168771dd	Added easy on_init feature hook	2018-10-07 17:37:29 +02:00
Lynn	b799da20e3	Added map extra info for each scenario	2018-10-07 17:05:59 +02:00
Lynn	c6d975441e	Merge branch 'develop' into scenario/diggy	2018-10-07 17:01:34 +02:00
grilledham	84e1d96fcc	map info text boxes now word wrap	2018-10-07 15:49:12 +01:00
Lynn	0f7eb4a351	Simplified feature registration	2018-10-07 14:39:18 +02:00
Lynn	8dbf4e0920	grilledham+valansch changes without initialize	2018-10-07 13:50:25 +02:00
grilledham	340c8a0673	added double beach	2018-10-06 17:07:50 +01:00
Lynn	257313974c	Added a stone market	2018-10-06 15:53:28 +02:00
grilledham	044adcf0ed	updates to beach map	2018-10-06 13:46:32 +01:00
grilledham	3b76740adc	map double beach	2018-10-06 13:46:18 +01:00
grilledham	075f728e96	updated regs	2018-10-06 13:46:06 +01:00
Lynn	f17b1362e7	Removed hacks to prevent stone from dropping	2018-10-06 12:40:03 +02:00
Lynn	b1d4802c82	Tweaked spawning of rooms + resources + mining efficiency	2018-10-06 00:00:00 +02:00
Maik Wild	5e25efeee5	required math in all files using sin/cos	2018-10-04 18:01:42 +02:00
Maik Wild	4a2e258ff3	moved math functions into math.lua	2018-10-04 17:56:49 +02:00