18649 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dennis Felsing	c746f70c12	Merge pull request #7338 from Robyt3/Demo-Render-Popup-Layout ... Improve layout of demo render popup on 5:4 resolutions	2023-10-12 21:24:31 +00:00
Robert Müller	aeb1530966	Improve layout of demo render popup on 5:4 resolutions	2023-10-12 19:20:12 +02:00
Dennis Felsing	01958378f1	Merge pull request #7336 from Robyt3/Demo-Render-Popup-Android ... Remove Android-specific layout code for demo render popup	2023-10-11 21:54:21 +00:00
dobrykafe	ee115bf824	dont go below default zoom	2023-10-11 21:08:37 +02:00
Robert Müller	1dfdd752f8	Remove Android-specific layout code for demo render popup ... The filename editbox and buttons of the demo render popup were rendered excessively large on Android. While too small buttons could be an issue with smaller screens, this should not be implemented solely this popup, if Android support is revived in the future, as it makes the UI layout code harder to maintain.	2023-10-11 18:20:11 +02:00
heinrich5991	5fbf02ae91	Merge pull request #7333 from Robyt3/Clang-Tidy-Remove-Nolint ... Remove obsolete clang-tidy `NOLINT` comments	2023-10-11 15:49:46 +00:00
Robert Müller	aa03aa0f60	Remove obsolete clang-tidy NOLINT comments ... The TODO in the `Dilate` function is removed, as the code already appears to be safe without additional checks. The variable `k` is at most `(w * h - 1) * BPP`, as `ix` and `iy` are clamped to maximum `w - 1` and `h - 1` respectively. Because `p < BPP - 1` the index `k + p` is therefore always valid for the buffers. (The caller must ensure that the source and destination buffers are of size `w * h * BPP`.)	2023-10-11 17:22:59 +02:00
Dennis Felsing	60fa51ff13	Merge pull request #7309 from infclass/kaffeine/merge-client-data-structs ... Extract client 'six' data types and use them for 'seven' data	2023-10-10 21:55:55 +00:00
Dennis Felsing	7171a8872e	Merge pull request #7330 from Zwelf/pr-fix-save-dry ... Fix save_dry command	2023-10-09 14:58:59 +00:00
Zwelf	1d6771ea9d	Fix save_dry command	2023-10-09 16:36:40 +02:00
Dennis Felsing	f81af726e9	Merge pull request #7328 from Zwelf/pr-save-ninja ... Save/load ninja	2023-10-09 09:40:02 +00:00
Zwelf	9be7ad554d	Save/load ninja ... Add ninja state to save string. Previously ninja was lost during load.	2023-10-09 11:11:55 +02:00
Dennis Felsing	1fb0235f4b	Merge pull request #7327 from furo321/correct-max-length ... Show correct max length in help text for `MACRO_CONFIG_STR`	2023-10-09 06:52:43 +00:00
furo	f39792f330	Show correct max length in help text for MACRO_CONFIG_STR	2023-10-09 00:53:28 +02:00
Dennis Felsing	cc62d958c6	Merge pull request #7253 from JSaurusRex/midTickAim ... firing/hooking takes aim when action happened not when tick	2023-10-08 21:29:34 +00:00
JSaurusRex	3c7ad1490b	done requested code changes	2023-10-08 17:31:43 +02:00
Robert Müller	34b91fc63c	Merge pull request #7326 from def-/pr-notif ... Make sure notification object exists	2023-10-08 12:39:50 +00:00
Dennis Felsing	1f5a764cf5	Make sure notification object exists	2023-10-08 14:01:02 +02:00
Dennis Felsing	1130ebc3b7	Merge pull request #7324 from furo321/solo-kill-team ... Don't announce team killed if it's a solo server.	2023-10-08 11:38:26 +00:00
furo	703db2c124	Don't announce team killed if it's a solo server.	2023-10-08 13:06:39 +02:00
Dennis Felsing	f7d23844db	Merge pull request #7322 from Robyt3/Editor-External-Image-Name-Fix ... Fix names of external images not being loaded in editor	2023-10-08 10:59:53 +00:00
Dennis Felsing	dc57cc38c4	Merge pull request #7323 from furo321/move-background-setting ... Move "Regular background color" setting to background	2023-10-08 10:59:34 +00:00
furo	88e1988d96	Move "Regular background color" setting to background ... Fixed capitalization (only captialize first letter)	2023-10-08 12:26:03 +02:00
Robert Müller	97ae362bd6	Fix names of external images not being loaded in editor ... The entire `CEditorImage` was being overwritten when loading external images, which was causing the already loaded image name to be cleared, due to the changed order of operations (regression from #7008). This is fixed by using `CImageInfo` to load the image and only copying the relevant members to the `CEditorImage`.	2023-10-08 11:38:13 +02:00
Robert Müller	d4fed2360e	Merge pull request #7208 from dobrykafe/pr-editor-toolbar-sounds ... Enhance editor toolbar sounds	2023-10-08 09:06:15 +00:00
Dennis Felsing	e4ccd79851	Merge pull request #7318 from furo321/editor-mode-icons ... Use icons for editor mode switching.	2023-10-08 08:17:07 +00:00
furo	e1979d9c9b	Use icons for editor mode switching. ... Make the icons bigger. Make it the same size as "group"	2023-10-08 01:17:20 +02:00
Dennis Felsing	454194489b	Merge pull request #7319 from furo321/reset-zoom-on-change ... Reset zoom when adjusting default zoom in settings	2023-10-07 22:09:43 +00:00
Dennis Felsing	7034ca84ec	Merge pull request #7314 from furo321/keep-practice ... Don't disable practice on death.	2023-10-07 21:28:28 +00:00
furo	8c9597667a	Reset zoom when adjusting default zoom in settings	2023-10-07 23:24:36 +02:00
Robert Müller	a91374b276	Merge pull request #7316 from dobrykafe/pr-server-info-colors ... server info: show clanmates in different color	2023-10-07 15:41:47 +00:00
dobrykafe	0838fd9d04	fix requested changes	2023-10-07 15:52:36 +02:00
dobrykafe	fc23f451b2	show clanmates in different color	2023-10-07 15:05:36 +02:00
dobrykafe	8adbbc433c	fix requested changes	2023-10-07 14:49:51 +02:00
Robert Müller	093edb7803	Merge pull request #7308 from Marmare314/add-editor-object ... Add `CEditorObject` class	2023-10-07 10:26:28 +00:00
furo	d4ec8cf8b4	Don't disable practice on death.	2023-10-07 09:34:20 +02:00
marmare314	719b2bdadd	add editor object class ... This class is slightly more light-weight than a CEditorComponent and its naming makes it more natural to inherit for envelope points, proof-mode positions etc.	2023-10-07 00:46:47 +02:00
Dennis Felsing	d6aa18e5b4	Merge pull request #7310 from infclass/fix-cmake-versioning ... Fix cmake versioning	2023-10-06 21:46:31 +00:00
Dennis Felsing	9e30ce3c2d	Merge pull request #7311 from Robyt3/Demo-Browser-Overhaul ... Overhaul demo browser UI	2023-10-06 21:42:25 +00:00
Robert Müller	076a902684	Overhaul demo browser UI ... Improve layout of demo browser buttons, search and checkbox. Use icons for most buttons. Decrease size of UI elements. Move demo details from below the file browser to a side panel on the right, which is the same size as the server browser side panel. Use ellipsis to truncate the SHA256 instead of rendering only half of it with reduced font size. Show "map not included" instead of "0.00 KiB" for the map size of demos that don't include a map. Remove the "Markers" column, as it is not very useful to see for all demos and sort by. Closes #7275.	2023-10-06 21:46:13 +02:00
JSaurusRex	03fad41def	let fix_style.py do its course	2023-10-06 21:23:39 +02:00
Robert Müller	706f021f68	Add CUIRect::Margin with vec2 argument ... To more conveniently create different margins in horizontal and vertical directions at the same time.	2023-10-06 18:08:03 +02:00
Alexander Akulich	418d8ae73d	CMake: Fix overriding	2023-10-06 19:07:53 +03:00
Alexander Akulich	abb1d4d18c	CMake: Cleanup CMake pre-3.0 support code	2023-10-06 19:07:36 +03:00
Dennis Felsing	62b9338ba4	Merge pull request #7307 from Robyt3/Clang-Tidy-Cleanup ... Fix additional clang-tidy 16 errors, remove some obsolete suppressions	2023-10-06 15:37:43 +00:00
Alexander Akulich	b6470e5a43	Use client 'six' data structs for client 'seven' data	2023-10-06 18:14:38 +03:00
Alexander Akulich	26b4a41c03	Extract 'six' content data structs to their own file	2023-10-06 18:14:15 +03:00
dobrykafe	5b609c8e06	extract CEditor::DoAudioPreview, also use in file dialog	2023-10-06 17:10:43 +02:00
dobrykafe	6e2ddfbeaf	use nullptr instead of 0, add missing return statement	2023-10-06 17:09:20 +02:00
dobrykafe	ca517f27b8	enhance editor toolbar sounds	2023-10-06 17:09:19 +02:00