SimonFlapse
80d56c2e4a
Merge remote-tracking branch 'origin/hydra-scaling' into Quadrants
2019-03-02 15:18:00 +01:00
SimonFlapse
92841bc13c
Hail hydra added, more help text
2019-03-02 15:17:19 +01:00
grilledham
5f9ceda8e9
fix localised string to not exceed limit
2019-03-02 14:16:54 +00:00
SimonFlapse
5b16c18a2b
More text and removed game.print
2019-03-02 14:21:52 +01:00
SimonFlapse
1f98b4457e
Fix ends -> end
2019-03-02 14:18:19 +01:00
SimonFlapse
0a3f45bcc2
Merge remote-tracking branch 'upstream/develop' into Quadrants
2019-03-02 14:15:51 +01:00
SimonFlapse
198fc7fcac
Update for 0.17.4, Added Compilatron
2019-03-02 14:15:25 +01:00
Matthew
3e70ef01cb
Merge pull request #846 from SimonFlapse/develop-upstream
...
New sprite for info gui
2019-03-02 05:04:00 -05:00
SimonFlapse
58353e9c30
New sprite for info gui
2019-03-02 10:46:35 +01:00
Matthew
0b3bdec8e2
Merge pull request #839 from SimonFlapse/rich-text-gui
...
New GUI to assist in using the new rich text feature
2019-03-02 04:14:55 -05:00
Matthew
f5bd27400e
Merge pull request #834 from plague006/pause_on_dump
...
Pause game when env_dump is set
2019-03-02 03:56:38 -05:00
Matthew
2417191792
Merge pull request #844 from plague006/qol/alt_mode_on_join
...
Add set_alt_on_create
2019-03-02 03:48:41 -05:00
plague006
060ee3afb7
Add set_alt_on_create
2019-03-02 02:12:12 -05:00
plague006
58e231af5c
Isolate rusky_pvp strings
2019-03-01 23:48:40 -05:00
Matthew
6a8d07cc8a
Merge pull request #836 from plague006/luacheckrc
...
Update luacheckrc to 0.17
2019-03-01 21:02:44 -05:00
plague006
23f955d1c3
Add exception for commands.add_command overwrite in command.lua
2019-03-01 20:46:32 -05:00
Matthew
c9d069aaa6
Merge pull request #843 from plague006/fix/whois
...
Remove quickbar check from whois
2019-03-01 20:41:10 -05:00
plague006
01946f7255
Remove quickbar check
2019-03-01 19:31:54 -05:00
plague006
2e31964195
Restore global tables
2019-03-01 19:30:43 -05:00
Matthew
6d1ee9e46b
Merge pull request #787 from plague006/rock_solid
...
[Map] Rock solid
2019-03-01 17:59:22 -05:00
SimonFlapse
f0425a1e32
x2
2019-03-01 22:19:56 +01:00
SimonFlapse
d4f6a9c40c
Fixed linting errors
2019-03-01 22:08:58 +01:00
SimonFlapse
da1d4ce2d9
Merge remote-tracking branch 'origin/hydra-scaling' into hydra-scaling
...
# Conflicts:
# config.lua
# map_gen/shared/hail_hydra.lua
2019-03-01 21:27:30 +01:00
SimonFlapse
3ec7b413a9
Added behemoth-worm-turret
2019-03-01 21:22:15 +01:00
SimonFlapse
a989c87c03
Added locking chance
2019-03-01 21:14:17 +01:00
SimonFlapse
e57d339467
Updated config to show -1 for unused
2019-03-01 21:14:17 +01:00
SimonFlapse
1fe198843d
Backwards compatibility
...
Added conversion from old config to new
2019-03-01 21:14:17 +01:00
SimonFlapse
49babc20ff
Removed debug game.prints
2019-03-01 21:14:16 +01:00
SimonFlapse
342e5871d8
Added improved hydra scaling
...
Added min, max and trigger to config
Added online_player_scale to config
Made hail hydra chances a variable of: - number of online players (toggleable)
- evolution based on a custom formula that has a slow scaling until evolution 0.8
2019-03-01 21:14:16 +01:00
Matthew
24f0c821fc
Merge pull request #842 from plague006/fix/poll_help
...
Fix help text for poll
2019-03-01 15:03:27 -05:00
plague006
b3a176f4f8
Fix help text for poll
2019-03-01 14:36:43 -05:00
Matthew Heguy
096f72a849
Switch to builder function, turn cliffs down.
2019-03-01 14:18:41 -05:00
plague006
d58e2a7606
Add solid_rock
2019-03-01 14:18:41 -05:00
Lynn
75e6d6abf4
Merge pull request #841 from linaori/fix/toast-color
...
Fix the toast color display
2019-03-01 20:08:43 +01:00
Lynn
6d32ef7f74
Fix the toast color display
2019-03-01 19:58:44 +01:00
Matthew
9595d31665
Merge pull request #837 from SimonFlapse/score-rich-text
...
Score GUI - Converted to rich text
2019-03-01 13:31:18 -05:00
SimonFlapse
4f9d004062
Added rich-text-gui
2019-03-01 14:54:36 +01:00
SimonFlapse
e7759b0d37
Converted to rich text
...
- Reducing the footprint
2019-03-01 10:18:39 +01:00
Matthew Heguy
d4887834b3
Update to 0.17
2019-02-28 18:39:18 -05:00
Matthew
30809c077a
Merge pull request #806 from plague006/feature/data_manipulation
...
Add scenario_data_manipulation
2019-02-28 17:36:40 -05:00
Matthew
6e5b1291a2
Merge pull request #833 from plague006/remove/all-tech
...
Remove all-tech command
2019-02-28 17:21:24 -05:00
Matthew
dd9048ed26
Merge pull request #835 from plague006/fix/meltdown
...
Don't have meltdown on for all maps
2019-02-28 17:13:56 -05:00
Matthew
e024c436ba
Merge pull request #812 from plague006/17/regenerate_decorative
...
[17][Enhancement] Drop unnecessary tables.
2019-02-28 17:08:13 -05:00
Matthew Heguy
15fee1a5ec
Don't put boolean in a table
2019-02-28 16:32:20 -05:00
Matthew
ff0476bd2b
Merge pull request #811 from plague006/17/raise_destroy
...
[17][Enhancement] Raise events where appropriate.
2019-02-28 16:27:40 -05:00
Matthew
7896d98fbe
Merge pull request #809 from plague006/17/cheat_items
...
[17][Enhancement] Add cheat items to cheats
2019-02-28 16:14:45 -05:00
Matthew Heguy
5a52780b93
Pause game when env_dump is set
2019-02-28 15:05:34 -05:00
Matthew Heguy
3410fa2dd0
Remove all-tech command
2019-02-28 14:48:08 -05:00
Matthew
01d53fdd25
Merge pull request #805 from plague006/fix/admin_commands
...
Take offline and invalid players for probation add/remove as well as regular-remove
2019-02-28 12:41:46 -05:00
Matthew
77df5209fd
Merge pull request #804 from SimonFlapse/fix_performance_scale
...
Improved performance_scale
2019-02-28 12:37:12 -05:00
