Commit Graph

6256 Commits (master)

Author SHA1 Message Date
Tobias Zwick ec6f31d5ea Added sounds from Ape, Clonkonaut and Ringwaul from the sound workshop 2009-09-29 20:22:06 +02:00
Tobias Zwick 59fac2e516 Added sounds from Ape, Clonkonaut and Ringwaul from the sound workshop 2009-09-29 20:14:08 +02:00
Nicolas Hake 3b965e6dde Backed out dafe315bddff 2009-09-26 22:02:46 +02:00
Charles Spurrill b8a7558b34 Replaced CR hammer graphics 2009-09-26 11:52:17 -07:00
Charles Spurrill e9f72f6b61 Replaced the CR hammer graphics 2009-09-23 21:37:46 -07:00
Armin Burgmeier 778ec7278f Merged default into mesh 2009-09-19 13:13:10 -04:00
Armin Burgmeier 809c2234cd Merged alphafix into default
This reverts the meaning of alpha components everywhere in engine and script.
alpha=0 means transparent, and alpha=255 means opaque.
2009-09-19 12:08:09 -04:00
Richard Gerum d814267a46 added script function CanConcatPictureWith to make the picture stack in the sell menu like in the old engine menu 2009-09-05 18:28:55 +02:00
Richard Gerum 3dcf5002ee fixed clonk contextmenu (still used SetCommand(this...)) 2009-09-05 15:47:19 +02:00
Richard Gerum 3bafed6225 now bases can block entrance of enemies. 2009-09-05 00:57:48 +02:00
Richard Gerum 53b4f9bf29 added new inventory system with slots 2009-09-04 21:46:27 +02:00
Richard Gerum d21f7fff18 added earth chunk and tools 2009-09-04 21:45:44 +02:00
Richard Gerum 5449d22638 added base control object and homebasematerial/wealth control object (use MakeBase() to make a BaseBuilding a base, and use CreateObject(BASM) to activate the homebasematerial control) 2009-09-03 17:00:26 +02:00
Armin Burgmeier 0137936211 Merged alphafix into mesh 2009-08-27 21:52:10 -04:00
Armin Burgmeier 4fa029df2c Merged default into mesh 2009-08-27 21:35:55 -04:00
Armin Burgmeier 4423b5dcb4 Reverted change of Logo.png by previous commit
This was accidentally committed. It was used for debugging only.
2009-08-23 19:43:03 -04:00
Armin Burgmeier 4573315d42 Reverted meaning of alpha: Now 255 is opaque and 0 is transparent
Shader and D3D remains to be adapted yet.
2009-08-23 17:46:56 -04:00
Sven Eberhardt df6010a148 merge 2009-08-12 17:27:43 +02:00
Tobias Zwick 0a86ab4331 crew selector hud - without update, without click functionality 2009-08-12 16:32:38 +02:00
Nicolas Hake 276a5abfed Removed default-this object parameter from a lot of functions 2009-08-12 22:44:09 +02:00
Sven Eberhardt 4b6f1ec264 crash fix 2009-08-11 23:12:36 +02:00
Sven Eberhardt 81e9b612b1 merge main branch into PlrCtrl branch 2009-08-10 16:07:14 +02:00
Armin Burgmeier 6da0846c87 Merged default into mesh 2009-07-27 21:49:33 -04:00
Nicolas Hake 40a3c80093 Planet: Fix syntax errors
Spell aiming had to go unfortunately, because it depended on some stuff
we don't have. Should implement this outside of the main Clonk code though.
2009-07-26 23:16:50 +02:00
Günther Brammer fc5c384681 Material: Remove color field, use textures as is
This also removes ColorByMaterial, which was alread unused in CE and CR.
2009-07-24 23:50:04 +02:00
Tobias Zwick 38df8e085b Sand with a texture 2009-07-23 22:16:50 +02:00
Armin Burgmeier a4d094034d Apply ClrMod to mesh graphics 2009-07-22 21:11:39 -04:00
Tobias Zwick 9adc3e490f Sir, we found gold!! 2009-07-23 01:01:04 +02:00
Tobias Zwick a634cebeab documentation of the functions in System.c4g 2009-07-22 19:04:47 +02:00
Tobias Zwick 0efc4bd8df merge 2009-07-22 16:26:38 +02:00
Tobias Zwick 7155e38ecb more cleanup 2009-07-22 15:27:49 +02:00
Nicolas Hake 9c59007af4 Removed obsolete C4Script functions, moved others to System.c4g
Functions moved to System.c4g:
ExtractLiquid, FlameConsumeMaterial, LaunchEarthquake,
LaunchLightning

