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

10097 Commits (directional-lights)
 

Author SHA1 Message Date
Mark 7df951fb65 Cloud: Mode without material insertion 
Added a mode where the cloud does not extract or insert any materials, so that the rain is just a decorative element of the game.
 2016-10-11 21:19:21 +02:00
Nicolas Hake d9696d2f88 Reorder game cleanup 
The order in which game components were cleaned up seemed rather
arbitrary, so let's change that into blocks of reasonably connected
parts.
 2016-10-11 19:44:29 +02:00
Nicolas Hake 14bfd7ea59 Clear console pointers earlier 
It doesn't make a lot of sense to keep console pointers around while the
objects and scripts have already been deleted. Clear them earlier so we
don't have any dangling pointers.
 2016-10-11 19:44:27 +02:00
Lukas Werling 170a793a44 Windows: Only write to stdout if there is no debugger 2016-10-11 18:07:31 +02:00
Sven Eberhardt 510d91fd00 Editor: Allow movement of HorizontalFix items by holding Shift and on object duplication 2016-10-10 21:46:17 -04:00
Sven Eberhardt 5e4aefddb2 Editor: Fix Ctrl+Click in object creation mode to create contents 2016-10-10 21:35:04 -04:00
Sven Eberhardt 4eae2b28d7 Editor: Fix drop cursor drawing 2016-10-10 21:26:10 -04:00
Sven Eberhardt eee79366d0 Add tool tip to "test sequence" button 2016-10-10 16:45:24 -04:00
Sven Eberhardt 6e6f642be6 Add tool tip to dialogue editor action 2016-10-10 16:45:24 -04:00
Sven Eberhardt d670291aba Implement tool tips for EditorActions 2016-10-10 16:45:23 -04:00
Sven Eberhardt 20d234e324 Editor: Replace | by line breaks in descriptions and EditorHelp texts 2016-10-10 16:45:22 -04:00
Nicolas Hake a6b65f0dee Merge pull request GH #28 from aburgm:fix-proplist-leak 
Don't leak static proplists with cyclic references
 2016-10-10 19:32:30 +02:00
Lukas Werling f5613c350e Windows: Write console output to stdout 
This is useful for third-party editor UIs.

See http://forum.openclonk.org/topic_show.pl?tid=3344
 2016-10-10 16:03:49 +02:00
Lukas Werling 4d5bb7304c Fix game controllers not working with the editor 2016-10-10 14:16:18 +02:00
Sven Eberhardt 244650bb17 Add base material to player spawn object. 
Set the default to a lot of clonks. This is useful so the "respawn at flagpole" rule works as expected even if users don't know about the base material setting.
 2016-10-09 13:27:20 -04:00
Sven Eberhardt b0e42e35d1 Sequence: Default action to empty sequence 2016-10-09 13:27:20 -04:00
Mark 2957a777b3 Goal: Extracted function NotifyPlayerHUD 
Removed duplicate code in the process.
 2016-10-09 11:53:25 +02:00
Mark 35e8a43f82 Goal: Optimize HUD updates 
No more lacking behind the fulfillment status.
 2016-10-09 11:50:06 +02:00
Mark 84dd95df34 Goal controller: Player parameters for goal display functions 
Allows goals with different symbols per player.
 2016-10-09 11:34:13 +02:00
Mark 9fcd3ee13e Goal controller: Extracted functions 
Made the variable names consistent between GoalSubMenu() and OnGoalUpdate();
Extracted the functions GetGoalSymbol() and GetGoalGraphics();
 2016-10-09 11:26:47 +02:00
Mark b18a7b7a3f Goal controller: Readability 
The change in call structure should not make that much of a difference in performance.
 2016-10-09 11:18:10 +02:00
Mark 0d22f58b52 Goal controller: Get short description only once. 2016-10-09 11:13:12 +02:00
Mark 0732b7dc87 Goal controller: Code cleanup 2016-10-09 11:11:51 +02:00
Mark b235c5e9e4 Goal controller: Simplified code 2016-10-09 11:11:28 +02:00
Mark f52159b835 Goal controller: Variable definitions 2016-10-09 10:58:37 +02:00
Mark be207737bc Goal controller: Slight optimization 
No need to call the function twice. This is trivial though, the call is not expensive usually.
 2016-10-09 10:51:48 +02:00
