Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-02-25 22:28:51 +0000
committerStijn Buys <ingar@osirion.org>2010-02-25 22:28:51 +0000
commite834941a350c5455f40f5fcad5ecc51b7e2b986d (patch)
tree570cd0e5c8a9f4e2e7f0eb1a289029159ce2320e
parent0ed7301c401d4a9b344e126a3bd70f90e903cfaa (diff)
added fx_sound to entities.def,
minor menu and help file updates
-rw-r--r--base/help/about.txt14
-rw-r--r--base/help/engine.txt6
-rw-r--r--base/ini/menu.ini10
-rw-r--r--gtkradiant/osirion.game/base/entities.def9
4 files changed, 24 insertions, 15 deletions
diff --git a/base/help/about.txt b/base/help/about.txt
index 5eeef4c..33dccaa 100644
--- a/base/help/about.txt
+++ b/base/help/about.txt
@@ -1,13 +1,13 @@
^BAbout
- This is The Osirion Project.
+ This is Project::OSiRiON.
- Programming and game content:
+ Programming:
^BIngar ^N<^Bingar@telenet.be^N>
- Contributions:
- ^BThorn ^BJosky
+ Content:
+ ^BIngar Thorn Megatog615 Supertanker
Thanks to:
^BGareth Minisori DVSoftware
@@ -15,6 +15,8 @@
This game is released under the terms and conditions
of the General Public license version 2.
- Visit the Osirion IRC channel
- ^B#osirion irc.soliter.org
+ The game data is released under the terms and conditions
+ of the Creative Commons Attribution-ShareAlike 3.0 license.
+ Visit the Osirion IRC channel
+ ^B#osirion on the FreeNode IRC network
diff --git a/base/help/engine.txt b/base/help/engine.txt
index bfd7a48..45954ad 100644
--- a/base/help/engine.txt
+++ b/base/help/engine.txt
@@ -7,10 +7,8 @@
^Blist_var^N Lists available configuration variables
Most of the functions and variables have a short description of
- their own.
-
- You can also get some information on the internal state:
+ their own. You can also get some information on the internal state:
^Blist_ent^N List entities
+ ^Blist_info^N List information about objects
^Blist_model^N List models
-
diff --git a/base/ini/menu.ini b/base/ini/menu.ini
index 068ed7f..b9bf4b6 100644
--- a/base/ini/menu.ini
+++ b/base/ini/menu.ini
@@ -68,7 +68,7 @@ command=toggle r_wireframe
align=left
[button]
-text=Back
+text=Return
command=menu previous
align=center
@@ -84,10 +84,6 @@ background=banner
text=Main Menu
[button]
-text=Return to game
-command=menu hide
-
-[button]
text=Options
command=menu options
@@ -99,6 +95,10 @@ command=disconnect
text=Quit
command=quit
+[button]
+text=Return
+command=menu hide
+
;
; join menu
; ------------------------------------------------------------------
diff --git a/gtkradiant/osirion.game/base/entities.def b/gtkradiant/osirion.game/base/entities.def
index cc62d50..175b234 100644
--- a/gtkradiant/osirion.game/base/entities.def
+++ b/gtkradiant/osirion.game/base/entities.def
@@ -66,6 +66,15 @@ pitch pitch angle of the particle system
roll roll angle of the particle system
*/
+// ---- FX_SOUND ---------------------------------------------------
+
+/*QUAKED fx_sound (1 0 0) (-8 -8 -8) (8 8 8) ?
+A sound effect. Only sound loops are supported.
+
+name name of the sound effect
+noise name of the sound effect
+*/
+
// ---- LOCATION_CANNON---------------------------------------------
/*QUAKED location_cannon (0 0 1) (-8 -8 -8) (8 8 8) ?