Functions removed:
LaunchVolcano, Var, SetVar, IncVar, DecVar, SetLocal, SetGlobal,
ObjectCall, Set, Inc, Dec, GetColor, SetColor

Functions renamed:
GetColorDw -> GetColor
SetColorDw -> SetColor
GetPlrColorDw -> GetPlrColor
2009-07-22 08:48:39 +02:00
Nicolas Hake c7b8eee8b4 Dynamite: Actmap to proplist 2009-07-22 05:59:21 +02:00
Günther Brammer 893cd20109 Merge branch 'proplist' 2009-07-21 16:46:39 +02:00
Nicolas Hake aa744e69d8 Explosion: Use nil instead of 0 where appropriate 2009-07-20 22:41:22 +02:00
Tobias Zwick 10e6174b1f FadeDelay for longer-lasting particles 2009-07-15 15:41:03 +02:00
Tobias Zwick 379bb5b882 Syntax fix & Dynamite fix 2009-07-15 14:50:46 +02:00
Tobias Zwick ba971abc22 Cleaning up: removing obsolete functions and its documentation (part 2) 2009-07-15 14:42:48 +02:00
Tobias Zwick e74c484aa9 Cleaning up: removing obsolete functions and its documentation 2009-07-15 14:41:34 +02:00
Tobias Zwick 4b3357dfd7 The explosion is even a little bit more beautiful (with sparks) ;-) 2009-07-15 12:05:03 +02:00
Tobias Zwick 7375aa4f2e Dynamite from szen.c4s (completely rescripted though) and spark from Hazard 2009-07-15 02:00:26 +02:00
Tobias Zwick fe1fa8e729 renewed explosion: volume-smoke, Hazard-smoke-trails, a little bit better explosion graphic 2009-07-14 18:50:05 +02:00
Armin Burgmeier bbc8fa98db Added animations for mesh objects 2009-07-12 16:27:04 +02:00
Armin Burgmeier 3760771ee5 Read material alpha components in the way clonk needs them 2009-07-11 12:36:53 +02:00
Armin Burgmeier 41f5a3d069 Added Monster as a test object 2009-07-11 01:11:29 +02:00
Nicolas Hake 643eb5ee8c Fixed invalid UTF-8 sequence in LangDE 2009-07-03 02:31:06 +02:00
Sven Eberhardt f34c2d79bc Moving controls to script: Dig + Throw 2009-06-15 22:48:53 -04:00
Sven Eberhardt 943b47ebd5 Moving controls to script: Clonk movement 2009-06-15 20:38:39 -04:00
Sven Eberhardt f6fadb300d Moving controls to script... 2009-06-09 19:29:16 -04:00
Günther Brammer 535bdc92e0 convert game data 2009-05-17 03:50:12 +02:00
Nicolas Hake 979a5362a7 Removed Logo due to trademark concerns 2009-05-10 16:54:46 +02:00
Günther Brammer a973682315 snow and ice textures
committer: Günther Brammer <gbrammer@gmx.de>
2009-05-09 17:19:50 +02:00
Günther Brammer 67bab6723d Initial set of game data
This mainly consists of old Clonk Rage stuff, with some placeholders
and new material textures.

committer: Günther Brammer <gbrammer@gmx.de>
2009-05-09 17:19:46 +02:00
Günther Brammer abe1bad6bd Add a global variable holding a prototype for actions
Either the engine or the script part of this should be replaced later.
2009-04-28 21:45:42 +02:00
Günther Brammer c420a3bf3b C4Value does not store C4IDs anymore
Instead, C4IDs are converted from/to C4PropLists. This will have to change,
of course.

Objects can be created from prototypes which only inherit from C4Def
2009-04-12 14:04:28 +02:00
Günther Brammer b9f398b111 Replace C4ActionDef with C4PropList
C4Object now stores a pointer to a C4PropList instead of the Name and Number
of a C4ActionDef in the ActMap of the Object's definition.
2009-04-12 14:03:14 +02:00