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

83 Commits (92ed1537a0e79facded3c81f50f7767962d70d6f)

Author SHA1 Message Date
Sven Eberhardt b29631f003 Make relaunch weapon selection menu unclosable #1577 2016-01-11 22:02:48 -05:00
Sven Eberhardt f54a49d044 Resource goals: Reduce display of available resources by 10% to better match actually mined gems. 
Some material always gets lost on blasting/pickaxing.
 2016-01-10 13:41:04 -05:00
Maikel de Vries 97cc3dd901 arena goals: pass whether it is a relaunch to OnPlayerRelaunch callback 2016-01-02 21:53:43 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders 
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
 2015-12-13 22:14:55 +01:00
Sven Eberhardt 40f46403ba Move sound author attribution from Objects.ocd into main Sound.ocg (where the sounds now reside). 2015-12-13 01:09:48 -05:00
Sven Eberhardt 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
David Dormagen 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
Clonkonaut b9da09de4e Krakatoa: Show goal icon depending on difficulty setting. 2015-10-12 22:53:42 +02:00
Clonkonaut 4443298b6d Goal icons added to Krakatoa and Chine (#1142). 2015-10-12 22:30:11 +02:00
Armin Burgmeier 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
Sven Eberhardt 7211ee171f Follow view of dead clonk for two seconds before respawning with base respawner (#1390). 2015-10-03 02:23:35 -04:00
Maikel de Vries 2dde6fd600 move flag coordinate in area check into flag's script 
This allows also for using rectangular ownership shapes, which can be useful for blocking areas.
 2015-09-14 20:58:13 +02:00
Maikel de Vries 12e1156fd3 graphics for wealth goal 2015-09-03 17:45:36 +02:00
David Dormagen 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
Armin Burgmeier 0cdafc278b Transform all mesh data to Clonk reference frame on load 
Instead of doing the transformation when drawing a mesh. This allows making
the OpenGL normal matrix more consistent, since it does not include the
Ogre-To-Clonk transformation, and so that the transformation does not need
to be inverted in the shader.

As a side effect, all Attach transformations were updated, since before
they were specified in the OGRE reference frame, not the Clonk reference
frame.
 2015-08-18 20:30:20 -04:00
Maikel de Vries 3a6bcaafb6 use new script gui for goal and wealth HUD 2015-06-03 22:36:36 +02:00
David Dormagen 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
Maikel de Vries a0f95c0e93 add global function to get players in a team 2015-06-01 18:52:58 +02:00
Maikel de Vries 54a5c5b672 parkour: players respawn at best team checkpoint 2015-05-18 20:14:29 +02:00
Maikel de Vries 3a4c3c1d26 five new goal graphics thanks to Foaly 2015-04-02 19:07:49 +02:00
David Dormagen ca682b7fc3 removed several old menu objects and added a replacement menu with the new GUI system 2015-03-20 18:07:37 +01:00
Maikel de Vries 346d5cd709 another batch of Graphics.png removals 2015-02-15 22:37:08 +01:00
Sven Eberhardt 49c5b22591 Remove some empty graphics files. 2015-01-17 18:22:06 +01:00
Mark d7a88eea62 Use CreateObject() in scripts (#1214) 
Objects with id Rule_*, Goal_*, and Environment_* are created with CreateObject() now.
 2015-01-11 19:04:42 +01:00
Mark 850bf1b9d4 CreateObject/CreateObjectAbove (#1214) 
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
 2015-01-11 19:02:03 +01:00
Maikel de Vries e9513218bf add relaunch count to relaunch callback in last man standing goal 2015-01-10 10:04:26 +01:00
Sven Eberhardt 89c3f79398 Maze (Heart of the Mountain) parameters for map size and coop/race mode added. 
Medium (default) size is a bit smaller than the previous default, because the map got a lot harder due to fog anyway.

Also removed superfluous Landscape.txt.
 2015-01-04 15:55:23 +01:00
Sven Eberhardt 369262f423 Ignore fog of war on parkour checkpoints (#1203). 2015-01-01 21:04:51 +01:00
Sven Eberhardt cc17194a2b Ignore fog of war for parkour goal direction arrow. 2015-01-01 20:46:47 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Maikel de Vries 3e48809c20 removed unused var effect in expansion goal 2014-10-24 20:24:13 +02:00
Maikel de Vries 4dfc9f181a fixed saving of resource goal 2014-08-23 11:32:35 +02:00
Maikel de Vries 573ca24e8e decrease lag caused by expansion goal 2014-08-17 16:36:33 +02:00
Maikel de Vries 4967b07a39 Iron Peak game goal is now metal production and expansion 2014-07-06 18:13:09 +02:00
Maikel de Vries a08b5bcdb8 added construct gold idol goal to GoldRush.ocs 2014-07-06 17:27:03 +02:00
Maikel de Vries aa4d34549d added construction goal 2014-07-06 17:24:30 +02:00
Clonkonaut 964e1a138a Deathmatch goal ends game when all but one player (or team) leave (#893). 2014-05-02 00:01:21 +02:00
Maikel de Vries 2cf42422b4 Improved information of SellGems goal 2014-02-23 17:15:39 +01:00
Maikel de Vries c075103bb9 Added GetDescription to all goals 
This will be used by the new HUD on the controls branch.
 2014-02-17 20:41:02 +01:00
Sven Eberhardt 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
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 30619ae7fd removed unused particle definitions & cleaned up Particle.txt of LightningBolt particle 2013-11-28 23:44:24 +01:00
David Dormagen 6844cbbc71 changed DrawParticleLine to use the new particle system 2013-11-28 23:27:56 +01:00
David Dormagen 328bf6d330 updated ParkourCheckpoint to use the new particle system; renamed "PSpark" to "SphereSpark"; moved CheckPoint/PSpark to Effects/PSpark 2013-11-26 21:25:00 +01:00
Tobias Zwick 064166d09e make most sound effects mono 2013-05-26 17:42:37 +02:00
Martin Plicht a915cdb15f Make Eclipse happy by changing some zeros to nils and stuff 2013-05-26 00:01:08 +02:00
Maikel de Vries d5dec949b2 Fixed position of the flag in CTFs 2013-05-23 14:36:21 +02:00
Sven Eberhardt 359b5df806 Moved from experimental scenarios to main objects: Wall kit, gems, gem goals, reduced pickaxe strength (can't pick granite) 2013-05-16 16:50:34 +02:00
Sven Eberhardt 924b0b46fc Fix parkour checkpoint count display in scoreboard title (#941) 2013-03-29 15:45:14 +01:00
Sven Eberhardt fef5605217 Parkour goal: Added function to disable respawn. 2013-02-06 01:11:08 +01:00