Lynn
2613471da1
Merge pull request #366 from iltar/small-fixes
...
Some small artefact fixes
2018-11-16 22:44:51 +01:00
SimonFlapse
9a64bb3a1b
Fixed Diggy GUIs and more
2018-11-16 22:43:41 +01:00
Lynn
52c818f9dd
Some small artefact fixes
2018-11-16 22:32:16 +01:00
Lynn
2312139494
Merge pull request #362 from iltar/typo-fixes
...
Fixed some typos
2018-11-16 22:28:20 +01:00
SimonFlapse
98d8a1ae6f
Fixed chat mentions for MP
2018-11-16 21:32:38 +01:00
Lynn
21bd95137d
Fixed some typos
2018-11-16 20:20:59 +01:00
Lynn
7437b9b835
Merge pull request #361 from der-dave/develop
...
fixes
2018-11-16 19:39:24 +01:00
der-dave
57955cdd86
fixes
2018-11-16 19:36:29 +01:00
Lynn
bec3fe932a
Merge pull request #359 from der-dave/develop
...
Added basic scoretable GUI and moved comma_value to utils
2018-11-16 19:26:49 +01:00
der-dave
3299280c64
Added basic scoretable GUI and moved comma_value to utils
2018-11-16 17:13:45 +01:00
Rdjrjqouqcu
01a80062ea
Added tendril generation modes, removed old cluster generation method
2018-11-15 21:01:08 -05:00
Rdjrjqouqcu
2f87fce7bb
Merge branch 'develop' into dev_diggy_compound_clusters
2018-11-15 20:10:43 -05:00
Matthew
8d4f6940ea
Add Raiguard's color ( #353 )
2018-11-16 00:59:35 +01:00
Simon
218f50d574
Diggy - Gamebreaking fix ( #352 )
...
* Fix for market being stuck at level 3, 11, 13, 16 and 30
* Reverted assignment of current_level to prevent progressbar to bug out
2018-11-16 00:20:21 +01:00
Jayefuu
a508a967d1
Updated from changes to regulars on Server 1 and Server 2 ( #347 )
2018-11-16 00:00:49 +01:00
Matthew
5523cc50d8
Create player fix ( #350 )
...
* Finish removing admin promote
* Fix errors from merge
2018-11-15 23:58:21 +01:00
Matthew
263b8fb680
Diagonal_ribbon postmortum ( #348 )
2018-11-15 21:01:46 +01:00
Valansch
abab0858e1
Merge pull request #346 from SimonFlapse/Chat-Mentions
...
Notification sound if mentioned by other players
2018-11-15 20:59:51 +01:00
Matthew
f3f0673ff0
Split create_player from control ( #333 )
...
* Split create_player from control
* Remove auto-promote
2018-11-15 20:53:28 +01:00
Simon
f525ba0b06
Made info.gui display on player_created ( #340 )
...
* Made info.gui display on player_created
Removed old welcome message and replaced it with a short reminder on how to change keybinding to enable chat.
* removed whitespace
2018-11-15 20:04:03 +01:00
Valansch
9b102a898d
Merge pull request #328 from Rdjrjqouqcu/dev_diggy_stress_colors
...
Dev diggy stress colors
2018-11-15 20:02:06 +01:00
Simon
6fe10e6e92
Moved report function to cmd_report in report.lua ( #337 )
...
* Moved report function to cmd_report in report.lua
* Tried to fix indentation of printed string
* Moved unjail_player out of custom_commands.lua
Also added colors to two messages from the jail/unjail functions. Feedback appreciated
* Added output line to seperate important messages
2018-11-15 19:12:19 +01:00
Rdjrjqouqcu
57ca881864
allowed color code to work with string values, fixed a small bug with delta_colors parameter
2018-11-15 13:10:41 -05:00
Simon
cd1ce8e221
Redraw stone sent to surface GUI on stone sent ( #339 )
...
* Moved GUI to top left and removed focus
* redrawing stone gui on market update
2018-11-15 19:09:05 +01:00
SimonFlapse
3e6b0c32c4
Unnested if statement
2018-11-15 16:54:16 +01:00
SimonFlapse
f17f4ea312
Added admin and moderator mentions
2018-11-15 16:46:04 +01:00
SimonFlapse
7a0a945da8
Changed trigger to #, preventing discord mentions
2018-11-15 16:26:40 +01:00
SimonFlapse
948ed4ab1f
Minor text changes and _DEBUG options
2018-11-15 16:03:46 +01:00
SimonFlapse
560cf2575c
Added logic for detecting a @mention in chat
2018-11-15 15:06:03 +01:00
Lynn
e68bcea574
Added Raiguard's donator message
2018-11-15 14:03:12 +01:00
Rdjrjqouqcu
201c5e1f45
Merge branch 'develop' into dev_diggy_compound_clusters
2018-11-15 03:22:24 -05:00
Rdjrjqouqcu
861794b09d
modified ScatteredResources to add a compound_cluster mode which allows for different weight and generation settings to apply to different groupings of resources
2018-11-15 02:56:18 -05:00
Rdjrjqouqcu
4c8ed2ea85
Moved changes to a seperate function and converted the method to work generically with different colors
2018-11-14 22:31:44 -05:00
Lynn
ebc5b58320
Merge pull request #318 from SimonFlapse/Stone-Reward-Makeover
...
Isolated market items and buffs
2018-11-14 18:08:53 +01:00
Lynn
771ef0a79c
Merge pull request #335 from SimonFlapse/Diggy-Luadoc
...
Added Luadoc for NightTime.lua
2018-11-14 17:00:36 +01:00
SimonFlapse
f450b73204
Update NightTime.lua
2018-11-14 16:56:20 +01:00
Valansch
0a464f4c6a
Delete .gitignore
2018-11-14 16:54:10 +01:00
Matthew
bb3100e28c
Remove local ref for submit button ( #331 )
2018-11-14 16:41:15 +01:00
SimonFlapse
b1fb490fd6
Update .gitignore
2018-11-14 16:41:04 +01:00
Matthew
cf4b8fc73a
Maltese crossings fixed ( #332 )
2018-11-14 16:40:31 +01:00
Valansch
f8afe9fd72
Update donators.lua
2018-11-14 15:52:11 +01:00
SimonFlapse
b32afe36c2
Updated LuaDoc
2018-11-14 13:45:36 +01:00
SimonFlapse
47617cc5e9
Merge branch 'develop' into Stone-Reward-Makeover
2018-11-14 13:26:31 +01:00
SimonFlapse
2a80a1ff5a
Merge conflict for map_gen.Diggy.Config.lua solved
2018-11-14 13:20:38 +01:00
grilledham
3b9247fc90
more builder functions
2018-11-14 12:16:42 +00:00
SimonFlapse
87b3ac197b
Added Luadoc for NightTime.lua
...
Also added .gitignore for intellij /.idea folder
2018-11-14 13:08:47 +01:00
Lynn
a366d3aaf9
Merge pull request #329 from Rdjrjqouqcu/dev_ore_weights
...
ore weights instead of chances
2018-11-14 09:56:01 +01:00
SimonFlapse
ac5f003322
Added luadoc for new files
2018-11-14 01:41:39 +01:00
SimonFlapse
f0a1c44d3d
Fixed broken level up
2018-11-14 00:23:44 +01:00
grilledham
d4324c857e
Merge pull request #330 from Jayefuu/develop
...
Added maltease_crossings.lua preset.
2018-11-13 22:54:41 +00:00
