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

3410 Commits (objectmenu)

Author SHA1 Message Date
Günther Brammer 6ad42ed24d Restore icons in the player join menu 2016-01-30 16:04:38 +01:00
Günther Brammer 7f75d09740 Increase height of dialog/menu title bars to the standard icon height 2016-01-30 16:04:37 +01:00
Günther Brammer 90860d3422 Use bigger icons for player menu where available 2016-01-30 16:04:37 +01:00
Günther Brammer d60f767f5c Increase all symbol sizes in player menu from 35 to 40 2016-01-30 16:04:22 +01:00
Günther Brammer dd49c5a2fe Increase the symbol size in the player menu items with labels 2016-01-30 16:04:06 +01:00
Günther Brammer 435e5a8eeb Simplify menu construction functions 2016-01-30 16:04:06 +01:00
Günther Brammer 66d78fddab Remove unused support for secondary menu command 2016-01-30 16:04:06 +01:00
Günther Brammer bddbc23354 Remove C4ObjectMenu 
It's been superseded by other methods.
 2016-01-30 16:04:05 +01:00
Günther Brammer d3428003a8 Fix navigation in player menus with more than one column/row 2016-01-30 16:03:22 +01:00
Günther Brammer 23acdc6060 Use the same team id in view update as in team join 2016-01-30 16:02:31 +01:00
Maikel de Vries 4bcdfc451e block construction sites based on Exclusive and not on planes (#1534) 
This makes more sense, exclusive object block all other construction sites, irrespective of their planes.
 2016-01-30 14:46:14 +01:00
Sven Eberhardt 1f81b87c33 PlayAnimation: Delete previous animations in same slot if no weight is given. 
This will simplify fixing several animation leaks.
 2016-01-28 22:02:27 -05:00
Sven Eberhardt 80b8879805 Fix SolidMask DensityProvider to return C4M_Vehicle, not C4M_Solid. 
Fixes attached movement of objects with increased contact density.
 2016-01-28 22:00:41 -05:00
Nicolas Hake f12afbc43c Fix some frankly ridiculous indentation 
I know you like to think of yourself as something of an artiste, but
this isn't likely to get into MoMA's permanent collection.
 2016-01-28 17:26:09 +01:00
Sven Eberhardt 36489145b6 Fix automatic engine detection of melee-like scenarios to allow team selection. 2016-01-24 22:13:21 -05:00
Sven Eberhardt 451ea87ab9 Fix another FoW crash 2016-01-24 17:23:20 -05:00
Sven Eberhardt 42d8885877 Fix crash in FoW rendering #1643 2016-01-24 14:44:00 -05:00
Günther Brammer d0d27d25f1 Merge script branch 2016-01-24 12:25:52 +01:00
Günther Brammer 4d1f5d95c2 Script: Prevent usage of deleted objects via this() 
Apparently, this wasn't done already because of compatibility concerns. The
beginning of a release cycle is the perfect moment to finally complete the
prevention of using deleted objects from script.
 2016-01-24 12:25:15 +01: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
Sven Eberhardt e94c0e38fc Add scenario core field "Mode" (in [Game]) to allow setting game mode independent of goal objects. 
To be used by the league so you can properly host race scenarios in the open melee league.
 2016-01-23 21:19:22 -05:00
Sven Eberhardt df6d349166 Add safety to light object creation. 2016-01-23 21:09:12 -05:00
Günther Brammer 7c022085ee Improve script bytecode dump formatting slightly 2016-01-24 02:09:15 +01:00
Günther Brammer 27cbdb2177 Remove superfluous mape stubs 2016-01-24 02:09:14 +01:00
Günther Brammer e790d2c327 Remove duplicated stubs for the scriptengine from mape 2016-01-24 02:09:14 +01:00
Günther Brammer 5a570b96f1 Remove now unnecessary stubs from C4ScriptStandaloneStubs 2016-01-24 02:09:14 +01:00
Günther Brammer 6b6dd96719 Move GameScript.GRBroadCast to Game.GRBroadCast 
This avoids a dependency on ::Objects from C4ScriptHost.
 2016-01-24 02:09:14 +01:00
Günther Brammer e1a38ee010 Move references to ::Objects and ::MaterialMap from C4AulLink to C4Game 
This changes the order in which the various parts of the engine are updated
after a definition reload, but they should not interfere with each other.
 2016-01-24 02:09:14 +01:00
Günther Brammer a5f797f96b Move miscellaneous global functions from C4Effect.cpp to their users 2016-01-24 02:09:14 +01:00
Günther Brammer 9833c1ef2d Remove never used NeedDefinitionContext 
Every function that accepts a definition also accepts an object instead, so
NeedNonGlobalContext is the exception to use.
 2016-01-24 02:09:13 +01:00
Günther Brammer b7ecc49a02 Remove a bit of dead code from C4Value 2016-01-24 02:09:13 +01:00
Günther Brammer 78e3457ff7 MSVC: Remove support and workarounds for versions older than 2015 
We require that version for its C++14 support anyway.
 2016-01-23 23:10:02 +01:00
Günther Brammer a19e7f6ced Use #elif defined() to check for config.h macros instead of plain #elif 
This way, the code works with a config.h that does not define those macros.
 2016-01-23 23:05:16 +01:00
Günther Brammer 7167459f67 win32: Move PIXELFORMATDESCRIPTOR from C4AbstractApp to CStdGLCtx 
That is the only user.
 2016-01-23 22:02:52 +01:00
Günther Brammer 34a720ca54 win32: Remove unused CreateContext function taking a HWND 2016-01-23 22:02:52 +01:00
Günther Brammer 37fd0a88c6 win32: Rename C4Window::hRenderWindow to renderwnd to match GTK+ 2016-01-23 22:02:52 +01:00
Günther Brammer 9210c65e85 gtk: Hide usages of X11 behind #ifdef GDK_WINDOWING_X11 2016-01-23 22:02:51 +01:00
Günther Brammer aa931ac623 Drop some dead code in C4App.h and C4WindowGTK.cpp 2016-01-23 20:36:34 +01:00
Günther Brammer 1c15b8f661 gtk: Move OpenURL to the other implementations in PlatfromAbstraction 2016-01-23 20:36:34 +01:00
Günther Brammer 8f48f0275d gtk: Remove unnecessary C4Window::wnd 
It was only used to specify a screen for randr, which doesn't need a
particular window.
 2016-01-23 20:36:34 +01:00
Günther Brammer 93f12150c4 CMake: Remove obsolete USE_X11 option and add USE_WIN32_WINDOWS 
USE_WIN32_WINDOWS was previously defined in PlatformAbstraction.h. Move it
to CMakeLists.txt and config.h like its peers. Replace USE_X11 with USE_GTK
or GDK_WINDOWING_X11 as appropriate.
 2016-01-23 20:36:34 +01:00
Günther Brammer 11bbeb2a5b Rename WITH_DEVELOPER_MODE to USE_GTK 
This mirrors USE_WIN32_WINDOWS, USE_SDL_MAINLOOP and USE_COCOA.
 2016-01-23 20:36:33 +01:00
Günther Brammer d09ed41eea Avoid an OpenGL dependency in C4Surface.h 2016-01-23 20:36:33 +01:00
Nicolas Hake 4fddda20f9 C4Script: Accept array parameter for Min, Max 
Min/Max with array parameter will return the smallest/largest value of
all elements of the array. If any array element is not an integer, nor
convertible to integer, the function will fail.
 2016-01-23 13:49:10 +01:00
Nicolas Hake 9a9bcd0568 C4AulError: derive from std::exception 2016-01-23 13:49:08 +01:00
Sven Eberhardt fcf870672c Fix overflow when calling DoEnergy with large values #1646 2016-01-22 22:52:09 -05:00
David Dormagen 8418da86d6 custom GUIs: fixed scrollbar offset with active upper board (#1612) 
I guess the UI elements expect their position to already be corrected by cgo.X/Y. Or they never cared because they were in front of the upper board.
I am not sure, maybe the correct solution would be to actually position all elements lower (instead of adjusting for it when passing mouse input or drawing)? Currently the position is relative to the upper board's edge.

Anyway, this works for now.
 2016-01-21 22:17:47 +01:00
Sven Eberhardt 80676c7ab5 Fix force redirection behavior of non-clonks on permeable SolidMasks. 
E.g. if you put a shovel on a wooden bridge, it would always slide left.
 2016-01-20 22:49:56 -05:00
David Dormagen 8ba1e042a0 script GUIs: fixed clipping with active upper board 
I know that the issue was noticable starting from https://git.openclonk.org/openclonk.git/commit/cd57e474935b283e58c7ae7edd137c049f87f90c
I don't know WHY it was not noticable before, though. It had probably always been a defect.
 2016-01-20 22:30:35 +01:00