marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,944 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

76 Commits (ce92a3cc169fbbd211827b42f3f430a725158acf)

Author SHA1 Message Date
Sven Eberhardt 61b1ab08ad Editor: More shortcuts; show helper shortcuts in tools menu 2016-09-10 01:17:40 -04:00
Sven Eberhardt 53b365a6d2 Editor: Add shortcuts, menu items, tooltips 2016-09-08 01:56:01 -04:00
Sven Eberhardt b95d1387a4 Editor: Add "reset to saved scenario" command 2016-09-07 01:53:54 -04:00
Sven Eberhardt b763982f45 Fix scenario saving as network client to not delete saved scenario after game end (#1814) 2016-08-28 00:56:15 -04:00
Sven Eberhardt 4869eff787 Allow joining to editor games through startup network dialogue 2016-08-10 19:35:39 -04:00
Sven Eberhardt 5bb204d69b Qt editor: Fix net menu 
It didn't work, had the wrong labels and crashed.
 2016-08-06 21:12:04 -04:00
Sven Eberhardt fc24969899 Add EditorPlacementLimit property 
Limits the number of object instances that can be placed of a given def.
 2016-08-06 02:36:53 -04:00
Sven Eberhardt 11b317808f Qt Editor: Add toggle help button to "?" menu 2016-07-25 21:39:35 -04:00
Sven Eberhardt 4245f60e83 Qt Editor: Add help/description label for current selection 2016-07-24 10:12:38 -04:00
Sven Eberhardt 63c9bd78e7 Qt Editor: Fix crash and prop list/array display problems when switching prop lists. 
Storing the pointer in QModelIndex could sometimes keep invalid memory on the persistent model indices. Because re-organizing these memory locations would be a nightmare and we only go two levels deep anyway, just store the parent index in the internal pointer and look up the actual property on the fly.
 2016-07-05 22:53:41 -04:00
Sven Eberhardt a7aa89f168 Merge branch 'master' into qteditor 
Conflicts:
	planet/Objects.ocd/Structures.ocd/StoneDoor.ocd/SpinWheel.ocd/Script.c
	src/platform/C4WindowSDL.cpp
	src/script/C4AulParse.cpp
	src/script/C4Effect.cpp
 2016-06-20 22:27:03 -04:00
Sven Eberhardt e7be7d6acd Qt Editor: Add viewport context menu 2016-06-19 22:45:12 -04:00
Sven Eberhardt 25fa57cabf Qt Editor: Add "Static Flat" landscape mode 2016-06-17 18:44:59 -04:00
Sven Eberhardt 2f22a3a8fe Qt Editor: Add property delegate type "object" 2016-06-16 14:59:04 -04:00
Sven Eberhardt 16e31098b4 Qt Editor: Improve proplist and array display/editing 
* Add/Remove element buttons
* Display customization of user delegates
 2016-06-06 01:54:05 -04:00
Sven Eberhardt b10da0629d Qt Editor: More EditorProps types (string, array) and attributes (EditOnSelection, DefaultEditorProp) 2016-06-03 01:20:43 -04:00
Sven Eberhardt af2a74b6ec Qt Editor: Array editing 2016-05-28 09:30:54 -04:00
Sven Eberhardt d304b17028 Qt Editor: Editing of child proplists 2016-05-24 23:06:00 -04:00
Maikel de Vries 183ab4c4a0 remove unused function ComposeContents 2016-05-21 13:34:33 +02:00
Maikel de Vries 5841b55f7e remove unused function GetNeededMatStr 2016-05-21 13:34:33 +02:00
Lukas Werling 9fa16c5e14 SDL: Enable multisampling 
Unfortunately, there doesn't seem to be an easy way to apply
multisampling changes in SDL. As a workaround, a message requesting the
player to restart the game is shown.
 2016-05-07 12:25:11 +02:00
Sven Eberhardt c0228be4e7 Qt Editor: More editor property types and functionality 2016-04-16 22:05:35 -04:00
Sven Eberhardt dc7259bb1e Qt Editor: Allow opening of user path from welcome page 2016-03-26 14:02:40 -04:00
Sven Eberhardt b3712ace97 qt editor: Add "Editor" button to startup main menu 2016-03-26 02:15:15 -04:00
Sven Eberhardt f2daa51fa7 Qt Editor: Add "Welcome" dock widget 2016-03-26 01:36:40 -04:00
Sven Eberhardt b1ac208249 Qt Editor: Add "File->New" menu entry 2016-03-22 23:08:05 -04:00
Sven Eberhardt 80549ca2cc Qt Editor: Add object creator 2016-03-06 13:06:29 -05:00
Sven Eberhardt e0e09133d6 Qt Editor: Add some string translations. 2016-02-18 00:10:30 -05:00
Sven Eberhardt d9b8de9ea2 Win32: Fix file deletion from scenario selection dialogue 2016-01-24 00:43:09 -05:00
Sven Eberhardt 28e794654c Add network option to disable UPnP. 
Also add some more UPnP failure messages to log.
 2016-01-24 00:11:14 -05:00
Armin Burgmeier 190b4bbae3 Instruct to start a network game when starting a round with >=2 MinPlayers 
Instead of asking the user to activate more players, which is no longer
possible as of #1529.
 2016-01-11 18:40:59 -08:00
Sven Eberhardt dd25f85e6d Warn when assigning duplicate keys #1170 2016-01-09 17:00:21 -04:00
Günther Brammer 7d0990baf9 editor: Don't try to insert manual newlines into error messages 2016-01-08 04:25:26 +01:00
Sven Eberhardt 019cc0d583 Enable immediate tooltips on mouse-over-event for unlabeled icons in lobby and scenario selection (#1132). 2015-12-06 21:03:54 -05:00
dylanstrategie d284f49b6b Add "ready" button for clients in game lobby. 
Signed-off-by: Sven Eberhardt <sven2@goldwipf.de>
 2015-11-18 22:49:59 -05:00
Sven Eberhardt cc5d43d0b0 Localize loading message for scenario local player control definitions. 2015-10-05 22:38:45 -04:00
Sven Eberhardt 737b1fd8fd Save screenshots in background thread (#998, #1104). 
Also ensure music keeps streaming while collecting data for full map screenshot.
 2015-09-29 20:48:34 -04:00
Sven Eberhardt 410e570b94 Add localized strings for ToolsDlg foreground and background labels. 2015-09-17 22:30:22 -04:00
Sven Eberhardt 90cca08d63 Add /todo message board command. 
Adds text to local TODO.txt file. Useful for taking notes quickly e.g. when testing new scenarios in a network game.

TODO filenames are configurable. Default file is TODO.txt in the scenario file (if it's unpacked) and TODO.txt on the current path if access to the first location failed.
 2015-03-05 16:04:07 +01:00
Günther Brammer a92c22a7b3 Merge various build system fixes and cleanups 2015-01-25 18:50:29 +01:00
Sven Eberhardt 98093961ec Add packet logging option. 
This should reduce log spam in network games.
 2015-01-03 18:15:41 +01:00
Günther Brammer 3bb75fabf1 Remove unused language strings from Language*.txt 2015-01-01 22:13:56 +01:00
Armin Burgmeier 192dddec6f Use the new shader system for rendering sprites 
This now also avoids the use of conditionals in shaders by using different
shaders instead.
 2014-11-24 14:51:08 -05:00
Sven Eberhardt ca64fad8b5 Fix lobby team distribution settings hotkeys (#1133) 2014-10-09 20:40:01 +02:00
Maikel de Vries 03c88c34a3 removed WebCode from league string 2014-09-19 20:55:11 +02:00
Sven Eberhardt 91c2d49d2a Remember league login name and password token. 
Also removed some CUID/Webcode authentification code from engine.
 2014-05-18 15:10:00 +02:00
Sven Eberhardt 45f69abb6e Revert engine-side league localization 
The engine cannot know about all future league strings. Instead, localize server-side using language id from http request.
 2014-04-27 15:42:47 +02:00
Julius Michaelis e5b7ef5b80 AutoFrameSkip: Graphics option to reduce lag by slow 
Skips drawing every second frame if drawing the previous frame was too slow
Setting is controlled by game host
Default: on

Imported from Clonk Rage

From e6e680f49ac50a352e9a051ee21622e7f00648b6 Mon Sep 17 00:00:00 2001
From: sven2 <sven2@786b8e90-9c09-0410-89a9-bccc6ef1e79b>
Date: Sat, 21 Sep 2013 21:34:44 +0000
Subject: [PATCH] + AutoFrameSkip: Graphics option to reduce lag by slow
 clients in network games

git-svn-id: https://www.clonk.de:83/svn/clonk/stable@14501 786b8e90-9c09-0410-89a9-bccc6ef1e79b
 2014-04-03 14:53:12 +02:00
Julius Michaelis c49bc99efe Options/Graphics: tidy up 
Remove Config.Graphics.ShowAllResolutions
 2014-03-17 22:29:39 +01:00
Nicolas Hake 7a65ebade8 Warn on unsupported accelerator keys 
Chars outside the basic latin alphabet don't actually work as
accelerator keys. Emit a warning when encountering them.
 2014-03-11 00:26:13 +01:00