08ae643c2c
Add a draw mode which shows the background 8-bit surface
2015-08-04 21:21:24 -04:00
92f3a3e749
Remove GBackIFT in favor of a lookup in the background surface
2015-08-04 21:21:23 -04:00
36544bd56c
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
planet/System.ocg/FindLocation.c
2015-08-02 19:24:04 +02:00
0d48105b46
Added shape library.
...
Also fixed some coconut tree reproduction issues.
2015-07-31 00:42:01 -04:00
5f63e9d4b3
Skip mission access check in debug builds
2015-06-30 22:08:37 -04:00
196f528201
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
src/game/C4Game.cpp
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
9968b0000c
custom GUIs: restrict the maximum size of a menu window to 100em x ~62em
...
Fullscreen GUIs on wide-screen monitors look stupid. This patch tackles this by restricting the maximum size to something that can still be seen with a glance.
For very high-DPI or low-DPI screens, the user would most likely adjust the font size in the options (todo) anyway and thus also change the maximum menu size.
2015-03-27 11:33:57 +01:00
5562b09dc4
Remove a lot of disabled legacy code, round 2
...
Maybe at some point we'll be rid of all the commented-out code that
nobody has looked at in years.
2015-03-25 20:02:53 +01:00
d07893dadc
fixed player names, clonk names and selector info being zoomed ( #687 )
2015-03-22 09:58:43 +01:00
e21a5bdd44
Rename BoundBy to Clamp
...
"BoundBy" sounds like a predicate. "Clamp" is a common function name for
the operation in graphics processing, so it should be familiar to users.
2015-02-12 23:05:55 +01:00
91fdb82720
Remove dupliocate sound loading.
2015-02-07 14:01:15 +01:00
a237caa467
Save config to disk at round end ( #1260 )
...
This should ensure that MissionAccess gained in this round is always saved even if a crash happens during scenario shutdown or in a following round.
2015-02-03 22:49:55 +01:00
b00ff573cd
Fix leaked light and some possible dead pointers on game end and section switch.
2015-01-25 18:39:34 +01:00
5e365e5236
Remove deprecated evaluation of CNMT rule in engine.
2015-01-25 14:35:18 +01:00
3d59e77f48
Do object post-load actions after global prop list denumeration. ( #1240 )
...
Post-load would access the action proplist which might have a non-denumerated prototype.
2015-01-21 23:18:07 +01:00
8dddbe5a10
Allow definitions without graphics.
2015-01-17 18:10:21 +01:00
bd04722553
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
src/game/C4GraphicsSystem.cpp
src/game/C4GraphicsSystem.h
src/game/C4Viewport.cpp
src/gui/C4GameMessage.cpp
2015-01-15 19:57:01 +01:00
f351e903ee
Don't reset gamma with uninitialized graphics
...
When OC fails while in startup code, resetting the gamma ramp was trying
to use an uninitialized C4Draw, which would result in writes to invalid
memory.
2015-01-15 16:00:01 +01:00
f2830311a6
Fix crash on scenario section change ( #1221 )
2015-01-14 12:03:05 -05:00
f9369f9eb4
Different implementation of CreateObject() ( #1214 )
...
CreateObject() now does not reposition an object after it has been created, but rather grows it around the center of said object.
To that end a new parameter has been added to DoCon() and SetCon() and the documentation has been updated.
2015-01-13 21:03:27 +01:00
10b343dba9
Append and include skeletons ( #1180 )
...
Appending and including skeletons works now. Documentation updated.
Skins such as appendto.Clonk.Farmer.skeleton are handled as if the skin name were not included: appendto.Clonk.skeleton
This also changes a bit the structure of how meshes are reloaded in general,
in particular mesh materials are only reloaded once and not once per
C4DefGraphics instance. (Fix crash on reload with included skeletons, cherry picked from commit 2f69aa4850ab7a4b621e5f30cbc537d40f32c0df)
Fix linking of C4Script standalone tool (cherry picked from commit b03a332b73463b378c94e4e92b66d45b923b3b9c)
2015-01-06 18:25:08 +01:00
f5ecd4776d
new function SetLightRange (replaces SetPlrViewRange)
2015-01-02 01:06:00 +01:00
2f08918393
Add FoWEnabled entry in Scenario.txt [Game] section ( #1178 )
2014-12-29 12:29:43 +01:00
f89b8c8319
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/System.ocg/ClonkControl.c
src/gui/C4MouseControl.cpp
src/landscape/C4PXS.cpp
2014-12-25 15:24:19 +01:00
4981182cf8
Merge remote-tracking branch '_origin/master' into lights
...
Conflicts:
src/c4group/C4Components.h
2014-12-15 21:16:40 +01:00
d59b1e5e5b
reduce version numbering from x.y.z (x does never changes) to y.z
2014-12-12 21:57:52 +01:00
b641650443
Do not fade out music on scenario section loading.
...
Instead, scripters can use SetPlayList() or Music() to fade music by script if desired.
2014-12-09 23:48:19 +01:00
7a8778acca
Make sure graphics resources are loaded before drawing anything
...
This was not required before, but now most drawing operations require
the shaders to be loaded from Graphics.ocg. Therefore, move the graphics
resource loading earlier in the startup sequence, and make sure we don't
initialize the message board prematurely in OnResolutionChanged().
2014-12-06 17:16:36 -05:00
bbe01335d9
Fail scenario saving if object saving returned nil ( #1182 ).
...
This usually means there was a script error in the scenario saving function. Better abort instead of overwriting the existing scenario with garbage data.
2014-12-06 22:45:38 +01:00
baf05264d1
Implement music fading.
...
Moved music system execution from game tick execution into main application execution so music fading works when the game is paused or lagging.
2014-12-06 18:04:55 +01:00
b310369b64
Initialize C4Game::CheckObjectEnumeration()::Check::maxNumber in ctor.
...
MSVC2012 build fix.
2014-10-26 20:44:06 +01:00
e05bdfbcb4
C4Game: Refactor CheckObjectEnumeration to not use manual list traversal
2014-10-25 21:26:07 +02:00
03f43f462b
C4ObjectList: Replace trivial cases of manual list traversal with iterator usage
2014-10-25 21:25:52 +02:00
6476b0b026
Script GUIs: fixed saving & loading
2014-10-23 23:29:14 +02:00
c09e9880e2
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-10-13 18:54:05 +02:00
2a78b77bda
renamed C4GuiWindow to C4ScriptGuiWindow to increase expressivness and reduce similarity with C4Gui*
2014-10-13 18:48:03 +02:00
049088be78
CustomGUIs: major rework of layouting & controls; better integration of C4GUI
2014-10-11 11:29:02 +02:00
7319f7b3cc
rewrite of C4GuiWindow to use C4GUI stuff wherever possible
2014-10-05 16:46:14 +02:00
c86ea9ad53
Reset gamma ramp in game deinitialization ( #1114 ).
2014-10-03 23:42:39 +02:00
828eb7f82a
Don't save ControlTick and SyncRate in network savegames ( #1058 ).
2014-10-03 23:12:55 +02:00
952f06b173
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
2014-09-29 11:47:09 +02:00
3fc1f02c6d
Implement custom scenario parameter selection in startup scenario selection dialogue and by command line.
2014-09-27 16:05:32 +02:00
378bda5546
Added custom scenario parameters (SCENPAR_*).
...
Can currently only be set in network games in the lobby. In the future, maybe we can find a place somewhere in the scenario selection dialogue.
2014-09-23 23:02:52 +02:00
5722339e83
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
src/gamescript/C4GameScript.cpp
src/gui/C4GameMessage.cpp
src/gui/C4Gui.h
src/gui/C4GuiDialogs.cpp
src/gui/C4GuiWindow.cpp
2014-08-13 11:52:41 +02:00
5cd9b915b0
Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics.
...
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
2014-07-05 15:25:30 +02:00
bf0d6b7176
Reactivated EditCursorModeToggle key (formerly Space) now set to no key.
...
Can be set in KeyConfig.txt as requested by Sven2.
2014-05-01 01:17:58 +02:00
22016e075f
Replace some usages of C4ID with C4Def*
...
In particular those that made the c4script shell depend on C4Id.cpp.
2014-04-19 19:02:22 +02:00
506d94806b
Space is no longer a hotkey in developer mode.
...
It's used as a regular key now and that has been a real hassle. The hotkey wasn't very useful on top of that.
2014-04-15 21:48:42 +02:00
405fc4f841
Fix dedicated
2014-04-02 20:53:12 +02:00
06ac00ace8
Merge branch 'master' into Controls
...
Conflicts:
CMakeLists.txt
Makefile.am
planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
src/control/C4Control.cpp
src/control/C4Control.h
src/gamescript/C4GameScript.cpp
2014-02-15 14:44:57 +01:00
84600bef53
Auto-collect firestones if picked free and there's free space in inventory (same as for shoveling).
2014-01-22 21:46:50 +01:00
57463b61c4
Rework SolidMasks to be defined in a separate SolidMask.png graphics file instead of the main definition graphics.
2014-01-08 01:55:33 +01:00
4e656912f1
Fix loading of Objects.c when returning to main section from another scenario section
2013-12-29 17:46:45 +01:00
5094cc5c1b
Reworked "Save as scenario" option in editor to write a script file instead of Game.txt.
2013-12-27 17:10:09 +01:00
e0dc30c59a
Update copyright notices
...
As discussed in http://forum.openclonk.org/topic_show.pl?tid=2917 , I
have merged all copyright notices into a single file and referenced that
merged file from each source file.
For the updated source files, the timeline has been split into three
parts:
1. Pre-RWD code (before 2001)
2. RWD code (2001 through 2009)
3. OpenClonk code (2009 and later)
All pre-RWD copyright notices have been left intact, as have RWD-era
copyright notices where the file did not have a RedWolf design copyright
notice but only individual author ones. All copyright notices of the
OpenClonk era have been replaced by a single notice ranging from the
first recorded year to the current year (2013). Mape code did not get a
OpenClonk Team copyright notice because it is somewhat separate from the
main OpenClonk codebase and has only been touched by Armin Burgmeier.
2013-12-23 13:03:19 +01:00
a10c9316ef
renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle
2013-12-17 22:32:01 +01:00
02f54ba1eb
removed the legacy particle system from the engine and docs
2013-12-17 22:32:01 +01:00
325053410f
rename script callback UpdateTransferZone to OnSynchronized ( #220 )
2013-12-17 23:16:11 +07:00
25ddb14dca
Rework prop list renumbering on section load (again).
...
Turns out changing prop list numbers while they are still indexed by number in the hash map was a bad idea. Existing prop lists are now de-numbered, pushed to an external shelve and re-numbered when added after section load.
2013-12-15 15:46:18 +01:00
1cca6fd1ad
Rework section load again.
...
Now clears numbers of all existing proplists and renumbers them after loading. Fixes some assertions and duplicate numbers during loading.
2013-12-15 14:06:21 +01:00
29d1b4846a
Fix scenario sections
...
Inactive objects got removed and calling section load from global effects caused a crash.
2013-12-14 18:16:39 +01:00
ecf538cd1f
refactor: consistently use time_t t... variables for times in sound system, stats, application and player controls
2013-11-29 14:16:14 +07:00
395f4c94b0
Reset gamma ramps after game ( #842 )
2013-11-09 17:11:29 +01:00
4ebf67754c
Move C4ComponentHost::LoadEx to C4Language
...
To make C4ComponentHost more reusable, move C4Language dependencies out
of the class.
LoadEx isn't really suited to reside in C4Language, but it's better to
have it there, since all C4Language consumers also use C4ComponentHost;
the reverse isn't true.
2013-10-29 21:32:21 +01:00
e753bf8168
Replace ResTable with a proper dictionary
...
ResTable (the main system string table) was a home-grown hashmap that
did not cope with collisions at all. Since we already have a proper
dictionary in C4LangStringTable, use that instead.
2013-10-19 19:28:54 +02:00
c55888f7c3
CStdFont: Encapsulate iLineHgt
2013-10-18 22:30:02 +02:00
91f8d32d69
debugger: Make it work again (some issues remaining, setting breakpoints on included scripts is questionable and listener socket setup sometimes hangs..)
2013-10-13 23:03:25 +02:00
fc3aaab835
dynamic particles: more code cleanup and fixes
2013-10-09 01:29:12 +02:00
dc574ff76b
dynamic particles: use event based waiting in favor of Sleep()
2013-10-07 23:37:01 +02:00
8025e7c2b0
the dynamic particle system now runs the calculations in a different thread
...
added PV_KeyFrames
2013-10-07 20:56:49 +02:00
40b66d1c76
added (early demo of) new particle system which should both be faster and more flexible than the old one
2013-10-07 20:56:49 +02:00
e31a207330
Added message board command: /screenshot zoom
...
Creates a whole map screenshot at given zoom level. Use carefully; files can become pretty large!
2013-09-20 23:50:19 +02:00
7e70554a04
Use control packet for more editor mode actions
...
Actions changed include dropping definitions, (de-)selecting objects,
player elimination. This removes some more pre-assembled C4Script code
going across the network unchecked.
Part of #936 .
2013-09-04 17:51:55 +02:00
ba84fc7c4b
Fix internal marker for FindObject searches and CrossCheck using shapes.
...
Before, the marker would be reset in every frame, but object markers and main counter weren't reset consistently at the same time. This could cause some objects to be not found if their markers were set after the object marker reset but before the main marker counter reset.
2013-08-10 23:21:26 +02:00
9027544c37
Merge branch 'master' into Controls
2013-06-04 20:13:35 +02:00
405453aed3
Merge branch 'debugrecoption'
2013-05-31 14:39:16 +02:00
7eaef70af1
Merge branch 'master' into Controls
...
Conflicts:
planet/System.ocg/PlayerControls.txt
2013-05-26 18:19:51 +02:00
dd1e2e2709
made GuiWindowRoot a member of C4Game
2013-05-26 18:12:03 +02:00
61ee6d393f
Correct the scancode numbers for windows
...
Also reduce the duplication of these numbers in C4Window.h and C4KeyboardInput.cpp.
2013-05-26 18:07:09 +02:00
524fe879aa
Make DEBUGREC define a commandline option
2013-05-25 22:51:32 +02:00
003e29f223
enable loading Title.jpg for scenario (folders)
2013-05-25 20:48:14 +02:00
337126fcb9
renamed MenuWindow to GuiWindow
...
added HP-Bar-test to MenuTest.ocs
bugfix
2013-05-09 13:28:45 +02:00
9ad9a67939
Merge branch 'master' into Menus
...
Conflicts:
src/script/C4StringTable.cpp
src/script/C4StringTable.h
2013-04-07 23:02:36 +02:00
57e63a5275
Added support for scripted maps (Map.c) and documentation.
2013-03-19 00:36:06 +01:00
5483072726
8f429dc50fc9b46afb/USE_CONSOLE MissionAccess: do it right.
...
/bin/brain not found
2013-03-03 19:41:23 +01:00
b23243124f
8f429dc50fc9b46afb/USE_CONSOLE MissionAccess: do it right.
2013-03-03 19:29:00 +01:00
b31ca73903
Don't check MissionAccess when running as dedicated
2013-03-03 17:32:51 +01:00
d3dba14323
added support for custom menus and dialogs
2013-02-12 20:39:20 +01:00
7357125368
Make C4Material.cpp independent of C4Game
...
This allows compiling and linking with it without pulling in whole
C4Game. This is useful for the mape map editor.
The only place where C4Game was used in C4Material.cpp was in
CrossMapMaterials where the name of the earth material is read from
Game.C4S. The code has been changed such that the earth material name is
now a parameter to the CrossMaterialMap function.
2013-01-14 02:14:39 +01:00
864c5c7ea8
copyright notices update 2012
2013-01-12 16:31:40 +01:00
d5c1cb8c51
Remove some unused variables
2012-12-31 22:03:12 +01:00
7a042ecca5
Do not allow debugger connections in league games.
...
We do not have a league yet and once we do, people might start cheating with customized engines. But at least it shouldn't be that easy.
2012-12-06 17:18:43 +01:00
7967d94a59
Merge StdFont.cpp and C4Fonts.cpp
2012-11-12 02:30:16 +01:00
77479e4f71
Get the window size fresh from the window instead of storing it
...
This makes Application.GetConfigWidth/Height simply return the appropriate
configuration value instead of mixing configuration and state in the same
function. The caller needing the state now uses C4Window::GetSize instead.
2012-10-22 23:15:48 +02:00
e037300801
Fix spelling mistake: ressource -> resource.
2012-10-21 22:20:43 +02:00
b4aafdd874
Remove build number aka C4XVER4
2012-10-18 23:54:50 +02:00
a6d9690afa
Fix Win32/MSVC builds losing sync to due to different order of parameter evaluation when multiple calls of Random() were done in the parameters
2012-10-14 21:02:27 +02:00
8bdd761027
PlayerControls: Allow usage of keyboard scan codes instead of virtual key names using $%x format (Win32 only)
...
Also re-resolves keys if the keyboard layout changed at runtime.
2012-10-09 00:54:34 +02:00
41a33999cd
remove video playback feature
2012-10-04 23:03:57 +02:00
b5d0af513a
remove splash video and option for it
2012-10-02 23:02:52 +02:00
Armin Burgmeier