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>2013-09-29 13:14:44 +0000
committerStijn Buys <ingar@osirion.org>2013-09-29 13:14:44 +0000
commitce78048419f2cf6f86aeb22b78420da2d5523ba2 (patch)
tree24bc46d53c34687d7b8465eab7f0595f6260212c
parent18dc1f6d0e044e5e4b1f3a40fcc65e532ec2e765 (diff)
build-0.2.5-svn1327
-rw-r--r--ChangeLog50
-rw-r--r--configure.ac2
-rw-r--r--src/core/entity.cc16
-rw-r--r--src/core/entity.h10
-rw-r--r--src/model/material.cc1
5 files changed, 76 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f95ea4..96b0f8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,56 @@
Project::OSiRiON - Changelog and release history
------------------------------------------------------------------
+
+ * build-0.2.5-svn1327
+
+ 2013-09-29
+
+ src revision 1327
+
+ - Replaced the inventory mount button with an in-place mount indicator,
+ - Binds 'X' key to target other players.
+ - Improved aiming.
+ - Major overhaul of the particle system back-end.
+ - Fixed building with gcc 4.8.
+ - Use a different cursor for clickable ui elements.
+ - Show projecile statistics in turret info.
+ - Added a default armor setting to ship templates.
+
+ data revision 999
+
+ - Various world updates
+ - Disabled entity color on laser particles.
+ - Improved ship engine and weapon particles
+ - Added weapon slots to a number of ships
+ - Added neutron weapons
+ - Added ion weapons
+ - Better explosion particles.
+ - Added sky23 to the Hellas system
+ - Added sky24 to the Kor Telos system.
+ - Added sky25 for the Camorra system.
+ - Added sky26 to the Kor Minas system.
+ - Added sky27 to the Carthagio system.
+ - Added sky28 to the Praetoria system.
+ - Updated sky04.
+ - Updated sky05 (Albion).
+ - Updated sky10 (Lindblade).
+ - Updated sky12 (Kiana).
+ - Added Dagon Tyrant model.
+ - ADded initial Dagon Manticore model.
+ - Added a couple Tyson science vessels to anara.
+ - Added inventory laser weapon models
+ - Added fire/smoke particles to the colonial factory model (e.g. Kerman refinery).
+ - Added stars to Oran and Phoenicia and added a jumpgate between the two systems,
+ - Added a jumpgate between the Praetoria and the Carthagio systems
+ - Added planet Praetoria and its moon Caesar.
+ - Updated a number of stars across the galaxy.
+ - Added solar power arraa to the Carthagio system,
+ - Added solar unit model.
+ - Added default armor settings to ship models.
+ - Improved jumpgate vortex particles.
+ - Added Port Royal placeholder model.
+
* build-0.2.4-svn1282 "Resolutions"
diff --git a/configure.ac b/configure.ac
index cb8ac36..e149cdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl append SVN revision to the version number
dnl determine the svn revision number
define([svnversion], esyscmd([sh -c "echo -n 'svn'; svnversion -q|tr -d '\n'"]))
-AC_INIT([osirion], [0.2.4-svnversion])
+AC_INIT([osirion], [0.2.5-svnversion])
AC_CONFIG_HEADERS(src/config.h)
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 589d132..b7d7646 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -1281,6 +1281,22 @@ void EntityControlable::set_target_controlflags(int controlflags)
}
}
+void EntityControlable::set_target_controlflag(const ControlFlag controlflag)
+{
+ if (!has_controlflag(controlflag);
+ target_controlflags = target_controlflags | controlflag;
+ set_dirty();
+ }
+}
+
+void EntityControlable::unset_target_controlflag(const ControlFlag controlflag)
+{
+ if (has_controlflag(controlflag);
+ target_controlflags = target_controlflags & ~controlflag;
+ set_dirty();
+ }
+}
+
void EntityControlable::set_zone(Zone *zone)
{
if (entity_zone == zone)
diff --git a/src/core/entity.h b/src/core/entity.h
index df65843..c748e98 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -684,7 +684,7 @@ class EntityControlable : public EntityDynamic
public:
/// control flags
- enum ControlFlags {ControlFlagNone = 0, ControlFlagFire = 1};
+ enum ControlFlags {ControlFlagNone = 0, ControlFlagFire = 1, ControlFlagAutoPilot = 2, ControlFlagAutoDock = 4, ControlFlagAutoLevel = 8 };
/// bullet action interface class
class ActionInterface: public btActionInterface {
@@ -787,7 +787,13 @@ public:
/// set target controlflags
void set_target_controlflags(int controlflags);
-
+
+ /// set target control flags
+ void set_target_controlflag(const ControlFlag controlflag);
+
+ /// unset target control flag
+ void unset_target_controlflag(const ControlFlag controlflag);
+
/**
* @brief set the zone the entity is currently in
* this fuction removes the entity from its previous zone
diff --git a/src/model/material.cc b/src/model/material.cc
index 5a99489..f8ffbc0 100644
--- a/src/model/material.cc
+++ b/src/model/material.cc
@@ -279,6 +279,7 @@ void Material::load_shader(const std::string &shadername)
material->set_flags(FlagOrigin);
} else if (firstword.compare("decal") == 0) {
material->set_flags(FlagDecal);
+
} else if (firstword.compare("qer_editorimage") == 0) {
// keyword qer_editorimage is ignored
continue;