Commit Graph

7230 Commits (f856aa496889d85734c448453f3ba040e2eed652)
 

Author SHA1 Message Date
David Dormagen f856aa4968 interaction menu: added minimize button 2015-09-06 16:35:35 +02:00
Maikel de Vries f3f837f9a8 add trajectory preview to catapult 2015-09-06 13:47:12 +02:00
Maikel de Vries f5b7fe7498 fixed gravity calculation for trajectories 2015-09-06 13:46:45 +02:00
Maikel de Vries b20ec03832 prevent script error for Loc_Area(nil) call 2015-09-06 11:24:43 +02:00
Maikel de Vries 88eaba77e9 ensure large mushrooms are placed on soil materials 2015-09-06 11:17:30 +02:00
Maikel de Vries ef0e4ea7b7 elevator digging out objects is forwarded to clonk
This ensures earth ends up in the bucket and is not dug out.
2015-09-06 10:09:46 +02:00
Maikel de Vries 33be9d719f fix wealth display in HUD 2015-09-06 09:23:06 +02:00
Sven Eberhardt 283277ac82 Do not pre-load file contents from unpacked music folders ($1378).
Removes several seconds from startup time and ~150MB memory usage. Note that tags are still loaded so all file headers do have to be accessed.
2015-09-06 00:02:17 -04:00
Sven Eberhardt a355532b14 Crash Landing: Split dialogue message that could get cut off due to length.
I wonder why there's a length restriction anyway?
2015-09-05 22:44:38 -04:00
Sven Eberhardt cc6985dd78 Reduce starting material in HotIce to fit in default inventory slots (5). 2015-09-05 20:37:13 -04:00
Sven Eberhardt 1a9b7fa98f Fix HUD deletion of all players when one player is removed. 2015-09-05 20:37:13 -04:00
Sven Eberhardt ec0b9a0dd1 Fix deleted object usage when script gui close call is issued in response to deleted parent object. 2015-09-05 20:37:12 -04:00
Maikel de Vries d58d41e960 clean up balloon script
Was trying to solve bugs, but they are located in other scripts
2015-09-05 23:21:35 +02:00
Sven Eberhardt c73603adfb Crash Landing: Minor map and object rework.
Added some sky islands on the right to make final goal more accessible and visible.

Added some loam.

Changed some trees from Coniferous to Coniferous2.
2015-09-05 17:07:53 -04:00
Sven Eberhardt dd690e62b9 Added anti-clogging mechanism to pump.
Now pipes cycle through several offsets before giving up on the pumping.
2015-09-05 13:10:55 -04:00
Maikel de Vries 0e6c7ada15 make mushroom just collectible instead of pickable 2015-09-05 18:39:48 +02:00
Sven Eberhardt 149473a3bc Crash Landing: Add a helpful message to the merchant telling you how to sell gold. 2015-09-05 12:02:44 -04:00
Sven Eberhardt 08446bd3d5 Readded wind generator plans to The Raid.
They serve no purpose in this mission because energy requirement is turned off. However, I have seen two newbies who insisted on building them before using any buildings now, so let's just enable the plans. Building a wind generator is always a good experience because it's animated, makes sound and such.
2015-09-05 11:40:45 -04:00
Maikel de Vries 881f2f817e fixed using two grapple bows 2015-09-05 16:16:38 +02:00
David Dormagen fa40cfd64d put zooming on Ctrl+MouseWheel (from Shift+MouseWheel)
Shift is now the inventory key. Shift+MouseWheel sounds like it does have some potential, too. (F.e. scrolling through the ammunition in a bow?)
2015-09-05 11:36:27 +02:00
David Dormagen 5dcc9e387c collection: do not also pickup stuff when dropping items 2015-09-05 11:28:26 +02:00
David Dormagen 87a824b49d inventory & interaction: added Find_Layer where appropriate 2015-09-05 11:22:23 +02:00
David Dormagen 4682b6c668 script GUIs: fixed a fistful of memory leaks
There are some ownership rules (PropList::GetProperties, Ui::Element..) which are not very clear imo. But there also was at least one clear oversight (name retaining, that is).
The only issue would be an assertion firing at game exit.
2015-09-05 11:01:58 +02:00
Sven Eberhardt 0ceda6734b Fix memory leak in TextureMap initialization.
The Default call from C4Game is issued before construction of all members, which causes a memory leak when TextureMap is actually constructed.

Just merge Default() into Clear(). The separation into two calls serves no other purpose than putting the class into an inconsistent state between them.