Sven Eberhardt c05ee7e644 Add gravestone inscription editor props 2016-10-08 23:29:50 -04:00
Sven Eberhardt 5e3730fc3e Editor: Store+Restore maximized state 2016-10-08 20:53:01 -04:00
Sven Eberhardt 765648877f Editor: Fix window shutdown to correctly save editor geometry even if quitting via Application.Quit (e.g. Ctrl+Q) 2016-10-08 20:52:25 -04:00
Sven Eberhardt cf7134e60e Fix a few warnings / possible divisions by zero 2016-10-08 20:51:51 -04:00
Sven Eberhardt 64cfe42827 Update shipped getopt version to include the new optional_argument option 2016-10-08 20:51:22 -04:00
Sven Eberhardt 45718ee44d Change tool hotkeys from <number> to to <Ctrl>+<number> 
This allows better combined playing+editing experience [Maikel]
 2016-10-08 19:15:28 -04:00
Sven Eberhardt 685513816f Editor: Raise focused viewport dock. 
When switching viewports using F10, the selected dock may have been hidden
 2016-10-08 19:15:27 -04:00
Sven Eberhardt 9e150f2bfb Viewport zoom towards center and fix scrolling 2016-10-08 19:15:26 -04:00
Mark 7c169c7905 Moved object interaction menu sidebar icons to separate overloadable functions 2016-10-08 17:46:39 +02:00
Lukas Werling eff406a181 Fix plain --lobby not working 2016-10-06 21:19:31 +02:00
Maikel de Vries 2505dc77f1 add room door to Decoration.ocd 
This is a door which leads to nowhere, but they can be connected via script or serve other purposes. Graphics by Apfelclonk.
 2016-10-06 18:43:04 +02:00
Armin Burgmeier 561651b715 Fix issues with resolution switching on Linux 
* Engine would always open up in Fullscreen and then switch to Windowed
   instead of just starting up as Windowed.

 * Could not change resolution because bit depth or refresh rate did not match
   * handle RefreshRate==0 as "any", just like windows

   * Remember refresh rate in combo box that enumerates all the modes and
     propagate to video mode setting instead of assuming all modes have the
     same refresh rate.

   * Report bit depth as 32 even if SDL tells us it's 24. Other parts of the
     code require it to be equal to 32, but 24 works just fine.

 * Changing from fullscreen to windowed when "Screen" was selected in
   resolution combo box (i.e. iXRes==-1) makes the window tiny (0x0 pixels).
 2016-10-05 21:38:46 -07:00
Clonkonaut f37eda9508 Moved HUD proplist definitions to separate, overloadable functions. 
See http://forum.openclonk.org/topic_show.pl?pid=32552#pid32552 for more information.
 2016-10-06 01:47:45 +02:00
Lukas Werling ddb34ab5cb Disallow interaction with actively controlled Clonks 
This prevents inventory stealing which is undesirable in cooperative
scenarios with competitive elements (e.g. some races) and confusing to
players.
 2016-10-05 22:14:40 +02:00
Armin Burgmeier 25b1a49543 Set last error when setting resolution fails 
The last error is displayed in the GUI, so until now there was just a "(null)"
string there.

The whole (SDL) resolution switching code is completely broken as well, but
that's a different story...
 2016-10-03 22:39:46 -07:00
Maikel de Vries 89be9bd158 implement scenario saving for liquid tank, pump & pipe 2016-10-03 18:07:49 +02:00
Sven Eberhardt 4756fb0ba1 Unify moving brick graphics size. 
Otherwise, there were still graphics artifacts sometimes.
 2016-10-03 00:02:46 -04:00
Sven Eberhardt 76ce8089af Fix display of moving bricks with size<4. 2016-10-02 23:47:02 -04:00
Sven Eberhardt d48dbfba82 Add optional size parameter to Particles_Flash 2016-10-02 23:47:01 -04:00
Lukas Werling bca0c76331 Lower minimum masterserver update interval to 1s 
This interval is critical for the netpuncher. Clients have to wait for
the first masterserver update before they can join.
 2016-10-03 00:05:23 +02:00
Maikel de Vries 1483620b2b fix c4script runtime error in power system when pump is initialized 2016-10-02 23:23:20 +02:00
Maikel de Vries 48d98d708e fix script error in keypad 2016-10-02 08:03:14 +02:00
Maikel de Vries b0ff00439f fix possible script error in pump 2016-10-01 19:18:23 +02:00
Maikel de Vries 2073fb0f0a improve picture graphics of animals 2016-10-01 16:32:29 +02:00