3149 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	92e6ce391a	Merge pull request #918 from linaori/abstract-setting-sync ... Settings are now synced via Setting.set instead	2019-05-27 13:58:54 +02:00
Lynn	ecd4e73e3d	Directly update settings fields when displayed	2019-05-27 13:50:37 +02:00
theorangeangle	e5e0377d3d	added description and RS for crosses3 map. ... tested in SP, everything loads as intended.	2019-05-27 00:09:37 -05:00
theorangeangle	15735f0b07	removed diagonal lattice and added descriptions, map preview for contra spiral	2019-05-26 23:47:31 -05: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	06743fad46	Merge pull request #917 from linaori/setting_set-event-added ... Added an event when a setting is set	2019-05-26 16:39:08 +02:00
Lynn	7ed200bf3f	Added an event when a setting is set	2019-05-26 16:18:07 +02:00
Lynn	d8ea17acf4	Merge pull request #852 from linaori/settings-gui ... Replaced settings commands with a GUI	2019-05-26 15:07:15 +02: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	ed1f7b9bef	Fixed duplicate setting	2019-05-26 14:01:56 +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	998fdcf20f	Replaced settings commands with a GUI	2019-05-26 13:42:09 +02:00
Lynn	ac9c25ac6e	Replaced settings commands with a GUI	2019-05-26 13:42:09 +02:00
Lynn	421e78a2b1	Merge pull request #916 from linaori/add-evo-tooltip ... Added a tooltip to explain the evolution button	2019-05-26 13:40:42 +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
theorangeangle	b85d1bca35	Merge pull request #914 from theorangeangle/vanilla_sprinkles ... Added Rocky Road as a map, fixed car body feature.	2019-05-21 21:07:21 -05:00
grilledham	4b6c24ce6a	keep the player's character	2019-05-20 15:10:36 +01:00
grilledham	6ad2be252c	Fix RS requires	2019-05-20 14:54:44 +01:00
theorangeangle	f50ef8b9eb	sitting here wondering, how do i combine commits?	2019-05-20 06:43:46 -05:00
theorangeangle	2ef2743d16	fixed incorrect MGSP issue ... and linting stuff (thanks grilled)	2019-05-20 06:41:30 -05:00
theorangeangle	3651eb1097	added map description info	2019-05-20 00:14:14 -05:00
theorangeangle	bf2382fb4d	added map description info	2019-05-20 00:12:50 -05:00
theorangeangle	2688ca9899	foundation for map. current features: ... -vanilla terrain -car body enabled still need enabling: -tiny ores	2019-05-20 00:01:44 -05:00
theorangeangle	59f682a75a	fixed redmew surface issue	2019-05-20 00:00:57 -05:00
grilledham	972eebd357	Merge pull request #913 from grilledham/get_player_by_index_fix ... get_player_by_index -> game.get_player	2019-05-17 16:07:50 +01:00
grilledham	2228be6917	get_player_by_index -> game.get_player	2019-05-17 15:57:01 +01: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	bd75bccbd0	Merge pull request #911 from TWLTriston/fix_autodeconstruct ... Fix autodeconstruct	2019-05-16 11:32:06 +01:00
grilledham	880c0366d1	Game.get_player_by_index -> game.get_player	2019-05-16 11:10:56 +01:00
grilledham	500bcd1a18	biter_attacks module off by default	2019-05-16 11:10:07 +01:00