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

859 Commits

Author SHA1 Message Date
theorangeangle
c1359be75c
Merge pull request #988 from SimonFlapse/diggy_cutscene
[Diggy] Cutscene Fixes
2019-12-03 13:20:30 -06:00
SimonFlapse
52f0fe2e5c Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-26 16:26:19 +02:00
Simon
9a2e5e554f
Hilbert Water Trap + Fixes for Hilbert Sand Trap (#998)
* Initial commit of hilbert water trap

* Refactoring in features/market.lua

* Fixed ribbon for both Hilberts

* Added remove decoratives function to the builder

* Refactoring the new builder functions

* Simplifying create_standard_market

* remove_map_gen_decoratives_by_filter renamed

* Fixed documentation links having _edit in them

* Formating documents
2019-10-20 16:23:34 +02:00
SimonFlapse
d812c71fe5 Merge remote-tracking branch 'upstream/develop' into diggy_cutscene 2019-10-18 23:41:21 +02:00
SimonFlapse
7ca4e61da9 New Description Generator GUI
Changes to the info gui to better communicate the max text width to support the server description in the server browser
2019-10-18 23:20:55 +02:00
SimonFlapse
268959331e Updated rich text generation gui 2019-10-18 14:49:33 +02:00
SimonFlapse
839019514b Result from first alpha run 2019-10-11 20:24:28 +02:00
SimonFlapse
51dfa636fc Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-11 10:17:19 +02:00
Simon
ca29a047de
[Snake] Added on_snake_player_died event (#995)
* Added on_snake_player_died event and a snake_demo map

* Added score to the event

* Fixed entities being destructible

Changed comment

* Fixed cases where controller type wasn't god

* Changed players controller to spectator when their snake dies

* Changed start_game call away from remote.call

* Needed new call to show the snake button

* Changed start_game to use Snake.control

* removed snake event from demo map

* Update map_gen/maps/snake_demo.lua
2019-10-11 00:28:40 +02:00
SimonFlapse
f0e147f39e Added markets and more 2019-10-09 02:02:48 +02:00
SimonFlapse
5182e21607 Initial commit of Space Race
Playable version 0.1
2019-10-07 22:44:17 +02:00
SimonFlapse
fa4442d644 "Fixed" LuaPlayer being invalid messages 2019-10-04 20:59:32 +02:00
SimonFlapse
c3f09a9d3c Fit_to_edge now accounts for display_scale 2019-07-07 20:51:25 +02:00
SimonFlapse
2b9ca4013a Merge remote-tracking branch 'upstream/develop' into diggy_cutscene 2019-07-07 20:20:05 +02:00
grilledham
dd28df7502 update docs 2019-07-03 19:36:44 +01:00
grilledham
f8ceeed9bb use n_th_tick instead of set_timeout 2019-07-03 19:33:04 +01:00
grilledham
dabadd8ac2 teleport player to board surface 2019-07-03 19:27:39 +01:00
grilledham
e33b77e1bb fix travis errors 2019-07-03 16:52:26 +01:00
grilledham
c2917c24cf error on missing surface 2019-07-03 15:54:19 +01:00
grilledham
ba05138427 fix typos 2019-07-03 15:54:06 +01:00
grilledham
9b46cebbb8 localisation 2019-07-03 15:50:19 +01:00
grilledham
8abffb30d3 updates 2019-07-03 15:45:34 +01:00
grilledham
3cfbecca17 snake 2019-07-03 12:35:38 +01:00
grilledham
6f944fc3ec apocalypse fix 2019-06-26 13:19:08 +01:00
SimonFlapse
d07ea062fe Merge remote-tracking branch 'origin/diggy_cutscene' into diggy_cutscene 2019-06-22 16:53:26 +02:00
SimonFlapse
40131895f0 Added ability to fit to edges based on the top left corner 2019-06-22 16:53:18 +02:00
Simon
890cdf12e7
Merge branch 'develop' into diggy_cutscene 2019-06-22 15:11:56 +02:00
grilledham
ae27399be2 'player' -> 'character' 2019-06-21 21:45:23 +01:00
grilledham
2ae7933a74
Merge pull request #955 from grilledham/highlight_top_buttons
Highlight top buttons
2019-06-21 20:29:11 +01:00
grilledham
0540e69c7b localisation 2019-06-21 17:01:34 +01:00
grilledham
3e03560f7b custom join / leave messages + created by + edited by 2019-06-21 16:11:14 +01:00
grilledham
9f08bf6f88 refactor -> close_main_frame 2019-06-21 10:56:37 +01:00
grilledham
36b4f81606 fix desync 2019-06-20 17:43:51 +01:00
grilledham
fa2a62337a highlight top buttons 2019-06-20 12:39:18 +01:00
grilledham
10711149b8 more blueprint helper localisation 2019-06-20 11:29:00 +01:00
grilledham
5ef00fe40f blueprint helper updates 2019-06-20 11:25:24 +01:00
grilledham
ae3f84667b reduce turret activation delay with tech 2019-06-19 20:48:05 +01:00
grilledham
d2e9b6f7bd moved locales into common 2019-06-19 18:41:32 +01:00
grilledham
059ee77963 fix travis issues 2019-06-19 18:37:35 +01:00
grilledham
67961322c1 don't shadow variable 2019-06-19 18:20:04 +01:00
grilledham
e579783899 kill inactive turrets with 0 health 2019-06-19 18:01:22 +01:00
grilledham
b723ccf36a refund not inserted items 2019-06-19 17:58:47 +01:00
grilledham
b768b87546 autofill 2019-06-19 17:36:18 +01:00
grilledham
c7f63dcc4f turret active delay 2019-06-19 14:28:40 +01:00
grilledham
a0a9ed4705 filter events 2019-06-18 21:35:25 +01:00
grilledham
bf5c4ffdd4 use next to check if table is empty + fast_remove -> remove 2019-06-18 12:17:24 +01:00
SimonFlapse
f811da5b30 Fixed inverted height and width
Polygons are not being placed correctly
2019-06-14 23:19:21 +02:00
grilledham
29e6954658
Merge pull request #943 from Starholme/Feature#608CorpseCleanup
First shot at #608 Corpse Cleanup
2019-06-14 18:56:25 +01:00
SimonFlapse
71044d6ade Refactoring + Rendering module from grilledham 2019-06-14 19:24:11 +02:00
grilledham
d1ba1660df rename biter_corpse_util -> biter_corpse_remover 2019-06-13 22:28:14 +01:00
grilledham
4607706149 grill's refactoring 2019-06-13 22:25:42 +01:00
Russel Delainey
d69e7e9219 Use event tick instead of game.tick 2019-06-12 11:24:00 -06:00
Russel Delainey
f5ca64d671 Make travis happy? Please travis? 2019-06-10 12:47:43 -06:00
SimonFlapse
150df010d7 Forgot to invert colors 2019-06-10 19:10:34 +02:00
SimonFlapse
36f51bc2e5 Fixed rendering background
Minor tweaks to cutscene in diggy
2019-06-10 19:10:02 +02:00
SimonFlapse
71d850d04f Reverting upvalues not working in MP 2019-06-10 16:53:52 +02:00
SimonFlapse
6978cc0330 Fixed replay not working in MP 2019-06-10 16:32:13 +02:00
SimonFlapse
92c61779ed Removed unused applied styles to skip button 2019-06-10 16:14:18 +02:00
SimonFlapse
f9fb950639 Added skip button
Clean up in radio gui
2019-06-10 16:11:12 +02:00
SimonFlapse
860ead05c0 Added localisation, Debug.Print and Cleanup
Also changed some parameters to the draw_text with background so that 'g' and similar letters are not outside the background
2019-06-10 15:15:14 +02:00
Russel Delainey
0aa715fcce Update config name to better match purpose 2019-06-09 22:36:53 -06:00
Russel Delainey
1573217813 Rewrite to avoid surface lookups 2019-06-09 22:34:13 -06:00
SimonFlapse
8d20eeff9d Preventing players from replaying when a cutscene from the cutscene module is already playing 2019-06-10 01:31:26 +02:00
SimonFlapse
1569867f8f Made soundpaths selectable 2019-06-10 01:14:23 +02:00
SimonFlapse
202e4c37b5 Fixed background parameters
Also added a new waypoint to Diggy with floating text
2019-06-10 01:04:14 +02:00
SimonFlapse
85fc38fd3a Minor changes to player_create
Allowing cutscenes to run before welcoming players via info gui and console messages.

Also includes a search limit for walls and rock to prevent the cutscene from running too far away from {0, 0}
2019-06-09 23:59:16 +02:00
SimonFlapse
003cd6c801 Added a radio to browse sounds 2019-06-09 16:39:21 +02:00
Lynn
aa4f98c22b Added retailer translations 2019-06-09 15:04:40 +02:00
SimonFlapse
f04b13f63a Added parameter passthrough to rendering module 2019-06-09 13:31:44 +02:00
SimonFlapse
de77c9601a Fixed players loosing control 2019-06-09 12:26:51 +02:00
SimonFlapse
3ca8e3f127 Cutscene Controller
Implemented for Diggy
2019-06-09 00:55:25 +02:00
grilledham
f7918088ab tooltip fix 2019-06-07 10:27:10 +01:00
grilledham
68c9f0ccf2 restored get_all_death_causes_by_player 2019-06-07 10:25:24 +01:00
Russel Delainey
4538af4152 Invert condition 2019-06-04 15:30:14 -06:00
Russel Delainey
c501c9ca85 Don't run cleanup on every death. 2019-06-04 15:28:08 -06:00
Russel Delainey
c07b5a39e0 Extracted filter to local 2019-06-04 14:50:09 -06:00
Russel Delainey
70fc151a3a Extract corpse list length into local var 2019-06-04 14:41:19 -06:00
Russel Delainey
0e725ad9e1 Check the force is an enemy, and the type that died is unit 2019-06-04 14:40:33 -06:00
Russel Delainey
77d3a581f3 Implement as guards to reduce nesting 2019-06-04 14:25:34 -06:00
Russel Delainey
8b79bc8024 Clean up testing code. 2019-06-04 13:24:46 -06:00
Russel Delainey
3a56ee1e5c First shot at #608 2019-06-04 13:07:43 -06:00
Lynn
98f11ee163
Satisfy travis 2019-06-04 11:05:00 +02:00
Lynn
6db5901e99
Hotfix for broken GUI, translation parameter count 2019-06-04 10:56:18 +02:00
Lynn
99890acdc2
Merge pull request #935 from linaori/cleanup-player-stats
Cleanup player stats
2019-06-02 17:16:55 +02:00
Lynn
f73e017e88 Optimize some reach distances 2019-06-01 17:11:17 +02:00
Lynn
fdee00dc06 Translate whois data 2019-06-01 13:41:12 +02:00
Lynn
97d96dedf3 Translate the name of death causes 2019-06-01 00:12:41 +02:00
Lynn
8a84ef7504 Cleanup of player stats functions 2019-05-31 23:18:19 +02:00
Lynn
dc78d297b6 Use K, M, B, T notations for scores 2019-05-31 23:14:22 +02:00
Lynn
94934a7695
Merge pull request #934 from linaori/rewrite-score-storage
Rewrite score storage
2019-05-31 22:33:27 +02:00
Lynn
b5f70f2db1 review feedback 2019-05-31 21:42:15 +02:00
Lynn
b3dbd2bc62
Merge pull request #925 from linaori/feature/player-chat-colors-in-gui
Replaced command for player and chat colors
2019-05-31 21:13:02 +02:00
Lynn
b5b9a49fd1 Improved hotpath performance 2019-05-31 19:28:20 +02:00
grilledham
211d0ca18a
Merge pull request #929 from grilledham/remove_debug_data_from_gui_data
don't show the debugger's gui data in gui data
2019-05-31 12:28:09 +01:00
Lynn
f8812f6189 Use ScoreTracker for global score display 2019-05-30 21:57:43 +02:00
Lynn
34e3190882 Use a uniform storage for score storage 2019-05-30 20:22:21 +02:00
Lynn
6b8a042821 Lower color accuracy to a precision of 3 for small numbers 2019-05-30 18:55:42 +02:00
grilledham
2ef7f16550 added chat color sanitizer 2019-05-30 18:55:42 +02:00
Lynn
4add981a76 Sync colors from /color command to the settings 2019-05-30 18:55:41 +02:00
Lynn
1cd19c69e7 Replaced command for player and chat colors 2019-05-30 18:55:41 +02:00
Lynn
4e86ecf0ff Fixed locale table with string concat in market 2019-05-30 16:49:54 +02:00
Lynn
8f7695fefd Some diggy tweaks based on feedback
- Added an initial mining speed bonus
 - Added an option to toggle landfill research
 - Slightly increased oil spawn rates
2019-05-30 12:36:15 +02:00
grilledham
9e3993d8f5 don't show the debugger's gui data in gui data 2019-05-29 23:12:31 +01:00
Simon
f24b9aa51f
Crowdin sync 2019-05-29 (#928)
* Crowdin sync 2019-05-29

* fix cs technology tag

* Fixed rich text, new crowdin sync

Crowdin sync at 20:15 UTC 2019-05-29

* First diggy localisedStrings

* Added missing localisedString

* Updated readme + CI fix
2019-05-29 23:13:28 +02:00
Lynn
a0e4021d4a Added a sync message to the settings GUI 2019-05-28 16:49:59 +02:00
grilledham
d4667992d1 Merge branch 'develop' of https://github.com/Valansch/RedMew into gui_settings 2019-05-27 20:46:38 +01:00
Lynn
65b9e6d547 Schedule setting syncs per player, not globally 2019-05-27 19:09:43 +02:00
grilledham
2ad61b737d fix unused state variable 2019-05-27 16:42:06 +01:00
grilledham
5382d2c420 localisation 2019-05-27 16:34:29 +01:00
grilledham
ddc6d4e2c1 tag_group settings sync 2019-05-27 16:18:46 +01:00
grilledham
8877b73628 player_list settings sync 2019-05-27 16:10:36 +01:00
grilledham
a03cff2bd9 tasklist settings sync 2019-05-27 16:07:20 +01:00
grilledham
56bfa84388 fix no_notify set when settings change 2019-05-27 16:07:02 +01:00
grilledham
3cbce426ad update event settings names 2019-05-27 15:46:18 +01:00
grilledham
62d5c4ab9d Merge branch 'fix/nested-setting-in-event' of https://github.com/iltar/RedMew into gui_settings 2019-05-27 15:41:59 +01:00
grilledham
f31b060a0e poll_notify_sync 2019-05-27 15:41:38 +01:00
Lynn
55eead174d setting set should not nest the setting in the event 2019-05-27 16:01:48 +02:00
grilledham
4ec2d46f62
Merge pull request #919 from grilledham/debugger/gui_data
Debugger/gui data
2019-05-27 13:18:12 +01:00
Lynn
ecd4e73e3d Directly update settings fields when displayed 2019-05-27 13:50:37 +02:00
grilledham
6387b73788 removed unused variables 2019-05-26 21:13:57 +01:00
grilledham
1af3d3b237 fixed desyn issue 2019-05-26 21:03:42 +01:00
grilledham
f77a50b33b clear text unless both player and element is selected. 2019-05-26 20:44:59 +01:00
grilledham
e9b31c7038 updates 2019-05-26 20:32:44 +01:00
Lynn
22b6f587d2 Added a sync back towards the local state 2019-05-26 19:25:46 +02:00
Lynn
f4872717e2 Settings are now synced via Setting.set instead 2019-05-26 18:14:25 +02:00
grilledham
68b4c22e2b merge develop into debugger/gui_data 2019-05-26 16:41:39 +01:00
Lynn
f93a3714a6 Between joining and syncing settings, can't use button 2019-05-26 14:56:41 +02:00
Lynn
732941a642 Ensure window is closed when a player rejoins 2019-05-26 14:44:18 +02:00
Lynn
66d1f8e442 Use the timeout mechanism for server config 2019-05-26 13:51:46 +02:00
Lynn
3281d580f5 menu_item_tooltip -> tooltip for consistency 2019-05-26 13:43:38 +02:00
grilledham
9ec489f961 cancelled requests include data and cancelled = true 2019-05-26 13:42:12 +02:00
Lynn
36d22f052f Using game.get_player instead of game.players 2019-05-26 13:42:11 +02:00
Lynn
0950a4e13b Fixed incorrect merges and 0.17.x changes 2019-05-26 13:42:11 +02:00
Lynn
bc38c23a3a Review feedback processed 2019-05-26 13:42:11 +02:00
plague006
ed8c3a1453 Detect server 2019-05-26 13:42:10 +02:00
plague006
e395f0c6d7 Minor locale cleanup 2019-05-26 13:42:10 +02:00
Lynn
ac9c25ac6e Replaced settings commands with a GUI 2019-05-26 13:42:09 +02:00
Lynn
28f79a9166 Added tooltips for most menu items 2019-05-26 13:21:40 +02:00
Lynn
dda30a9208 Added a tooltip to explain the evolution button 2019-05-26 11:37:51 +02:00
grilledham
ff8d81120f
Merge pull request #912 from grilledham/misc-fixes
Misc fixes
2019-05-16 20:13:47 +01:00
grilledham
bcda7c8f39 re enabled disabled_font_color 2019-05-16 20:04:08 +01:00
grilledham
1c28b4eb31 re enabled poll focus colors, except disabled_font_color 2019-05-16 14:49:29 +01:00
grilledham
a0e178fc75 removed unsed Game variable 2019-05-16 12:11:01 +01:00
grilledham
880c0366d1 Game.get_player_by_index -> game.get_player 2019-05-16 11:10:56 +01:00
grilledham
c444844a3f refactor + extra checks for require fluid ores, pumpjack mining drills 2019-05-13 11:08:57 +01:00
TWLTriston
82874823ce Fix #910 - added radius lookups for drills 2019-05-12 19:30:51 -04:00
Simon
eb491364c4
fixed LuaPlayer -> Player.name (#903) 2019-05-03 16:47:05 +02:00
SimonFlapse
6f514c9f38 Two more 2019-05-02 18:05:03 +02:00
SimonFlapse
6b145dacbe More player -> character #2 2019-05-02 17:29:55 +02:00
SimonFlapse
56b6dfbd01 More player -> character 2019-05-02 17:02:53 +02:00