80c07d34e4
Add [Landscape] Secret to Scenario.txt to default-disable black NO_OWNER viewports
...
Related to: c569036d1d
2017-01-24 18:50:30 +01:00
b51dbc3717
Fix duplicate static definitions in Hot Ice
2017-01-21 21:31:57 -05:00
1586ff9635
Remove difficulty from I am rich Scenario.txt
2017-01-15 17:57:18 +01:00
0fd9d1f40b
Updated descriptions for scenario: I am rich
2017-01-07 18:40:28 +01:00
daf23b9b32
New scenario: I am rich
2017-01-07 18:19:52 +01:00
4b33beb9db
MoltenMonarch: Clean code
...
The king size weapons overloaded entire functions from their original objects. This was replaced by adding interfaces that allow for the manipulation of the desired values.
2017-01-07 02:21:22 +01:00
db9451dcce
MoltenMonarch: Fix musket/blunderbuss
2017-01-07 02:10:00 +01:00
dfc4483ae9
Hideout: Fix typos
2017-01-07 01:35:08 +01:00
80b3ceb560
Hideout: Make code more readable
...
Avoiding duplicate code.
2017-01-07 01:33:46 +01:00
df031f600e
Hideout: Fix warnings (shadowing local variable e), clean code
2017-01-07 01:09:55 +01:00
68ddeb3bed
Convert all text files in planet to UTF-8
2016-12-11 21:19:13 +01:00
d356d9db3d
Fix inherited() calls
...
The ... operator should be added so that the parameters are passed down. In some cases even the named parameters were not passed down.
2016-11-26 18:57:31 +01:00
0e76c85531
make line overlap check a global function
...
This avoids code duplication and really is a Math.c function.
2016-09-24 17:30:19 +02:00
e18cee3a46
turn musket into blunderbuss
...
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
2016-08-22 16:32:48 +02:00
45bb9ab550
rename lead shot to lead bullet and clean up script
2016-08-22 16:32:47 +02:00
bce903ee04
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
2016-08-13 23:42:59 -04:00
e5d90c90c6
HotIce: Balloon spawn added for extra fairness.
2016-08-08 18:25:52 +02:00
00ee209eca
Hot Ice: Handicap teams with more players
...
In every team, the same number of players will now load their grenade
launcher before the round starts. If there's a team with more players,
some players won't be able to shoot immediately.
2016-08-07 13:56:04 +02:00
534e4cc745
Merge branch 'master' into qteditor
...
Conflicts:
src/script/C4AulParse.cpp
2016-07-24 10:23:57 -04:00
e06d3a89eb
HotIce: Open sides at lava level ( #1792 )
2016-07-20 21:24:34 +02:00
36685a3119
Add HideInCreator=true to internal/helper/library definitions
2016-07-10 22:06:48 -04:00
98dc6fa252
Fix Bug #1742
...
Fixed and tested other problems in tutorial 3 and 4, too
2016-06-01 20:40:26 +02:00
1df322b7ff
adapt objects and scenarios to new component implementation
2016-05-21 13:34:34 +02:00
72c7e4dd87
Merge remote-tracking branch 'origin/master' into liquid_container
2016-04-23 11:10:26 +02:00
250bbf9aa2
Hot Ice: Make use of LoadScenarioSection improvements
2016-04-18 23:05:13 +02:00
b6b5f5a79f
Merge branch 'master' into liquid_container
2016-04-11 21:23:28 +02:00
1ae5e601e4
add blast sound variations by K-Pone
2016-04-10 13:09:25 +02:00
83f3efb5da
Hot Ice: Change default configuration to small/explosive/7
2016-04-06 23:10:56 +02:00
dbe913aeab
Hot Ice: Leading team has to win last round to win
2016-04-06 21:45:02 +02:00
be9bdc6c14
Hot Ice: Fix victory timeout
2016-04-06 21:45:02 +02:00
0d21b0b12d
Hot Ice: Fix movement/fire carrying over from previous round
2016-04-06 21:45:02 +02:00
bc9538200c
Merge branch 'master' into liquid_container
2016-03-29 20:06:14 +02:00
fb761fbd58
Removed parentheses after 'this'.
2016-03-29 18:17:05 +02:00
dd7bf3e89e
Merge remote-tracking branch 'origin/master' into liquid_container
...
Conflicts will be merged in the next commit:
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/PipeLine.ocd/Script.c
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c
2016-03-25 17:15:39 +01:00
b50a059350
Hot Ice: Add a countdown before the round begins
2016-03-18 18:11:17 +01:00
2236d4fa4a
Hot Ice: Allow scrolling while waiting for the next round
2016-03-09 21:29:42 +01:00
3b039f8342
Hot Ice: Add scoreboard
2016-03-09 21:08:14 +01:00
d2836bb70a
Hot Ice: Add option for multiple rounds
2016-03-09 00:32:02 +01:00
7a1b7d6258
Merge 'master' into liquid_container
2016-02-27 12:51:11 +01:00
65d6dd76a3
Meltign Castle: Fix item spawn after 4 minutes; add restart rule.
2016-02-21 17:36:29 -05:00
e87ad1ecc1
MeltingCastle: Rebalance for slightly less rushing.
2016-02-21 16:31:20 -05:00
9d17cff91e
Refactoring: Removed old barrel functions
...
Replaced old barrel functions with the liquid container library calls
2016-02-16 21:01:59 +01:00
a69958554f
Melting Castle: Add IceWallKit spawn
...
To promote more waling attacks and walling defenses.
2016-02-13 10:43:42 -05:00
5f895c14fc
Materials: Fix misspelling of "Incendiary" ( #1680 )
...
The wrong spelling will still be accepted as a material value, as long
as no value with the correct spelling exists.
2016-02-09 23:45:02 +01:00
c9d3cd7417
Add MeltingCastle team melee
2016-02-07 17:21:14 -05:00
43451a4242
HotIce: Lower spawn position on explosive mode with small islands
2016-02-06 20:40:44 -05:00
beaf214a8f
Hot Ice: Add grenade launcher mode
2016-01-31 16:52:01 -05:00
1bb78ecd4f
Remove some unnecessery animation weights.
...
These overwrite the animations in their slots while there are no other references to existing animations in the slot.
2016-01-28 23:47:53 -05:00
f2e99ced16
HotIce: Reduce Fire arrow stack count in chests
...
Fire arrows were dominating the game too much. This should put more emphasize on the other weapons.
2016-01-23 23:27:08 -05:00
79e26a3f64
HotIce: Fix division by zero when starting with one player.
2016-01-23 23:25:48 -05:00
7b7b791442
Add [Game] Mode to parkour and arena scenarios to fix league evaluation.
2016-01-23 21:26:13 -05:00
418964f6e8
Hot Ice: Spawn and map improvements in "small islands" mode #1623
2016-01-17 12:22:20 -05:00
a0f3bed4d1
add new shape and normal textures to hideout.ocs
2016-01-16 16:57:15 +01:00
b5e1afec3c
add shape textures to Amethyst, Ruby, Firestone, Gold, Everrock, Ore and enhance shape textures of Granite and Rock.
...
* move ruby texture phase by 50% so ruby and amethyst do not look like the same material with a different color when next to each other so much
2016-01-16 16:57:15 +01:00
56fa4c2c5d
DarkMine+Maze: Ensure free spawn position #1578
2016-01-10 22:07:23 -05:00
1ba1164d8e
fix typo in dark mine string table request
2016-01-09 20:17:26 +01:00
fd1c58db0d
Hot Ice: Clonks have lower energy; iron bombs instead of swords in chests.
2016-01-09 15:09:12 -04:00
1eebe15fa1
dark mine: king of the hill as scenario option
2016-01-03 16:01:37 +01:00
a6344d0f1a
dark mine: add deathmatch option plus some small improvements
2016-01-02 21:54:56 +01:00
683a6df0c4
Molten Monarch: some performance improvements
...
Search less often. Search for less. And use the proper inventory interface.
Before (first number is relative to MovingBrick.FxMoveVerticalTimer, because that's relatively constant (I guess?)).
59x 00826ms Global.FxBlessTheKingTimer
38x 00537ms Global.FxDeathByFireTimer
1x 00014ms MovingBrick.FxMoveVerticalTimer
After
41x 00328ms Global.FxBlessTheKingTimer
27x 00213ms Global.FxDeathByFireTimer
1x 00008ms MovingBrick.FxMoveVerticalTimer
2016-01-02 10:49:26 +01:00
c0befc6ba0
Remove C4RTF
...
The only use of C4RTF in its final moments was parsing out plain text
from RTF files anyway, so why even go to all the trouble instead of just
storing plain text in the beginning?
2015-12-29 17:51:43 +01:00
5a02cd049f
replace BrickEdge object with triangle drawing function
2015-12-28 10:21:50 +01:00
5d6773b656
Adjusted firing power for weapons.
...
Bow, Grenade Launcher and Javelin use a local variable shooting_strength to determine range. No change here but I need this.
2015-12-21 21:08:15 +01:00
915c3b13af
Thunderous Skies: Play "Pop" sound when target balloon is hit.
2015-12-20 19:02:11 -05:00
dcfb986e34
moved sounds into subfolders
...
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
278584578f
scorched gardens: tune down meteor effects (and increase BAM)
...
Because otherwise the map is completely smoked all the time.
2015-12-13 20:48:02 +01:00
cfae622ba7
scorched gardens: eliminate obvious camping locations for players
2015-12-13 20:48:02 +01:00
848471502f
scorched gardens: disallow "Deathmatch" goal (in favour of Last Man Standing)
...
Most kills do not count in this map or are suicides or environment-kills. The round is currently nearly unplayable as Deathmatch as it takes an eternity (also due to penalty points).
2015-12-13 20:48:01 +01:00
b40fb83268
Move Breathing.wav and sound credits from Arena.ocf to main sounds file.
2015-12-13 09:31:31 -05:00
bf63f2ef17
Gidl+Windmill moved to new "Defense.ocf" (title picture missing)
...
They aren't quite fitting at the moment and Clonko wants to share the buy menu.
2015-12-12 12:06:25 -05:00
7f6c13084a
Register definition-local sounds into definition namespace (id::Soundname) #1185 .
...
Also move all object sounds to global Sound.ocg so they are still played.
This is to prevent naming collisions. All sounds are moved because otherwise all scripts would have to be adjusted. Also, the distinction between sounds in definitions and sounds in Sound.ocg was rather arbitrary.
It will also ensure most sounds are reloaded when sound is turned off temporarily, although that should better be fixed properly.
2015-12-07 00:08:24 -05:00
2bc40963c0
Hideout: added spawning effect
...
The Clonks' positions are now a bit random, too. I doubt that will have a noticable tactical influence on the game.
Buut it probably looks cooler when the effects are not all in one place.
2015-12-02 22:43:56 +01:00
987d13bcae
hideout: moved flag bases 4px higher
...
They were in the ground. Now the aren't.
2015-11-29 19:40:30 +01:00
ccb9783e43
made capture-the-flag flags brighter
...
They are the most important item of their respective rounds. They need to stand out from the background as well as possible.
2015-11-29 19:39:57 +01:00
8669bd1cb2
thunderous skies: wind channels accelerate objects only into one direction
...
This prevents tumbling Clonks from remaining "stuck" in the wind channel for a long time with some bad luck (which probably happened at least once per round).
The change also increases the speed that objects receive when being thrown into the channel - but from short testing it didn't look bad.
2015-11-27 20:21:35 +01:00
8db90a341b
moved Windmills.ocs from Arena.ocf into Missions.ocf
...
Being in "Arena" was a relic we had from 2009 where we only had arenas.
2015-11-13 18:54:11 +01:00
2b904cc3c9
Enabled teams in Hot Ice.
2015-11-02 18:46:34 +01:00
27b19fe70e
Fixed some scenario descriptions.
2015-11-02 18:41:09 +01:00
6560b282a0
Fixed map issues in Molten Monarch.
...
Removed granite at the lower right spawn point so clonk won't get stuck.
Because there was no background map, the moving platforms removed the material if earth pixels landed on them.
2015-11-02 18:27:30 +01:00
1178d8f0ce
Prevent dead clonks from sitting upright ( #1358 ).
...
Also added convenient constants defining the animation slots to use for clonk animation.
2015-10-11 14:08:14 +02:00
d136dc22c0
Implement landscape inflammation.
...
It used to create the non-existent FLAM objects from the engine. Use a script callback to a global function that creates Flame objects instead.
2015-10-09 16:24:16 -04:00
1354c0fd91
split ProjectileHit up into three functions
...
This better reflects what the function does. "ProjectileHit" was never used solely for projectiles. Neither was everything of that callback ever needed in all places, which resulted in weird flag-parameter hacking and OnStrike-callbacks. Splitting this up also allows customizing different parts of the behavior further (i.e. tumbling) without adding a hundred parameters or flags to the original function.
2015-10-07 07:25:24 +02:00
f84e251ad9
Windmill.ocs: remove sky Y offset ( #1417 )
2015-10-05 19:47:05 -04:00
651dadccb2
Convert hat and windmill rocket meshes to new coordinate space
...
Also, convert them from XML to binary meshes.
2015-10-05 18:55:12 -04:00
445147a0f3
Fixed typo in TEXMAP
2015-10-05 23:53:17 +02:00
b601ecd96f
Fixed various issues in Guardians ( #1270 ).
...
- Changed arrow blit mode to GFX_BLIT_Additive (see bug #1416 ).
- Bigger sky, so no tiling at the bottom (but still at the top, see bug #1417 ).
- Windmills do not show light bulbs.
2015-10-05 14:16:37 +02:00
3300f6f80d
Do not redefine constant ProjectileHit_tumble.
2015-10-05 02:03:16 +02:00
0aab3cf4e6
Added new material textures by Nachtfalter and Matthi.
2015-10-05 02:02:36 +02:00
41742219d1
Remove obsolete ColorAnimation values from materials
2015-10-03 11:56:54 -04:00
b8ed577c0f
Rotate the OGRE coordinate frame by 90 degrees in X
...
Also rotate all meshes backwards so that everything keeps working. This should
make it more convenient for modellers to create new meshes.
See http://forum.openclonk.org/topic_show.pl?pid=29410#pid29410 .
2015-10-03 11:39:08 -04:00
4c66cc4ad7
change time interface to remove connection between System.ocg and Objects.ocd
2015-09-22 23:31:17 +02:00
cc6985dd78
Reduce starting material in HotIce to fit in default inventory slots (5).
2015-09-05 20:37:13 -04:00
ac738735b2
Merge branch 'master' into Controls
...
Conflicts:
planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
src/game/C4Game.cpp
src/game/C4GraphicsSystem.cpp
src/gamescript/C4GameScript.cpp
2015-09-02 08:19:34 +02:00
30857e835e
Shader gamma implementation
...
In comparison to the old system, this is a downgrade - instead of being
able to set a full color mapping by gamma ramp, we now get just a value
per colour channel.
Upside is that we do not need to play around with the global gamma ramps
any more, which was arguably the wrong way to do it.
This commit will likely break everything that has been using gamma so far.
2015-08-31 17:35:08 +01:00
ddd49f9b31
add lantern and smoke bomb as weapons to dark mine
2015-08-22 19:34:12 +02:00
a61a91798b
move DrawMaterial to map library functions
2015-08-18 12:36:59 +02: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
7ef3e9c13e
add some title images for scenarios
2015-06-12 21:43:17 +02: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
d3b38b3bbd
option to choose goal in scorched gardens
2015-05-10 19:41:44 +02:00
Julius Michaelis