It actually does that in almost all other subclasses as well but they don't allocate memory.
2015-09-04 21:49:36 -04:00
Sven Eberhardt c6518cc203 Fix out-of-bounds vector access in map script mask specification calculation. 2015-09-04 21:45:15 -04:00
Sven Eberhardt cb995eb158 Fix several memory leaks in script gui. 2015-09-04 21:08:28 -04:00
Maikel de Vries a9ac4b0ea7 fix dead link in GetStartupPlayerCount docs 2015-09-04 23:20:02 +02:00
Maikel de Vries e684efdb7b fixed setting power helper of a not found flag in power library 2015-09-04 18:57:17 +02:00
Martin Plicht b15f6bfb38 mac: Sprinkle some #include <GL/glew.h> onto 2 .mm files to make compiler happy
Also a break in a switch because clang told me so!
2015-09-04 18:28:57 +02:00
David Dormagen 6357db3b92 sawmill: hide production menu and show helpful tip instead; also saw wooden objects into wood for real now 2015-09-04 17:19:12 +02:00
David Dormagen 32923188b9 interaction menu: added name of object at the top of the menu
..and also increased speed of GUI_ObjectInteractionMenu::FxIntCheckObjectsTimer by around 10%.
2015-09-04 16:53:32 +02:00
David Dormagen 438b405d29 collection: utilize Find_Property and unify collection behavior between "surrounding" tab in interaction menu and shift-collect
You can now intentionally collect objects that are stuck. Player-friendliness over everything! Losing an object in a basement had been the number 1 reason for suicides in Clonk.
2015-09-04 16:29:46 +02:00
Nicolas Hake 4ae2d9f70b C4Script: Allow executing strings from cmdline instead of only files 2015-09-04 13:40:27 +02:00
Nicolas Hake 2b876a6cb6 C4Script: Split stubs from script runner 2015-09-04 13:21:06 +02:00
Nicolas Hake 082b3e7360 C4AulParse: Properly escape strings when dumping bytecode
Instead of just writing the raw string to stderr, escape them first so
newlines and other control characters don't result in strangely
formatted output.
2015-09-04 12:57:30 +02:00
Sven Eberhardt 0b308e75fe Remove duplicate sound system initialization. 2015-09-03 23:47:41 -04:00
Sven Eberhardt a4629e0758 Clear container of contents prior to removing them.
The container had already set Status==0 and cleared these objects from its contents, which can cause access to dead objects when anything container-relevant is done in the destruction callback.
2015-09-03 23:39:06 -04:00
Sven Eberhardt 8f4494745d Fix C4ScriptGuiWindow MouseInput/MouseEnter/MouseLeave overloads.
MouseInput silently shadowed the variant in C4GUI::Element and MouseEnter/MouseLeave were never called without parameters.
2015-09-03 23:27:20 -04:00
Sven Eberhardt 8551da87ac Added C4ScriptGuiWindow.h to sources in CMakeLists.txt.
This ensures it's in the file list in the MSVC IDE (and possibly others).

Also put C4ScriptGuiWindow.* into alphabetical sort order.
2015-09-03 23:15:48 -04:00
Sven Eberhardt 3edcc2b043 GUI: Readded "using Window::MouseInput;" in Screen to make the overload clear.
It got lost when moving some functions from protected to public.
2015-09-03 23:04:26 -04:00
Sven Eberhardt 3e4b30b2ba Added parentheses to clarify when an assignment result was intentionally used as truth value.
To silence some warnings.
2015-09-03 22:54:08 -04:00
Sven Eberhardt 36fbbb34a4 Change deactivated MenuDebugLogF to a definition that does not evaluate its parameters. 2015-09-03 22:50:58 -04:00
Sven Eberhardt 9e6f7896ac Make MouseInput, MouseEnter and MouseLeave public in GUI elements.
They were public in some and protected in other classes and they're also called from several places outside the GUI.
2015-09-03 22:42:29 -04:00
Sven Eberhardt b74750f1cb Fix sound modifier parameter in SoundAt script function.
The modifier was created but not applied.
2015-09-03 21:26:50 -04:00
Sven Eberhardt 20d3de46cd Fix some unused variables. 2015-09-03 21:26:49 -04:00
Armin Burgmeier db29160fea Revert "revert workaround made for #1368, doesn't work on (certain) Intel chipsets. Instead, limit the maximum bone count to 64 so to meet the limit of 1024 uniform components by certain graphics cards (#1285)"
This reverts commit f57bfa089c.

This was committed by mistake. Fixes #1375.
2015-09-03 20:38:53 -04:00
Clonkonaut 5f4978d3e6 S2Fix 2015-09-03 20:04:56 +02:00
Maikel de Vries 12e1156fd3 graphics for wealth goal 2015-09-03 17:45:36 +02:00
Maikel de Vries acf62234ce add icon for arrows 2015-09-03 17:44:45 +02:00
Julius Michaelis 2b004e637b Fix 2a9b481: Add forgotten ! that broke rope bridges.
(and probably some other stuff)
Thanks to Maikel for reporting it!
2015-09-03 15:39:52 +09:00