Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS0
-rw-r--r--doc/GAMEPLAY (renamed from GAMEPLAY)0
-rw-r--r--doc/INSTALL (renamed from INSTALL)0
-rw-r--r--doc/MODELS (renamed from MODELS)0
-rw-r--r--doc/PROTOCOL20
-rw-r--r--doc/README (renamed from README)0
-rw-r--r--doc/ROADMAP (renamed from ROADMAP)0
-rw-r--r--doc/STORYLINE24
-rw-r--r--doc/TODO (renamed from TODO)0
-rw-r--r--osirion.kdevelop14
-rw-r--r--osirion.kdevelop.pcsbin771403 -> 776293 bytes
-rw-r--r--osirion.kdevses26
12 files changed, 70 insertions, 14 deletions
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/NEWS
+++ /dev/null
diff --git a/GAMEPLAY b/doc/GAMEPLAY
index 18642a6..18642a6 100644
--- a/GAMEPLAY
+++ b/doc/GAMEPLAY
diff --git a/INSTALL b/doc/INSTALL
index 3f4bc75..3f4bc75 100644
--- a/INSTALL
+++ b/doc/INSTALL
diff --git a/MODELS b/doc/MODELS
index 4ecd03a..4ecd03a 100644
--- a/MODELS
+++ b/doc/MODELS
diff --git a/doc/PROTOCOL b/doc/PROTOCOL
new file mode 100644
index 0000000..92a345b
--- /dev/null
+++ b/doc/PROTOCOL
@@ -0,0 +1,20 @@
+
+The Osirion Project - Network Protocol Overview
+
+Connection sequence
+
+
+
+Client State Server State
+
+ Connecting
+
+"connect [protoversion]" --------> Pending
+
+ <------- "msg info [sv_hostname"
+
+ <------- ... world data ...
+
+ <------- "connect"
+
+"pif[.. player info ...]" -------> Connected
diff --git a/README b/doc/README
index b233c77..b233c77 100644
--- a/README
+++ b/doc/README
diff --git a/ROADMAP b/doc/ROADMAP
index 24a3643..24a3643 100644
--- a/ROADMAP
+++ b/doc/ROADMAP
diff --git a/doc/STORYLINE b/doc/STORYLINE
new file mode 100644
index 0000000..87adfb9
--- /dev/null
+++ b/doc/STORYLINE
@@ -0,0 +1,24 @@
+STORYLINE
+
+This file contains ideas for the storyline.
+It _will_ contain spoilers.
+
+The concept of zones/sectors is still on the TODO list.
+
+PLACES
+
+Planet Seymour, Regula Station
+Planet Ghant, Alexandria Outpost
+
+ITEMS
+
+Osirion Master Seal
+
+PEOPLE
+
+
+Chapter 1. The Meeting
+
+Cali Prime
+Eborh
+the something Consortium representative \ No newline at end of file
diff --git a/TODO b/doc/TODO
index ae2df13..ae2df13 100644
--- a/TODO
+++ b/doc/TODO
diff --git a/osirion.kdevelop b/osirion.kdevelop
index 25d8c79..599b8d8 100644
--- a/osirion.kdevelop
+++ b/osirion.kdevelop
@@ -16,7 +16,7 @@
<projectdirectory>./</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description>The OSiRiON Project is an SDL+OpenGL space game.</description>
- <defaultencoding/>
+ <defaultencoding></defaultencoding>
<versioncontrol>kdevsubversion</versioncontrol>
</general>
<kdevautoproject>
@@ -196,7 +196,7 @@
<designerpluginpaths/>
</qt>
<creategettersetter>
- <prefixGet/>
+ <prefixGet></prefixGet>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
@@ -228,11 +228,11 @@
</cppsupportpart>
<kdevdebugger>
<general>
- <gdbpath/>
- <dbgshell/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
+ <gdbpath></gdbpath>
+ <dbgshell></dbgshell>
+ <configGdbScript></configGdbScript>
+ <runShellScript></runShellScript>
+ <runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
diff --git a/osirion.kdevelop.pcs b/osirion.kdevelop.pcs
index 32e5d67..46d342d 100644
--- a/osirion.kdevelop.pcs
+++ b/osirion.kdevelop.pcs
Binary files differ
diff --git a/osirion.kdevses b/osirion.kdevses
index 8318db8..c1e8e21 100644
--- a/osirion.kdevses
+++ b/osirion.kdevses
@@ -1,16 +1,28 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="3" >
- <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/draw.cc" >
- <View0 Encoding="" line="417" Type="Source" />
+ <DocsAndViews NumberOfDocuments="7" >
+ <Doc0 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/player.cc" >
+ <View0 Encoding="" line="31" Type="Source" />
</Doc0>
- <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/render.h" >
- <View0 Encoding="" line="30" Type="Source" />
+ <Doc1 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/player.h" >
+ <View0 Encoding="" line="50" Type="Source" />
</Doc1>
- <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/render/render.cc" >
- <View0 Encoding="" line="93" Type="Source" />
+ <Doc2 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/gameserver.cc" >
+ <View0 Encoding="" line="303" Type="Source" />
</Doc2>
+ <Doc3 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/gameserver.h" >
+ <View0 Encoding="" line="55" Type="Source" />
+ </Doc3>
+ <Doc4 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/game/game.cc" >
+ <View0 Encoding="" line="126" Type="Source" />
+ </Doc4>
+ <Doc5 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/netserver.cc" >
+ <View0 Encoding="" line="329" Type="Source" />
+ </Doc5>
+ <Doc6 NumberOfViews="1" URL="file:///home/ingar/projects/osirion/osirion-work/src/core/netclient.h" >
+ <View0 Encoding="" line="61" Type="Source" />
+ </Doc6>
</DocsAndViews>
<pluginList>
<kdevdebugger>