Menu
▾
▴
opengate-svn — List for Subversion commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
| 2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
| 2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ult...@us...> - 2007-04-17 16:53:25
|
Revision: 402
http://svn.sourceforge.net/opengate/?rev=402&view=rev
Author: ultrasick
Date: 2007-04-17 09:53:16 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
changing " " -> "_" in file names
Added Paths:
-----------
trunk/data/logos/octavius/black_background.png
trunk/data/logos/octavius/transparent_background.png
Removed Paths:
-------------
trunk/data/logos/octavius/black background.png
trunk/data/logos/octavius/transparent background.png
Deleted: trunk/data/logos/octavius/black background.png
===================================================================
(Binary files differ)
Added: trunk/data/logos/octavius/black_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/logos/octavius/black_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/logos/octavius/transparent background.png
===================================================================
(Binary files differ)
Added: trunk/data/logos/octavius/transparent_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/logos/octavius/transparent_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 16:52:16
|
Revision: 401
http://svn.sourceforge.net/opengate/?rev=401&view=rev
Author: ultrasick
Date: 2007-04-17 09:52:17 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
changing " " -> "_" in file names
Added Paths:
-----------
trunk/data/logos/hyperial/Color_codes.txt
trunk/data/logos/hyperial/black_background.png
trunk/data/logos/hyperial/transparent_background.png
Removed Paths:
-------------
trunk/data/logos/hyperial/Color codes.txt
trunk/data/logos/hyperial/black background.png
trunk/data/logos/hyperial/transparent background.png
Deleted: trunk/data/logos/hyperial/Color codes.txt
===================================================================
--- trunk/data/logos/hyperial/Color codes.txt 2007-04-17 16:51:16 UTC (rev 400)
+++ trunk/data/logos/hyperial/Color codes.txt 2007-04-17 16:52:17 UTC (rev 401)
@@ -1,8 +0,0 @@
-Arrows:
- Border:
- Left: #B44412
- Right: #FFC19F
- Filling: #FB4F01
-
-grey swing:
- Filling: #C2C3C3
\ No newline at end of file
Added: trunk/data/logos/hyperial/Color_codes.txt
===================================================================
--- trunk/data/logos/hyperial/Color_codes.txt (rev 0)
+++ trunk/data/logos/hyperial/Color_codes.txt 2007-04-17 16:52:17 UTC (rev 401)
@@ -0,0 +1,8 @@
+Arrows:
+ Border:
+ Left: #B44412
+ Right: #FFC19F
+ Filling: #FB4F01
+
+grey swing:
+ Filling: #C2C3C3
\ No newline at end of file
Property changes on: trunk/data/logos/hyperial/Color_codes.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/data/logos/hyperial/black background.png
===================================================================
(Binary files differ)
Added: trunk/data/logos/hyperial/black_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/logos/hyperial/black_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/logos/hyperial/transparent background.png
===================================================================
(Binary files differ)
Added: trunk/data/logos/hyperial/transparent_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/logos/hyperial/transparent_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 16:51:18
|
Revision: 400
http://svn.sourceforge.net/opengate/?rev=400&view=rev
Author: ultrasick
Date: 2007-04-17 09:51:16 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
changing " " -> "_" in file names
Added Paths:
-----------
trunk/data/logos/amanath/transparent_background.png
Removed Paths:
-------------
trunk/data/logos/amanath/transparent background.png
Deleted: trunk/data/logos/amanath/transparent background.png
===================================================================
(Binary files differ)
Added: trunk/data/logos/amanath/transparent_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/logos/amanath/transparent_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 14:56:13
|
Revision: 399
http://svn.sourceforge.net/opengate/?rev=399&view=rev
Author: ultrasick
Date: 2007-04-17 07:56:12 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming
Added Paths:
-----------
trunk/data/shields/t-s-13.blend
Removed Paths:
-------------
trunk/data/shields/s-s-13.blend
Deleted: trunk/data/shields/s-s-13.blend
===================================================================
(Binary files differ)
Added: trunk/data/shields/t-s-13.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/t-s-13.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 14:49:05
|
Revision: 398
http://svn.sourceforge.net/opengate/?rev=398&view=rev
Author: ultrasick
Date: 2007-04-17 07:49:06 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming the s-r-9 to t-r-9
Added Paths:
-----------
trunk/data/radar/t-r-9.blend
Removed Paths:
-------------
trunk/data/radar/s-r-9.blend
Deleted: trunk/data/radar/s-r-9.blend
===================================================================
(Binary files differ)
Added: trunk/data/radar/t-r-9.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radar/t-r-9.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 14:37:32
|
Revision: 397
http://svn.sourceforge.net/opengate/?rev=397&view=rev
Author: ultrasick
Date: 2007-04-17 07:37:33 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming solrain -> tauseti
Modified Paths:
--------------
trunk/doc/meta_server/login.odt
trunk/doc/meta_server/login.pdf
Modified: trunk/doc/meta_server/login.odt
===================================================================
(Binary files differ)
Modified: trunk/doc/meta_server/login.pdf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 14:32:15
|
Revision: 396
http://svn.sourceforge.net/opengate/?rev=396&view=rev
Author: ultrasick
Date: 2007-04-17 07:32:16 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming solrain -> tauseti (caption on the wings)
Modified Paths:
--------------
trunk/templates/data/ships/tauseti/lady kickstart/parts/17 + 18.pspimage
Modified: trunk/templates/data/ships/tauseti/lady kickstart/parts/17 + 18.pspimage
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 14:29:20
|
Revision: 395
http://svn.sourceforge.net/opengate/?rev=395&view=rev
Author: ultrasick
Date: 2007-04-17 07:29:21 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming solrain -> tauseti
Added Paths:
-----------
trunk/data/ships/tauseti/
trunk/data/ships/tauseti/intensity/
trunk/data/ships/tauseti/intensity/intensity.wings
trunk/data/ships/tauseti/lady kickstart/
trunk/data/ships/tauseti/lady kickstart/lady kickstart.blend
trunk/data/ships/tauseti/pioneer/
trunk/data/ships/tauseti/pioneer/pioneer.wings
Removed Paths:
-------------
trunk/data/ships/solrain/
Added: trunk/data/ships/tauseti/intensity/intensity.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/intensity/intensity.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/lady kickstart/lady kickstart.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/lady kickstart/lady kickstart.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/pioneer/pioneer.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/pioneer/pioneer.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 13:08:42
|
Revision: 394
http://svn.sourceforge.net/opengate/?rev=394&view=rev
Author: ultrasick
Date: 2007-04-17 06:08:41 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming solrain -> tauseti
Added Paths:
-----------
trunk/templates/data/ships/tauseti/
trunk/templates/data/ships/tauseti/lady kickstart/
trunk/templates/data/ships/tauseti/lady kickstart/dark background.png
trunk/templates/data/ships/tauseti/lady kickstart/door.jpg
trunk/templates/data/ships/tauseti/lady kickstart/info.txt
trunk/templates/data/ships/tauseti/lady kickstart/panels - big.png
trunk/templates/data/ships/tauseti/lady kickstart/panels - dark.png
trunk/templates/data/ships/tauseti/lady kickstart/panels.jpg
trunk/templates/data/ships/tauseti/lady kickstart/parts/
trunk/templates/data/ships/tauseti/lady kickstart/parts/1.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/11.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/12 + 13.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/14 + 15.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/16.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/17 + 18.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/19 + 20.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/2.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/21 + 22.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/23 + 24.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/25 + 26.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/27 + 28.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/29 + 30.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/3 + 4.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/31 + 32.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/33 + 34.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/35 + 36.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/37 + 38.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/39 + 40.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/41 + 42.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/43 + 44.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/45 + 46.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/47 + 48.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/49 + 50.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/5 + 6.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/51.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/52 + 53.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/54.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/55 + 56.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/57 + 58.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/59.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/7 + 8.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/parts/9 + 10.pspimage
trunk/templates/data/ships/tauseti/lady kickstart/viewable area.7z
Removed Paths:
-------------
trunk/templates/data/ships/solrain/
Added: trunk/templates/data/ships/tauseti/lady kickstart/dark background.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/dark background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/door.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/door.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/info.txt
===================================================================
--- trunk/templates/data/ships/tauseti/lady kickstart/info.txt (rev 0)
+++ trunk/templates/data/ships/tauseti/lady kickstart/info.txt 2007-04-17 13:08:41 UTC (rev 394)
@@ -0,0 +1,14 @@
+|Comment by the owner of the texture pack:
+|---------------------------------------------------------
+|Feel free to use these textures as your wish (for non-commercial use only, unless you ask me permission first...)
+|You can modify it, use on your models, etc... Have fun!
+|
+|If you want, you can credit me (credits required on other downloadable stuff, like models or modifications of these textures)
+|As Ramiel, or, better yet, as www.jagthesite.com
+|---------------------------------------------------------
+
+|Comment by Gary Luck (alias Ultrasick):
+|---------------------------------------------------------
+|946.3414634 pixel per blender length unit
+|946.3414634 Pixel pro Blender L\xE4ngeneinheit
+|---------------------------------------------------------
\ No newline at end of file
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/info.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/ships/tauseti/lady kickstart/panels - big.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/panels - big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/panels - dark.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/panels - dark.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/panels.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/panels.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/1.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/1.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/11.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/11.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/12 + 13.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/12 + 13.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/14 + 15.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/14 + 15.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/16.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/16.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/17 + 18.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/17 + 18.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/19 + 20.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/19 + 20.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/2.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/2.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/21 + 22.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/21 + 22.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/23 + 24.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/23 + 24.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/25 + 26.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/25 + 26.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/27 + 28.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/27 + 28.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/29 + 30.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/29 + 30.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/3 + 4.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/3 + 4.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/31 + 32.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/31 + 32.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/33 + 34.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/33 + 34.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/35 + 36.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/35 + 36.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/37 + 38.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/37 + 38.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/39 + 40.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/39 + 40.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/41 + 42.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/41 + 42.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/43 + 44.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/43 + 44.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/45 + 46.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/45 + 46.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/47 + 48.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/47 + 48.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/49 + 50.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/49 + 50.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/5 + 6.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/5 + 6.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/51.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/51.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/52 + 53.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/52 + 53.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/54.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/54.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/55 + 56.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/55 + 56.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/57 + 58.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/57 + 58.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/59.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/59.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/7 + 8.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/7 + 8.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/parts/9 + 10.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/parts/9 + 10.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady kickstart/viewable area.7z
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady kickstart/viewable area.7z
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-17 12:39:48
|
Revision: 393
http://svn.sourceforge.net/opengate/?rev=393&view=rev
Author: ultrasick
Date: 2007-04-17 05:39:44 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
uploading a required image for the logo of the tauseti faction (part of the progress of renaming the solrain faction to tauseti)
Added Paths:
-----------
trunk/templates/data/logos/
trunk/templates/data/logos/tauseti/
trunk/templates/data/logos/tauseti/background.pspimage
Added: trunk/templates/data/logos/tauseti/background.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/logos/tauseti/background.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-16 22:00:06
|
Revision: 392
http://svn.sourceforge.net/opengate/?rev=392&view=rev
Author: ultrasick
Date: 2007-04-16 15:00:08 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
uploading a new part of the texture (it's already inserted in the blend file)
Modified Paths:
--------------
trunk/templates/data/ships/solrain/lady kickstart/viewable area.7z
Added Paths:
-----------
trunk/templates/data/ships/solrain/lady kickstart/parts/59.pspimage
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/59.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/59.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/templates/data/ships/solrain/lady kickstart/viewable area.7z
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-16 21:56:07
|
Revision: 391
http://svn.sourceforge.net/opengate/?rev=391&view=rev
Author: ultrasick
Date: 2007-04-16 14:56:09 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
removeing the old primrose directories
Removed Paths:
-------------
trunk/data/ships/solrain/primrose/
trunk/templates/data/ships/solrain/primrose/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-16 21:52:34
|
Revision: 390
http://svn.sourceforge.net/opengate/?rev=390&view=rev
Author: ultrasick
Date: 2007-04-16 14:52:33 -0700 (Mon, 16 Apr 2007)
Log Message:
-----------
renaming the primrose to "Lady Kickstart". I will remove the primrose directories in the next step. my svn client loves to waste my time again
we should use more scientific or technical names for the solrain faction because the description text says that solrain is a scientific community of interests. We can use names like Primrose for the quantar faction (the religios faction) and aggressive names like Warhammer for the octavius faction.
Oh by the way. I noticed that the description text of the octavius faction and the quantar faction on jossh maybe should be changed in opengate. We can't give the the quantar faction the best weapons like the thorn or the purgatory missile and make them look like they are a religios faction of peaceful traders and call the octavius an millitary organisation with no really useful equipment for war.
Added Paths:
-----------
trunk/data/ships/solrain/lady kickstart/
trunk/data/ships/solrain/lady kickstart/lady kickstart.blend
trunk/data/ships/solrain/lady kickstart/lady kickstart.xml
trunk/templates/data/ships/solrain/lady kickstart/
trunk/templates/data/ships/solrain/lady kickstart/dark background.png
trunk/templates/data/ships/solrain/lady kickstart/door.jpg
trunk/templates/data/ships/solrain/lady kickstart/info.txt
trunk/templates/data/ships/solrain/lady kickstart/panels - big.png
trunk/templates/data/ships/solrain/lady kickstart/panels - dark.png
trunk/templates/data/ships/solrain/lady kickstart/panels.jpg
trunk/templates/data/ships/solrain/lady kickstart/parts/
trunk/templates/data/ships/solrain/lady kickstart/parts/1.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/11.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/12 + 13.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/14 + 15.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/16.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/17 + 18.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/19 + 20.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/2.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/21 + 22.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/23 + 24.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/25 + 26.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/27 + 28.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/29 + 30.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/3 + 4.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/31 + 32.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/33 + 34.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/35 + 36.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/37 + 38.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/39 + 40.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/41 + 42.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/43 + 44.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/45 + 46.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/47 + 48.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/49 + 50.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/5 + 6.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/51.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/52 + 53.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/54.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/55 + 56.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/57 + 58.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/7 + 8.pspimage
trunk/templates/data/ships/solrain/lady kickstart/parts/9 + 10.pspimage
trunk/templates/data/ships/solrain/lady kickstart/viewable area.7z
Added: trunk/data/ships/solrain/lady kickstart/lady kickstart.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/solrain/lady kickstart/lady kickstart.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/solrain/lady kickstart/lady kickstart.xml
===================================================================
--- trunk/data/ships/solrain/lady kickstart/lady kickstart.xml (rev 0)
+++ trunk/data/ships/solrain/lady kickstart/lady kickstart.xml 2007-04-16 21:52:33 UTC (rev 390)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<ship type="Player">
+ <!-- Naming -->
+ <name>Lady Kickstart</name>
+ <class>Shuttle Trainer</class>
+ <faction>Solrain</faction>
+ <image>s_c_15.jpg</image>
+ <model>s_c_15.wings</model>
+
+ <!-- Production Data -->
+
+ <production-center>Solrain Core</production-center>
+ <production-center>Solrain Wake</production-center>
+ <production-center>Solrain Cornea</production-center>
+
+ <!-- Generic Data -->
+ <techlevel>0</techlevel>
+ <size>10.9</size>
+ <mass>9000</mass>
+
+ <!-- Sizes -->
+ <capacitorsize>1</capacitorsize>
+ <ecmsize>1</ecmsize>
+ <enginecount>2</enginecount>
+ <enginesize>1</enginesize>
+ <gunsize>1</gunsize>
+ <gunsize>1</gunsize>
+ <missilesize>1</missilesize>
+ <missilesize>1</missilesize>
+ <modx>3</modx>
+ <powerplantsize>1</powerplantsize>
+ <radarsize>1</radarsize>
+ <shieldsize>2</shieldsize>
+ <armor>4500</armor>
+ <cargocapacity>4</cargocapacity>
+
+ <!-- Movement -->
+ <dragfactor>14.55</dragfactor> <!-- 14.6 ingame -->
+ <pitch>0.000960</pitch> <!-- 55.0 in jossh -->
+ <roll>0.001222</roll> <!-- 70.0 in jossh -->
+ <yaw>0.001187</yaw> <!-- 68.0 in jossh -->
+</ship>
Property changes on: trunk/data/ships/solrain/lady kickstart/lady kickstart.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/ships/solrain/lady kickstart/dark background.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/dark background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/door.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/door.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/info.txt
===================================================================
--- trunk/templates/data/ships/solrain/lady kickstart/info.txt (rev 0)
+++ trunk/templates/data/ships/solrain/lady kickstart/info.txt 2007-04-16 21:52:33 UTC (rev 390)
@@ -0,0 +1,14 @@
+|Comment by the owner of the texture pack:
+|---------------------------------------------------------
+|Feel free to use these textures as your wish (for non-commercial use only, unless you ask me permission first...)
+|You can modify it, use on your models, etc... Have fun!
+|
+|If you want, you can credit me (credits required on other downloadable stuff, like models or modifications of these textures)
+|As Ramiel, or, better yet, as www.jagthesite.com
+|---------------------------------------------------------
+
+|Comment by Gary Luck (alias Ultrasick):
+|---------------------------------------------------------
+|946.3414634 pixel per blender length unit
+|946.3414634 Pixel pro Blender L\xE4ngeneinheit
+|---------------------------------------------------------
\ No newline at end of file
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/info.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/templates/data/ships/solrain/lady kickstart/panels - big.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/panels - big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/panels - dark.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/panels - dark.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/panels.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/panels.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/1.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/1.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/11.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/11.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/12 + 13.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/12 + 13.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/14 + 15.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/14 + 15.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/16.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/16.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/17 + 18.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/17 + 18.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/19 + 20.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/19 + 20.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/2.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/2.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/21 + 22.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/21 + 22.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/23 + 24.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/23 + 24.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/25 + 26.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/25 + 26.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/27 + 28.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/27 + 28.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/29 + 30.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/29 + 30.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/3 + 4.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/3 + 4.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/31 + 32.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/31 + 32.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/33 + 34.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/33 + 34.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/35 + 36.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/35 + 36.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/37 + 38.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/37 + 38.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/39 + 40.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/39 + 40.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/41 + 42.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/41 + 42.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/43 + 44.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/43 + 44.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/45 + 46.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/45 + 46.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/47 + 48.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/47 + 48.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/49 + 50.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/49 + 50.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/5 + 6.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/5 + 6.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/51.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/51.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/52 + 53.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/52 + 53.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/54.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/54.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/55 + 56.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/55 + 56.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/57 + 58.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/57 + 58.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/7 + 8.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/7 + 8.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/parts/9 + 10.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/parts/9 + 10.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/lady kickstart/viewable area.7z
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/lady kickstart/viewable area.7z
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-04-14 21:50:43
|
Revision: 389
http://svn.sourceforge.net/opengate/?rev=389&view=rev
Author: spom_spom
Date: 2007-04-14 14:50:43 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
update ogsectorclient.exe
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-04-14 18:04:37
|
Revision: 388
http://svn.sourceforge.net/opengate/?rev=388&view=rev
Author: spom_spom
Date: 2007-04-14 11:04:36 -0700 (Sat, 14 Apr 2007)
Log Message:
-----------
Fixed some client and server issues.
Modified Paths:
--------------
branches/ogsector/data/Console.png
branches/ogsector/data/simpleHUD.fontdef
branches/ogsector/src/Sector.cpp
branches/ogsector/src/SectorClientFrameListener.cpp
branches/ogsector/src/SectorClientFrameListener.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/networkClient.cpp
branches/ogsector/src/networkClient.h
branches/ogsector/src/networkProtocol.h
branches/ogsector/src/networkServer.cpp
branches/ogsector/src/networkServer.h
branches/ogsector/src/networkServerUser.cpp
branches/ogsector/src/networkServerUser.h
branches/ogsector/src/ogconsole.cpp
branches/ogsector/src/ogsectorclient.cpp
branches/ogsector/src/ogsectorserver.cpp
Modified: branches/ogsector/data/Console.png
===================================================================
(Binary files differ)
Modified: branches/ogsector/data/simpleHUD.fontdef
===================================================================
--- branches/ogsector/data/simpleHUD.fontdef 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/data/simpleHUD.fontdef 2007-04-14 18:04:36 UTC (rev 388)
@@ -4,6 +4,7 @@
source bluehigh.ttf
size 32
resolution 55
+ code_points 33-255
}
@@ -13,5 +14,6 @@
source bluehigh.ttf
size 32
resolution 55
+ code_points 33-255
}
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/Sector.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -46,6 +46,12 @@
Ogre::Real( 500.0 ),
Ogre::Degree( 0.0 ) );
+// createStaticObject( Ogre::String("tmp/astro1.mesh"),
+// "tmp",
+// Ogre::Vector3( -300, 300, 0 ),
+// Ogre::Real( 100.0 ),
+// Ogre::Degree( 0.0 ) );
+
// createStaticObject( Ogre::String("misc/jumpgate.mesh"),
// "jumpgate",
// Ogre::Vector3( 0, -1000, 0 ),
@@ -184,7 +190,7 @@
void Sector::spawnAiObject( ){
int childID = 1;
- while ( localAiObjects_.find( childID ) != localAiObjects_.end() ){ childID ++; }
+ while ( localAiObjects_.count( childID ) ){ childID ++; }
SectorObjectMoveableAi *obj = createAiMoveableObject( avatar_->name() + "_Spawn" + Ogre::StringConverter::toString( childID ), childID );
@@ -309,12 +315,12 @@
void Sector::receiveVesselRegister( const MessageBodyShipRegister & msg ){
if ( msg.senderID() != network_->userID() ){
- std::map< long , SectorObjectMoveable * >::iterator it;
+ // std::map< long , SectorObjectMoveable * >::iterator it;
- if ( ( it = movableObjects_.find( createGlobalID( msg.senderID(), msg.childID() ) ) ) != movableObjects_.end() ){
+ if ( movableObjects_.count( createGlobalID( msg.senderID(), msg.childID() ) ) ){
if ( msg.status() == false ){
log_->info( "Deregistering " + msg.name() );
- destructMoveableObject( it->second );
+ destructMoveableObject( movableObjects_[ createGlobalID( msg.senderID(), msg.childID() ) ] );
} else {
log_->info( "Object " + msg.name() + " allready registered." );
}
Modified: branches/ogsector/src/SectorClientFrameListener.cpp
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -9,6 +9,25 @@
namespace OpenGate{
+// inline std::string encode_utf8( std::string & ansi ){
+// size_t ansi_len = ansi.length();
+// int len = MultiByteToWideChar( Ogre::CP_ACP, 0, ansi.c_str(), ansi_len, NULL, 0 );
+
+// if (ansi_len > 0 && len > 0) {
+// WCHAR *utf16 = new WCHAR[len];
+
+// MultiByteToWideChar(CP_ACP, 0, ansi.c_str(), ansi_len, (LPWSTR)utf16, len);
+// ansi_len = WideCharToMultiByte(CP_UTF8, 0, (LPWSTR)utf16, len, NULL, 0, NULL, NULL);
+
+// std::string unicode(ansi_len, 0);
+
+// WideCharToMultiByte(CP_UTF8, 0, (LPWSTR)utf16, len, (LPSTR)unicode.c_str(), ansi_len, NULL, NULL);
+// delete[] utf16;
+// return unicode;
+// }
+// return "";
+// }
+
SectorClientFrameListener::SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam,
Sector * sector, NetworkClient * nw,
InputManager * input )
@@ -35,8 +54,6 @@
timeSinceLastSectorUpdate_ = 0.0;
timeSinceLastNetworkUpdate_ = 0.0;
- inputInitialState_ = true;
- lastInputWheelState_ = 0;
hudOverlay_ = Ogre::OverlayManager::getSingleton().getByName("OpenGate/SimpleHUD");
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInPanel")->hide( );
@@ -51,14 +68,13 @@
hudOverlay_->show( );
- mouseOverlay_ = Ogre::OverlayManager::getSingleton().getByName( "Overlay/MousePointer" );
+ Ogre::OverlayManager::getSingleton().getByName( "Overlay/MousePointer" )->show();
+
mousePointer_ = Ogre::OverlayManager::getSingleton().getOverlayElement( "MousePointer/Pointer" );
- mousePointer_->setTop( windowsHalfWidth_ );
- mousePointer_->setLeft( windowsHalfHeight_ );
- mouseOverlay_->show();
+ mousePointer_->setTop( windowsHalfHeight_ - 16 );
+ mousePointer_->setLeft( windowsHalfWidth_ - 16 );
-
// cameraRotateSpeed_ = 36;
// cameraRotateScale_ = 0.0f;
// cameraMoveSpeed_ = 100;
@@ -262,18 +278,19 @@
} else { // ** chatmode
if ( e.key != OIS::KC_BACK ) {
- if ( (int)e.text < 255 && (int)e.text > 0 ) {
+ if ( (int)e.text > 32 && (int)e.text < 167 ) {
chatString_ += e.text;
} else {
- std::cout << (char)e.text << " " << e.text << std::endl;
+ std::cout << (char)e.text << " " << e.text << std::endl;
}
} else if ( chatString_.length() > 1 ) {
chatString_ = chatString_.substr( 0, chatString_.length() - 1 );
}
- Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInTextField")->setCaption( chatString_ );
+ Ogre::OverlayElement *hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInTextField");
+// hudChatIn->setCaption( chatString_ );
- // hudChatIn->setCaption( Ogre::UTFString(chatString_.c_str()).asUTF32() );
+ hudChatIn->setCaption( Ogre::UTFString( chatString_ ) );
// hudChatIn->setCaption( Ogre::UTFString( chatString_ ).asUTF32_c_str() );
if ( e.key == OIS::KC_RETURN) {
@@ -323,16 +340,24 @@
}
bool SectorClientFrameListener::mouseMoved( const OIS::MouseEvent & e ){
- mousePointer_->setLeft( e.state.X.abs - 16);
- mousePointer_->setTop( e.state.Y.abs - 16);
+ mousePointer_->setLeft( mousePointer_->getLeft( ) + e.state.X.rel );
+ mousePointer_->setTop( mousePointer_->getTop( ) + e.state.Y.rel );
+ if ( mousePointer_->getLeft( ) < -16 ) mousePointer_->setLeft( -16 );
+ if ( mousePointer_->getTop( ) < -16 ) mousePointer_->setTop( -16 );
+
+ if ( mousePointer_->getLeft( ) > windowsWidth_-16 ) mousePointer_->setLeft( windowsWidth_-16 );
+ if ( mousePointer_->getTop( ) > windowsHeight_-16 ) mousePointer_->setTop( windowsHeight_-16 );
+
if ( sector_->avatar() != NULL ){
- // std::cout << "X" << e.state.X.abs << " " << e.state.X.rel<< std::endl;
- // std::cout << "Y" << e.state.Y.abs << " " << e.state.Y.rel<< std::endl;
- // std::cout << "Z" << e.state.Z.abs << " " << e.state.Z.rel<< std::endl;
+// std::cout << "X" << e.state.X.abs << " " << e.state.X.rel << " " << mousePointer_->getLeft( ) << std::endl;
+// std::cout << "Y" << e.state.Y.abs << " " << e.state.Y.rel << " " << mousePointer_->getTop( ) << std::endl;
+// std::cout << "Z" << e.state.Z.abs << " " << e.state.Z.rel<< std::endl;
+// return true;
- int relativToMidPointX = (int)rint( e.state.X.abs - windowsHalfWidth_ );
- int relativToMidPointY = (int)rint( e.state.Y.abs - windowsHalfHeight_ );
+ int relativToMidPointX = (int)rint( (mousePointer_->getLeft( ) +16) - windowsHalfWidth_ );
+ int relativToMidPointY = (int)rint( (mousePointer_->getTop( ) +16) - windowsHalfHeight_ );
+
int minActiveZonePercent = 5;
int maxActiveZonePercent = 90;
@@ -354,37 +379,28 @@
if ( fabs( relativToMidPointX ) < minRadius ) yaw = 0.0;
if ( fabs( relativToMidPointY ) < minRadius ) pitch = 0.0;
- if ( inputInitialState_ == true ){
- if ( yaw == 0.0 && pitch == 0.0 ){
- inputInitialState_ = false;
- }
- } else{
-
- yaw = min( yaw, 1.0f ); yaw = max( yaw, -1.0f );
- pitch = min( pitch, 1.0f ); pitch = max( pitch, -1.0f );
-
- // std::cout << ( String("Mouse rel: ") + StringConverter::toString( e.state.X.rel ) +
- // String(" ") + StringConverter::toString( e.state.Y.rel ) +
- // String(" abs: ") + StringConverter::toString( e.state.X.abs ) +
- // String(" ") + StringConverter::toString( e.state.Y.abs ) +
- // String(" relMid: ") + StringConverter::toString( relativToMidPointX ) +
- // String(" ") + StringConverter::toString( relativToMidPointY ) +
- // String(" yaw: ") + StringConverter::toString( yaw ) +
- // String(" pitch ") + StringConverter::toString( pitch ) ) << std::endl;
-
- sector_->avatar()->setScaledYaw( -yaw );
- sector_->avatar()->setScaledPitch( -pitch );
- }
+ yaw = min( yaw, 1.0f ); yaw = max( yaw, -1.0f );
+ pitch = min( pitch, 1.0f ); pitch = max( pitch, -1.0f );
+
+ // std::cout << ( String("Mouse rel: ") + StringConverter::toString( e.state.X.rel ) +
+ // String(" ") + StringConverter::toString( e.state.Y.rel ) +
+ // String(" abs: ") + StringConverter::toString( e.state.X.abs ) +
+ // String(" ") + StringConverter::toString( e.state.Y.abs ) +
+ // String(" relMid: ") + StringConverter::toString( relativToMidPointX ) +
+ // String(" ") + StringConverter::toString( relativToMidPointY ) +
+ // String(" yaw: ") + StringConverter::toString( yaw ) +
+ // String(" pitch ") + StringConverter::toString( pitch ) ) << std::endl;
+
+ sector_->avatar()->setScaledYaw( -yaw );
+ sector_->avatar()->setScaledPitch( -pitch );
} // if avatar;
- if ( e.state.Z.abs-10 > lastInputWheelState_ ){ // mouse wheel up
+ if ( e.state.Z.rel < -10 ){ // mouse wheel up
setTarget( sector_->nextTarget() );
- lastInputWheelState_ = e.state.Z.abs;
-
- } else if( lastInputWheelState_ > e.state.Z.abs+10 ) { // mouse wheel down
+ } else if ( e.state.Z.rel > 10 ) {
setTarget( sector_->prevTarget() );
- lastInputWheelState_ = e.state.Z.abs;
}
+
return true;
}
Modified: branches/ogsector/src/SectorClientFrameListener.h
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.h 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/SectorClientFrameListener.h 2007-04-14 18:04:36 UTC (rev 388)
@@ -61,9 +61,8 @@
InputManager * inputManager_;
Ogre::Overlay * hudOverlay_;
- Ogre::Overlay * mouseOverlay_;
Ogre::OverlayElement * mousePointer_;
- Ogre::SceneNode * hudTarget_;
+ // Ogre::SceneNode * hudTarget_;
Ogre::SceneNode * targetPointer_;
SectorObject * target_;
Ogre::Billboard *targetPointerBB_;
@@ -73,8 +72,6 @@
bool deathSequence_;
double timeSinceLastSectorUpdate_;
double timeSinceLastNetworkUpdate_;
- bool inputInitialState_;
- int lastInputWheelState_;
int cameraMode_;
double cameraMoveScale_;
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/SectorObjects.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -314,7 +314,9 @@
// roll_ += scaledRoll;
// mainNode_->translate( ( destP- srcP ) / 5.0 );
- interpolateVel_ = ( destP-srcP ) / lastFrameCount_ / 1.0;
+ if ( lastFrameCount_ > 0 ){
+ interpolateVel_ = ( destP-srcP ) / lastFrameCount_ / 1.0;
+ }
if ( ( srcP - destP ).length() > 100 ) forceMovement_ = true;
}
@@ -397,7 +399,11 @@
Ogre::Vector3 flightDir( vel_ ); flightDir.normalise();
//** thrust = mass * acc;
- acc_ = ( - trustDir * thrust() - flightDir * friction ) / mass_;
+ if ( mass_ > 0 ){
+ acc_ = ( - trustDir * thrust() - flightDir * friction ) / mass_;
+ } else {
+ std::cerr << "mass: " << mass_ << std::endl;
+ }
if ( breakPressed_ == true ) {
if ( velocity() > 0 ) {
@@ -556,7 +562,7 @@
}
bool SectorObjectMoveableAi::update( Ogre::Real elapsedTime ){
- if ( target_ != NULL ) {
+ if ( target_ != NULL && elapsedTime > 1e-4 ) {
Ogre::Vector3 src = mainNode_->getWorldOrientation() * Ogre::Vector3::NEGATIVE_UNIT_Z;
src.normalise();
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/SectorObjects.h 2007-04-14 18:04:36 UTC (rev 388)
@@ -151,7 +151,7 @@
inline Ogre::Real scaledRoll() const { return roll_; }
inline void setScaledRoll( float rotZScale ){ roll_ = rotZScale; }
- Ogre::Real rotFriction(){ return 0.4 + (0.6 * (100.0-percentageThrust_ )/ 100.0 ); }
+ Ogre::Real rotFriction(){ return 0.4 + ( 0.6 * ( 100.0 - percentageThrust_ )/ 100.0 ); }
inline Ogre::Real thrustPercent() const { return 100.0 * thrust() / maxThrust(); }
inline void setThrustPercent( Ogre::Real thrust ) {
Modified: branches/ogsector/src/networkClient.cpp
===================================================================
--- branches/ogsector/src/networkClient.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkClient.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -48,6 +48,7 @@
}
void NetworkClient::login( const std::string & userName, const std::string & passwd ) {
+ userName_ = userName;
if ( online_ ){
MessageBodyUserName msg( userName );
send( msg );
@@ -68,12 +69,12 @@
}
}
-std::string NetworkClient::userName( int userID ) const {
+std::string NetworkClient::userName( int userID ) {
if ( userID == 0 ) userID = userID_;
- std::map < int, std::string >::const_iterator it;
- if ( ( it = users_.find( userID ) ) != users_.end() ){
- return it->second;
+ if ( users_.count( userID ) ){
+ std::string str( users_[ userID ] );
+ return str;
} else {
return "unknown user: " + toStr( userID ) ;
}
@@ -139,6 +140,18 @@
std::cout << "New user = " << (int)msg.senderID() << " " << msg.userName() << std::endl;
users_[ (int)msg.senderID() ] = msg.userName();
} break;
+ case PROTO_CONNECTION_REFUSED: {
+ MessageBodyConnectionRefused msg( readMsg_.body() );
+ switch ( msg.reason() ){
+ case CONNECTION_REFUSED_USER_ALREADY_EXIST:
+ std::cerr << "Connection refused: " << userName_ << " already conneced to the server" << std::endl;
+ doClose();
+ online_ = false;
+ break;
+ default:
+ std::cerr << "Connection refused for unknown reason:" << msg.reason() << std::endl;
+ }
+ } break;
case PROTO_DISCONNECT: {
MessageBodyDisconnect msg( readMsg_.body() );
std::cout << "Disconnect user = " << (int)msg.userID() << " " << userName( (int)msg.userID() ) << std::endl;
@@ -168,7 +181,7 @@
bool write_in_progress = !msgsToWrite_.empty();
msgsToWrite_.push_back( Message( body ) );
// std::cout << "send.length() = " << msgsToWrite_.front().length() << std::endl;
- if ( !write_in_progress ) {
+ if ( !write_in_progress && online_ ) {
asio::async_write( socket_, asio::buffer( msgsToWrite_.front().data(), msgsToWrite_.front().length() ),
boost::bind( & NetworkClient::handleWrite, this,
asio::placeholders::error ) );
@@ -180,7 +193,7 @@
if ( online_ ){
if ( !error ){
msgsToWrite_.pop_front();
- if ( !msgsToWrite_.empty() ) {
+ if ( !msgsToWrite_.empty() && online_ ) {
asio::async_write(socket_, asio::buffer( msgsToWrite_.front().data(), msgsToWrite_.front().length() ),
boost::bind( &NetworkClient::handleWrite, this,
asio::placeholders::error ) );
@@ -196,6 +209,7 @@
if ( online_ ){
std::cout << "User disconnected." << std::endl;
socket_.close();
+ pingTime_ = -1;
online_ = false;
}
}
Modified: branches/ogsector/src/networkClient.h
===================================================================
--- branches/ogsector/src/networkClient.h 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkClient.h 2007-04-14 18:04:36 UTC (rev 388)
@@ -26,7 +26,7 @@
Uint32 userID() const { return userID_; }
- std::string userName( int userID = 0 ) const;
+ std::string userName( int userID = 0 );
bool online() const { return online_; }
@@ -73,6 +73,7 @@
std::deque< std::vector< char > > msgsToPull_;
+ std::string userName_;
std::map < int, std::string > users_;
Uint32 userID_;
float pingTime_;
Modified: branches/ogsector/src/networkProtocol.h
===================================================================
--- branches/ogsector/src/networkProtocol.h 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkProtocol.h 2007-04-14 18:04:36 UTC (rev 388)
@@ -38,7 +38,8 @@
#define PROTO_USERNAME 3
#define PROTO_LOGIN 4
#define PROTO_DISCONNECT 5
-#define PROTO_CHAT 6
+#define PROTO_CONNECTION_REFUSED 6
+#define PROTO_CHAT 7
#define PROTO_SHIPBASE 10
#define PROTO_SHIPREGISTER 11
#define PROTO_SHIPSTATUS 12
@@ -46,6 +47,8 @@
#define PROTO_SHIPAMMOHIT 14
#define PROTO_TEST 255
+#define CONNECTION_REFUSED_USER_ALREADY_EXIST 1
+
typedef unsigned char Uint8;
typedef unsigned short Uint16;
typedef int Uint32;
@@ -176,6 +179,30 @@
std::string username_;
};
+class MessageBodyConnectionRefused : public MessageBodyBase{
+public:
+ MessageBodyConnectionRefused( Uint8 reason ) : MessageBodyBase(), reason_( reason ){
+ type_ = (Uint8)PROTO_CONNECTION_REFUSED;
+ }
+
+ MessageBodyConnectionRefused( const char * data ) : MessageBodyBase( data ) {
+ int count = MessageBodyBase::dataSize();
+ readFromData( reason_, data, count );
+ }
+
+ ~MessageBodyConnectionRefused(){}
+
+ virtual void createOutStream() {
+ MessageBodyBase::createOutStream();
+ writeToOut( out_, reason_ );
+ }
+
+ Uint8 reason( ) const { return reason_; }
+
+protected:
+ Uint8 reason_;
+};
+
class MessageBodyChat : public MessageBodyBase {
public:
MessageBodyChat( const std::string & message ) : MessageBodyBase(), message_( message ) {
Modified: branches/ogsector/src/networkServer.cpp
===================================================================
--- branches/ogsector/src/networkServer.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkServer.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -29,7 +29,7 @@
void Server::handleAccept( UserSession * user, const asio::error & error ){
// std::cout << "Server::handle_accept" << std::endl;
if ( !error ) {
- addUser( user );
+ addUserSession( user );
UserSession * newUser = new UserSession( this, ++userIDCounter_ );
acceptor_.async_accept( newUser->socket(),
@@ -40,43 +40,59 @@
}
}
-void Server::addUser( UserSession * user ){
+void Server::addUserSession( UserSession * user ){
std::cout << "USER_NEW: " << user->userID() << std::endl;
user->start();
- allUsers_.join( user );
}
-void Server::disconnectUser( UserSession * user ){
- std::string name( user->userName() );
- std::cout << "DISCONNECTING: " << user->userID() << " " << user->userName() << std::endl;
- allUsers_.leave( user );
+void Server::receiveUserName( UserSession * user, const MessageBodyUserName & msg ){
+ std::cout << "USER_NAME: " << user->userID() << " " << msg.userName() << std::endl;
- for ( std::map < int, UserObject * >::iterator i = user->childs()->begin(); i != user->childs()->end();){
- destroyUserObject( (i++)->second );
+ if ( !userNames_.count( msg.userName() ) ){
+ user->setUserName( msg.userName() );
+ allUsers_.join( user );
+ userNames_.insert( msg.userName() );
+
+ //** send the user name and the userId to all connected users;
+ MessageBodyUserName newUserMsg( msg.userName(), user->userID() );
+ allUsers_.send( newUserMsg );
+
+ //** send all usernames and the userIds to the new user;
+ for ( UserSessionGroup::iterator it = allUsers_.begin(); it != allUsers_.end(); it ++ ){
+ if ( (*it)->userID() != user->userID() ){
+ MessageBodyUserName n( (*it)->userName(), (*it)->userID() );
+ user->send( n );
+ }
+ }
+
+ user->setRegistered( true );
+ } else {
+ std::cerr << "USER: " << msg.userName()<< " already exist." << std::endl;
+
+ MessageBodyConnectionRefused msg( CONNECTION_REFUSED_USER_ALREADY_EXIST );
+ user->send( msg );
+ // disconnectUser( user, false );
}
-
- MessageBodyDisconnect disco( user->userID() );
- allUsers_.send( disco );
-
- delete user;
- std::cout << "DISCONNECTED: " << name << std::endl;
}
-void Server::receiveUserName( UserSession * user, const MessageBodyUserName & msg ){
- std::cout << "USER_NAME: " << user->userID() << " " << msg.userName() << std::endl;
- user->setUserName( msg.userName() );
+void Server::disconnectUser( UserSession * user ){
+ std::string name( user->userName() );
+ std::cout << "DISCONNECTING: " << user->userID() << " " << name << std::endl;
- //** send the user name and the userId to all connected users;
- MessageBodyUserName newUserMsg( msg.userName(), user->userID() );
- allUsers_.send( newUserMsg );
-
- //** send all usernames and the userIds to the new user;
- for ( UserSessionGroup::iterator it = allUsers_.begin(); it != allUsers_.end(); it ++ ){
- if ( (*it)->userID() != user->userID() ){
- MessageBodyUserName n( (*it)->userName(), (*it)->userID() );
- user->send( n );
+ if ( user->registered() ){
+ allUsers_.leave( user );
+
+ for ( std::map < int, UserObject * >::iterator i = user->childs()->begin(); i != user->childs()->end();){
+ destroyUserObject( (i++)->second );
}
+
+ MessageBodyDisconnect disco( user->userID() );
+ allUsers_.send( disco );
+ userNames_.erase( name );
}
+
+ // delete user;
+ std::cout << "DISCONNECTED: " << name << std::endl;
}
void Server::receiveChat( UserSession * user, const MessageBodyChat & msg ){
@@ -88,19 +104,32 @@
}
UserObject * Server::createUserObject( UserSession * user, const std::string & name, int userID, int childID ){
- std::map < long, UserObject * >::iterator it;
+// std::map < long, UserObject * >::iterator it;
+// UserObject * obj = NULL;
+// long id = createGlobalID( userID, childID );
+
+// if ( ( it = userObjects_.find( id ) ) == userObjects_.end() ){
+// std::cout << "Create user object: " << name << std::endl;
+// obj = new UserObject( user, name, childID );
+// user->insertChild( obj );
+// userObjects_[ id ] = obj;
+// } else {
+// std::cout << "Create request, but object already exist: " << name << std::endl;
+// obj = it->second;
+// }
+
UserObject * obj = NULL;
long id = createGlobalID( userID, childID );
- if ( ( it = userObjects_.find( id ) ) == userObjects_.end() ){
+ if ( !userObjects_.count( id ) ){
std::cout << "Create user object: " << name << std::endl;
obj = new UserObject( user, name, childID );
user->insertChild( obj );
userObjects_[ id ] = obj;
} else {
- std::cout << "Create request, but object allready exist: " << name << std::endl;
- obj = it->second;
+ std::cout << "Create request, but object already exist: " << name << std::endl;
+ obj = userObjects_[ id ];
}
return obj;
@@ -167,7 +196,7 @@
}
}
} else {
- std::cerr << "object: " << name << " allready registered. " << std::endl;
+ std::cerr << "object: " << name << " already registered. " << std::endl;
}
} else {
std::cerr << "Cannot register object: " << name << std::endl;
Modified: branches/ogsector/src/networkServer.h
===================================================================
--- branches/ogsector/src/networkServer.h 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkServer.h 2007-04-14 18:04:36 UTC (rev 388)
@@ -10,7 +10,6 @@
#include "networkProtocol.h"
#include "networkServerUser.h"
-
using asio::ip::tcp;
namespace OpenGate{
@@ -46,12 +45,12 @@
void handleAccept( UserSession * user, const asio::error & error );
- void addUser( UserSession * user );
+ void addUserSession( UserSession * user );
- void disconnectUser( UserSession * user );
-
void receiveUserName( UserSession * user, const MessageBodyUserName & msg );
-
+
+ void disconnectUser( UserSession * user );
+
void receiveChat( UserSession * user, const MessageBodyChat & msg );
UserObject * createUserObject( UserSession * user, const std::string & name, int userID, int childID );
@@ -62,13 +61,13 @@
void deRegisterUserObject( UserObject * obj );
-
private:
asio::io_service & io_service_;
tcp::acceptor acceptor_;
long userIDCounter_;
std::map < long, UserObject * > userObjects_;
+ std::set < std::string > userNames_;
UserSessionGroup allUsers_;
};
Modified: branches/ogsector/src/networkServerUser.cpp
===================================================================
--- branches/ogsector/src/networkServerUser.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkServerUser.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -12,6 +12,8 @@
UserSession::UserSession( Server * server, int userID )
: socket_( server->io_service() ), server_( server ), userID_ ( userID ), userName_( "" ) {
+ connected_ = true;
+ registered_ = false;
}
UserSession::~UserSession(){
@@ -20,6 +22,7 @@
void UserSession::start() {
MessageBodyUserID msg( userID_ );
this->send( msg );
+ connected_ = true;
asio::async_read( socket_, asio::buffer( readMsg_.data(), Message::HeaderLength ),
boost::bind( & UserSession::handleReadHeader, this, asio::placeholders::error ) );
}
@@ -29,13 +32,13 @@
}
void UserSession::eraseChild( UserObject * obj ) {
- if ( childs_.find( obj->childID() ) != childs_.end() ){
- childs_.erase( childs_.find( obj->childID() ) );
+ if ( childs_.count( obj->childID() ) ){
+ childs_.erase( obj->childID() );
}
}
UserObject * UserSession::child( int childID ) {
- if ( childs_.find( childID ) != childs_.end() ) {
+ if ( childs_.count( childID ) ) {
return childs_[ childID ];
} else {
return NULL;
@@ -49,7 +52,7 @@
// std::cout << "send.length() = " << writeMsgs_.front().length() << std::endl;
- if ( ! write_in_progress ) {
+ if ( ! write_in_progress && connected_ ) {
asio::async_write( socket_, asio::buffer( writeMsgs_.front().data(), writeMsgs_.front().length() ),
boost::bind( & UserSession::handleWrite, this, asio::placeholders::error ) );
}
@@ -82,6 +85,7 @@
asio::async_read( socket_, asio::buffer( readMsg_.body(), readMsg_.bodyLength() ),
boost::bind( & UserSession::handleReadBody, this, asio::placeholders::error ) );
} else {
+ connected_ = false;
server_->disconnectUser( this );
}
}
@@ -137,7 +141,7 @@
if ( !error ) {
writeMsgs_.pop_front();
- if ( !writeMsgs_.empty() ) {
+ if ( !writeMsgs_.empty() && connected_ ) {
asio::async_write( socket_, asio::buffer( writeMsgs_.front().data(), writeMsgs_.front().length() ),
boost::bind( & UserSession::handleWrite, this, asio::placeholders::error ) );
}
Modified: branches/ogsector/src/networkServerUser.h
===================================================================
--- branches/ogsector/src/networkServerUser.h 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/networkServerUser.h 2007-04-14 18:04:36 UTC (rev 388)
@@ -28,6 +28,10 @@
int userID() const { return userID_; }
+ bool registered() const{ return registered_; }
+
+ void setRegistered( bool reg ) { registered_ = reg; }
+
void setUserName( const std::string & userName ) { userName_ = userName; }
const std::string userName( ) const { return userName_; }
@@ -56,6 +60,8 @@
tcp::socket socket_;
Server * server_;
int userID_;
+ bool connected_;
+ bool registered_;
std::string userName_;
Message readMsg_;
Modified: branches/ogsector/src/ogconsole.cpp
===================================================================
--- branches/ogsector/src/ogconsole.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/ogconsole.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -96,12 +96,14 @@
root_->getAutoCreatedWindow()->writeContentsToFile( screenieName );
print( std::string( "Wrote: " + screenieName ) );
} else{
- char legalchars[] = "ABCDEFGHIJKLMNOPQRSTUVWXUZabcdefghijklmnopqrstuvwxyz1234567890+!\"#%&/()=?[]\\*-_.:,; ";
- for ( size_t c = 0; c < sizeof( legalchars ); c++ ){
- if ( legalchars[ c ] == e.text ){
- prompt_ += e.text;
- break;
- }
+// char legalchars[] = "ABCDEFGHIJKLMNOPQRSTUVWXUZabcdefghijklmnopqrstuvwxyz1234567890+!\"#%&/()=?[]\\*-_.:,; ";
+// for ( size_t c = 0; c < sizeof( legalchars ); c++ ){
+// if ( legalchars[ c ] == e.text ){
+// prompt_ += e.text;
+// break;
+// }
+ if ( (int)e.text > 32 && (int)e.text < 167 ) {
+ prompt_ += e.text;
}
}
updateConsole_ = true;
Modified: branches/ogsector/src/ogsectorclient.cpp
===================================================================
--- branches/ogsector/src/ogsectorclient.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/ogsectorclient.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -74,7 +74,7 @@
#ifdef NETWORKCHECK
myMSleep( 1 );
int count = 0;
- while( nw.online() && count < 20 ){
+ while( nw.online() && count < 1000 ){
myMSleep( 1000 );
Modified: branches/ogsector/src/ogsectorserver.cpp
===================================================================
--- branches/ogsector/src/ogsectorserver.cpp 2007-04-14 00:25:52 UTC (rev 387)
+++ branches/ogsector/src/ogsectorserver.cpp 2007-04-14 18:04:36 UTC (rev 388)
@@ -50,5 +50,4 @@
}
return EXIT_SUCCESS;
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-14 00:25:51
|
Revision: 387
http://svn.sourceforge.net/opengate/?rev=387&view=rev
Author: ultrasick
Date: 2007-04-13 17:25:52 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
moved the screenshots to our project page
Removed Paths:
-------------
branches/ogsector/screenshots/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-14 00:20:14
|
Revision: 386
http://svn.sourceforge.net/opengate/?rev=386&view=rev
Author: ultrasick
Date: 2007-04-13 17:20:11 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
uploading a new version of the client exe file carsten mailed me
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-14 00:18:40
|
Revision: 385
http://svn.sourceforge.net/opengate/?rev=385&view=rev
Author: ultrasick
Date: 2007-04-13 17:18:40 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
added 2 more parts of the primrose texture
Modified Paths:
--------------
trunk/data/ships/solrain/primrose/primrose.blend
Added Paths:
-----------
trunk/templates/data/ships/solrain/primrose/parts/57 + 58.pspimage
trunk/templates/data/ships/solrain/primrose/viewable area.7z
Modified: trunk/data/ships/solrain/primrose/primrose.blend
===================================================================
(Binary files differ)
Added: trunk/templates/data/ships/solrain/primrose/parts/57 + 58.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/57 + 58.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/primrose/viewable area.7z
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/viewable area.7z
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-04-13 16:50:52
|
Revision: 384
http://svn.sourceforge.net/opengate/?rev=384&view=rev
Author: spom_spom
Date: 2007-04-13 09:50:52 -0700 (Fri, 13 Apr 2007)
Log Message:
-----------
Replaced libgrapple by boost::asio, works sweet whith linux and win32. Add simple logmanager and simple console.
Modified Paths:
--------------
branches/ogsector/config.h.in
branches/ogsector/configure.ac
branches/ogsector/data/simpleHUD.material
branches/ogsector/data/simpleHUD.overlay
branches/ogsector/ogre.cfg
branches/ogsector/plugins.cfg
branches/ogsector/resources.cfg
branches/ogsector/runClient.sh
branches/ogsector/src/InputManager.cpp
branches/ogsector/src/InputManager.h
branches/ogsector/src/Makefile.am
branches/ogsector/src/Makefile.in
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorClient.cpp
branches/ogsector/src/SectorClient.h
branches/ogsector/src/SectorClientFrameListener.cpp
branches/ogsector/src/SectorClientFrameListener.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/common.cpp
branches/ogsector/src/common.h
branches/ogsector/src/networkClient.cpp
branches/ogsector/src/networkClient.h
branches/ogsector/src/networkProtocol.h
branches/ogsector/src/networkServer.cpp
branches/ogsector/src/networkServer.h
branches/ogsector/src/ogsectorclient.cpp
branches/ogsector/src/ogsectorserver.cpp
branches/ogsector/win32/ogsectorclient/resources.cfg
Added Paths:
-----------
branches/ogsector/data/Console.png
branches/ogsector/data/fonts.zip
branches/ogsector/data/simpleHUD.fontdef
branches/ogsector/src/LogManager.cpp
branches/ogsector/src/LogManager.h
branches/ogsector/src/networkServerUser.cpp
branches/ogsector/src/networkServerUser.h
branches/ogsector/src/ogconsole.cpp
branches/ogsector/src/ogconsole.h
branches/ogsector/win32/ogsectorclient/runClient.bat
Removed Paths:
-------------
branches/ogsector/data/MediaFromOgre/fonts.zip
Modified: branches/ogsector/config.h.in
===================================================================
--- branches/ogsector/config.h.in 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/config.h.in 2007-04-13 16:50:52 UTC (rev 384)
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -18,5 +45,8 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
Modified: branches/ogsector/configure.ac
===================================================================
--- branches/ogsector/configure.ac 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/configure.ac 2007-04-13 16:50:52 UTC (rev 384)
@@ -26,11 +26,13 @@
AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $OIS_CFLAGS")
AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $OIS_LIBS")
-#libgrapple - http://grapple.linuxgamepublishing.com/grapple.php
-PKG_CHECK_MODULES(GRAPPLE, [GRAPPLE >= 0.9])
-AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $GRAPPLE_CFLAGS")
-AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $GRAPPLE_LIBS")
+dnl asio: http://sourceforge.net/projects/asio/
+AC_CHECK_HEADER([asio.hpp])
+dnl boost: http://www.boost.org/
+dnl # some of the boost headers are needed by asio
+#AC_CHECK_HEADER([boost/bind.h])
+
#freealut - http://www.openal.org
PKG_CHECK_MODULES(freealut, [freealut >= 1.0.1])
AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $freealut_CFLAGS")
@@ -41,6 +43,7 @@
AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+#AC_SUBST([CXXFLAGS], ["-g -Wall ${CXXFLAGS}"])
dnl #libopcode
dnl PKG_CHECK_MODULES(GRAPPLE, [GRAPPLE >= 0.9])
dnl AM_CXXFLAGS="$AM_CXXFLAGS $GRAPPLE_CFLAGS"
Added: branches/ogsector/data/Console.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/Console.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/ogsector/data/MediaFromOgre/fonts.zip
===================================================================
(Binary files differ)
Added: branches/ogsector/data/fonts.zip
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/fonts.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/simpleHUD.fontdef
===================================================================
--- branches/ogsector/data/simpleHUD.fontdef (rev 0)
+++ branches/ogsector/data/simpleHUD.fontdef 2007-04-13 16:50:52 UTC (rev 384)
@@ -0,0 +1,17 @@
+Console
+{
+ type truetype
+ source bluehigh.ttf
+ size 32
+ resolution 55
+}
+
+
+BlueHighway
+{
+ type truetype
+ source bluehigh.ttf
+ size 32
+ resolution 55
+}
+
Modified: branches/ogsector/data/simpleHUD.material
===================================================================
--- branches/ogsector/data/simpleHUD.material 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/data/simpleHUD.material 2007-04-13 16:50:52 UTC (rev 384)
@@ -33,3 +33,22 @@
}
}
}
+
+material console/background
+{
+ technique
+ {
+ pass
+ {
+ depth_check off
+ lighting off
+ scene_blend alpha_blend
+ diffuse 1.0 1.0 1.0 1.0
+
+ texture_unit
+ {
+ texture Console.png
+ }
+ }
+ }
+}
Modified: branches/ogsector/data/simpleHUD.overlay
===================================================================
--- branches/ogsector/data/simpleHUD.overlay 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/data/simpleHUD.overlay 2007-04-13 16:50:52 UTC (rev 384)
@@ -1,16 +1,69 @@
OpenGate/SimpleHUD
{
zorder 500
-// container Panel(OpenGate/SimpleHUDPanelChatInput)
-// {
-// metrics_mode pixels
-// left 200
-// top 800
-// width 700
-// height 30
-// material Core/BreakPanel
-// }
+ container Panel(OpenGate/SimpleHUDConsole)
+ {
+ left 0.01
+ top 0.01
+ width 0.98
+ height 0.5
+ material console/background
+ element TextArea(OpenGate/SimpleHUDConsoleTextArea)
+ {
+ left 0.01
+ top 0.01
+ width 0.98
+ height 0.5
+ font_name Console
+ char_height 0.02
+ colour_top 1 1 1
+ colour_bottom 1 1 1
+ }
+ }
+
+ container Panel(OpenGate/SimpleHUDConsoleShort)
+ {
+ left 0.01
+ top 0.01
+ width 0.98
+ height 0.075
+// material console/background
+
+ element TextArea(OpenGate/SimpleHUDConsoleShortTextArea)
+ {
+ left 0.01
+ top 0.01
+ width 0.98
+ height 0.075
+ font_name Console
+ char_height 0.02
+ colour_top 1.0 1.0 1.0
+ colour_bottom 1.0 1.0 1.0
+ }
+ }
+
+ container Panel(OpenGate/SimpleHUDChatInPanel)
+ {
+ left 0.01
+ top 0.52
+ width 0.98
+ height 0.025
+ material console/background
+
+ element TextArea(OpenGate/SimpleHUDChatInTextField)
+ {
+ left 0.01
+ top 0.005
+ width 0.9
+ height 0.025
+ font_name Console
+ char_height 0.02
+ colour_top 1.0 1.0 1.0
+ colour_bottom 1.0 1.0 1.0
+ }
+ }
+
container Panel(OpenGate/CenterPointer)
{
metrics_mode pixels
@@ -33,239 +86,163 @@
container Panel(OpenGate/SimpleHUDPanel)
{
-// metrics_mode pixels
-// vert_align bottom
left 0
top 0
width 1.0
height 1.0
-// border_size 1 1 1 1
-// border_material Core/StatsBlockBorder
-// border_topleft_uv 0.0000 1.0000 0.0039 0.9961
-// border_top_uv 0.0039 1.0000 0.9961 0.9961
-// border_topright_uv 0.9961 1.0000 1.0000 0.9961
-// border_left_uv 0.0000 0.9961 0.0039 0.0039
-// border_right_uv 0.9961 0.9961 1.0000 0.0039
-// border_bottomleft_uv 0.0000 0.0039 0.0039 0.0000
-// border_bottom_uv 0.0039 0.0039 0.9961 0.0000
-// border_bottomright_uv 0.9961 0.0039 1.0000 0.0000
-//
+
element TextArea(OpenGate/SimpleHUDTextStats)
{
- metrics_mode pixels
- left 700
- top 10
- width 100
- height 10
- font_name BlueHighway
- char_height 16
+ left 0.8
+ top 0.01
+ width 0.2
+ height 0.03
caption FPS:
+ font_name BlueHighway
+ char_height 0.02
colour_top 1 1 0.7
colour_bottom 1 1 0.7
}
- element TextArea(OpenGate/DebugText)
- {
- metrics_mode pixels
- left 230
- top 70
- width 200
- height 30
- font_name BlueHighway
- char_height 16
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
-
- element TextArea(OpenGate/SimpleHUDTextChatIn)
- {
- metrics_mode pixels
- left 10
- top 10
- width 700
- height 100
- font_name BlueHighway
- char_height 16
- colour_top 1.0 1.0 1.0
- colour_bottom 1.0 1.0 1.0
- }
-
- element TextArea(OpenGate/SimpleHUDTextChatOut)
- {
- metrics_mode pixels
- left 10
- top 450
- width 700
- height 100
- font_name BlueHighway
- char_height 16
- colour_top 1.0 1.0 1.0
- colour_bottom 1.0 1.0 1.0
- }
-
element TextArea(OpenGate/SimpleHUDTextVelocity)
{
- metrics_mode pixels
- left 200
- top 200
- width 200
- height 200
- font_name BlueHighway
- char_height 16
+ left 0.25
+ top 0.3
+ width 0.1
+ height 0.03
caption Vel:
+ font_name BlueHighway
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextVelocityMax)
{
- metrics_mode pixels
- left 260
- top 200
- width 200
- height 200
- font_name BlueHighway
- char_height 16
+ left 0.31
+ top 0.3
+ width 0.1
+ height 0.03
caption /
+ font_name BlueHighway
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextThr)
{
- metrics_mode pixels
- left 200
- top 220
- width 200
- height 200
- font_name BlueHighway
- char_height 16
+ left 0.25
+ top 0.33
+ width 0.1
+ height 0.03
caption Thr:
+ font_name BlueHighway
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextAcc)
{
- metrics_mode pixels
- left 200
- top 240
- width 200
- height 200
- font_name BlueHighway
- char_height 16
+ left 0.25
+ top 0.36
+ width 0.03
+ height 0.1
caption Current Acc:
+ font_name BlueHighway
+ char_height 0.022
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextShield)
{
- metrics_mode pixels
- left 200
- top 260
- width 200
- height 200
+ left 0.25
+ top 0.39
+ width 0.1
+ height 0.03
font_name BlueHighway
- char_height 16
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextArmor)
{
- metrics_mode pixels
- left 200
- top 280
- width 200
- height 200
+ left 0.25
+ top 0.42
+ width 0.1
+ height 0.03
font_name BlueHighway
- char_height 16
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextPosition)
{
- metrics_mode pixels
- left 200
- top 300
- width 200
- height 200
- font_name BlueHighway
- char_height 16
+ left 0.25
+ top 0.45
+ width 0.1
+ height 0.1
caption Current Pos:
+ font_name BlueHighway
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
+
element TextArea(OpenGate/SimpleHUDTextTargetName)
{
- metrics_mode pixels
- left 20
- top 550
- width 100
- height 20
+ left 0.015
+ top 0.80
+ width 0.1
+ height 0.02
font_name BlueHighway
- char_height 14
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
-
element TextArea(OpenGate/SimpleHUDTextTargetDistance)
{
- metrics_mode pixels
- left 20
- top 565
- width 100
- height 20
+ left 0.015
+ top 0.82
+ width 0.1
+ height 0.02
font_name BlueHighway
- char_height 14
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
element TextArea(OpenGate/SimpleHUDTextTargetVelocity)
{
- metrics_mode pixels
- left 20
- top 580
- width 100
- height 20
+ left 0.17
+ top 0.84
+ width 0.1
+ height 0.02
font_name BlueHighway
- char_height 14
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
+
element TextArea(OpenGate/SimpleHUDTextTargetShield)
{
- metrics_mode pixels
- left 20
- top 595
- width 100
- height 20
+ left 0.17
+ top 0.86
+ width 0.1
+ height 0.02
font_name BlueHighway
- char_height 14
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
element TextArea(OpenGate/SimpleHUDTextTargetArmor)
{
- metrics_mode pixels
- left 20
- top 610
- width 100
- height 20
+ left 0.17
+ top 0.88
+ width 0.1
+ height 0.02
font_name BlueHighway
- char_height 14
+ char_height 0.02
colour_top 0.5 0.7 0.5
colour_bottom 0.3 0.5 0.3
}
}
-
-// element Entity cone1.mesh(cone)
-// {
-// position 700 700 0
-// rotation 0 0 0 0
-// }
}
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/ogre.cfg 2007-04-13 16:50:52 UTC (rev 384)
@@ -1,7 +1,7 @@
Render System=OpenGL Rendering Subsystem
[OpenGL Rendering Subsystem]
-FSAA=0
+FSAA=6
Full Screen=No
RTT Preferred Mode=FBO
Refresh Rate=Not applicable
Modified: branches/ogsector/plugins.cfg
===================================================================
--- branches/ogsector/plugins.cfg 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/plugins.cfg 2007-04-13 16:50:52 UTC (rev 384)
@@ -1,7 +1,7 @@
# Defines plugins to load
# Define plugin folder
-PluginFolder=/usr/local/lib/OGRE
+PluginFolder=/usr/lib/OGRE
# Define D3D rendering implementation plugin
Plugin=RenderSystem_GL.so
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/resources.cfg 2007-04-13 16:50:52 UTC (rev 384)
@@ -6,9 +6,9 @@
[General]
FileSystem=./data
Zip=./data/simpleSkybox.zip
+Zip=./data/fonts.zip
#
FileSystem=./data/MediaFromOgre
-Zip=./data/MediaFromOgre/fonts.zip
#
FileSystem=../../trunk/data/
FileSystem=../../trunk/data/materials
Modified: branches/ogsector/runClient.sh
===================================================================
--- branches/ogsector/runClient.sh 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/runClient.sh 2007-04-13 16:50:52 UTC (rev 384)
@@ -11,4 +11,5 @@
export LD_LIBRARY_PATH=./externals/lib:$LD_LIBRARY_PATH
echo "starting client for user: $USERNAME and looking for host: $HOSTNAME"
-./src/ogsectorclient $USERNAME $HOSTNAME
+
+./src/ogsectorclient $USERNAME $HOSTNAME --ogreconfig=0
Modified: branches/ogsector/src/InputManager.cpp
===================================================================
--- branches/ogsector/src/InputManager.cpp 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/InputManager.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -20,7 +20,7 @@
mKeyboard = static_cast<OIS::Keyboard*>(mInputSystem->createInputObject( OIS::OISKeyboard, true));
mKeyboard->setEventCallback( this );
-#ifndef WIN32
+#ifndef WIN32
if ( mInputSystem->numJoysticks() > 0 ) {
// mJoysticks.resize( mInputSystem->numJoysticks() );
@@ -33,7 +33,7 @@
// }
mJoyStick = static_cast<OIS::JoyStick*>(mInputSystem->createInputObject( OIS::OISJoyStick, true));
mJoyStick->setEventCallback( this );
- }
+ }
#endif
}
}
Modified: branches/ogsector/src/InputManager.h
===================================================================
--- branches/ogsector/src/InputManager.h 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/InputManager.h 2007-04-13 16:50:52 UTC (rev 384)
@@ -86,41 +86,4 @@
};
-// class InputManager : public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener {
-// public:
-// virtual ~InputManager( void );
-
-// void initialise( Ogre::RenderWindow *renderWindow );
-// void capture( void );
-
-// void setWindowExtents( int width, int height );
-
-// OIS::Mouse* getMouse( void );
-// OIS::Keyboard* getKeyboard( void );
-// OIS::JoyStick* getJoystick( unsigned int index );
-
-// int getNumOfJoysticks( void );
-
-// static InputManager* getSingletonPtr( void );
-
-// private:
-// InputManager( void );
-// InputManager( const InputManager & input ) { }
-// InputManager & operator = ( const InputManager & input );
-
-// OIS::InputManager * mInputSystem;
-// OIS::Mouse * mMouse;
-// OIS::Keyboard * mKeyboard;
-
-// std::vector< OIS::JoyStick * > mJoysticks;
-// std::vector< OIS::JoyStick * >::iterator itJoystick;
-// std::vector< OIS::JoyStick * >::iterator itJoystickEnd;
-
-// std::map< std::string, OIS::KeyListener * > mKeyListeners;
-// std::map< std::string, OIS::MouseListener * > mMouseListeners;
-// std::map< std::string, OIS::JoyStickListener * > mJoystickListeners;
-
-// static InputManager *mInputManager;
-// };
-
#endif // INPUTMANAGER_H
Added: branches/ogsector/src/LogManager.cpp
===================================================================
--- branches/ogsector/src/LogManager.cpp (rev 0)
+++ branches/ogsector/src/LogManager.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -0,0 +1,98 @@
+#include "LogManager.h"
+
+namespace OpenGate{
+
+LogManager::LogManager( const std::string & logFileName, const std::string & chatLogFileName ) {
+ logFile_.open( logFileName.c_str(), std::fstream::trunc );
+
+ chatLogFile_.open( chatLogFileName.c_str(), std::fstream::app );
+ chatLogFile_ << "\n" << timeStamp() << "Starting new session" << std::endl;
+
+ // stdLog_ = std::cout;
+ logType_ = None;
+ console_ = NULL;
+}
+
+LogManager::~LogManager( ) {
+ logFile_.close();
+ chatLogFile_.close();
+}
+
+std::string LogManager::timeStamp() {
+ std::time_t now = std::time( 0 );
+ struct tm * time = localtime( &now );
+
+ return std::string("["
+ + toStr( time->tm_year + 1900 ) + "."
+ + toStr( time->tm_mon + 1 ) + "."
+ + toStr( time->tm_mday ) + "-"
+ + toStr( time->tm_hour ) + ":"
+ + toStr( time->tm_min ) + ":"
+ + toStr( time->tm_sec ) + "]" );
+}
+
+void LogManager::setConsole( OGConsole * console ){
+ console_ = console;
+}
+
+void LogManager::chat( const std::string & name, const std::string & msg ){
+ std::string logMsg( name + ": " + msg );
+
+ if ( console_ ) console_->print( logMsg );
+ chatLogFile_ << timeStamp() << " " << logMsg << std::endl;
+ write_( msg );
+}
+
+void LogManager::info( const std::string & msg ){
+ if ( console_ ) console_->print( msg );
+ write_( msg );
+}
+
+void LogManager::debug( const std::string & msg ){
+ write_( msg );
+}
+
+void LogManager::fatal( const std::string & msg ){
+ if ( console_ ) console_->print( msg );
+ write_( msg );
+}
+
+void LogManager::write_( const std::string & msg ){
+ std::cout << msg << std::endl;
+ logFile_ << timeStamp() << ": " << msg << std::endl;
+}
+
+void LogManager::cout( const std::string & msg ){
+ std::cout << msg << std::endl;
+}
+
+// LogManager & LogManager::operator - ( LogType logType ) {
+// logType_ = logType;
+// return *this;
+// }
+
+// class Flush{
+// public:
+// Flush( LogManager & log ){
+// }
+// };
+
+// LogManager & LogManager::operator << ( const Flush & flush ) {
+// switch( logType_ ){
+// case Chat:
+// chatLogFile_ << std::endl;
+// case Info:
+// case Fatal:
+// // if ( console_ ) (*console_) << x;
+// case Debug:
+// std::cout << std::endl;
+// logFile_ << std::endl;
+// break;
+// }
+// return *this;
+// }
+
+
+} //namespace OpenGate
+
+
Added: branches/ogsector/src/LogManager.h
===================================================================
--- branches/ogsector/src/LogManager.h (rev 0)
+++ branches/ogsector/src/LogManager.h 2007-04-13 16:50:52 UTC (rev 384)
@@ -0,0 +1,56 @@
+#ifndef LOGMANAGER__H
+#define LOGMANAGER__H
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include "common.h"
+#include "ogconsole.h"
+
+namespace OpenGate{
+
+enum LogType{ None, Info, Chat, Debug, Fatal};
+
+ //class Flush;
+
+class LogManager {
+public:
+ LogManager( const std::string & logFileName, const std::string & chatLogFileName );
+
+ ~LogManager( );
+
+ LogManager & operator - ( LogType type );
+
+ void setConsole( OGConsole * console );
+
+ std::string timeStamp();
+
+ void info( const std::string & msg );
+
+ void chat( const std::string & name, const std::string & msg );
+
+ void debug( const std::string & msg );
+
+ void fatal( const std::string & msg );
+
+ void cout( const std::string & msg );
+// template < class T > LogManager & operator << ( const T & x );
+// // LogManager & operator << ( const std::endl & endl ){}
+// LogManager & operator << ( const Flush & flush );
+
+protected:
+ void write_( const std::string & msg );
+
+ std::ofstream logFile_;
+ std::ofstream chatLogFile_;
+ OGConsole *console_;
+
+ LogType logType_;
+};
+
+} //namespace OpenGate
+
+
+
+#endif // #ifndef __LOGCPP_H
Modified: branches/ogsector/src/Makefile.am
===================================================================
--- branches/ogsector/src/Makefile.am 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/Makefile.am 2007-04-13 16:50:52 UTC (rev 384)
@@ -6,8 +6,12 @@
ogsectorclient_SOURCES = \
ogsectorclient.cpp \
common.h \
+ LogManager.h \
+ LogManager.cpp \
common.cpp \
- network_protocol.h \
+ ogconsole.h \
+ ogconsole.cpp \
+ networkProtocol.h \
Sector.h \
Sector.cpp \
SectorClient.h \
@@ -25,9 +29,11 @@
ogsectorserver.cpp \
common.h \
common.cpp \
- network_protocol.h \
+ networkProtocol.h \
networkServer.h \
- networkServer.cpp
+ networkServer.cpp \
+ networkServerUser.h \
+ networkServerUser.cpp
testopenalmanager_SOURCES = \
testopenalmanager.cpp \
Modified: branches/ogsector/src/Makefile.in
===================================================================
--- branches/ogsector/src/Makefile.in 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/Makefile.in 2007-04-13 16:50:52 UTC (rev 384)
@@ -48,14 +48,15 @@
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_ogsectorclient_OBJECTS = ogsectorclient.$(OBJEXT) common.$(OBJEXT) \
+am_ogsectorclient_OBJECTS = ogsectorclient.$(OBJEXT) \
+ LogManager.$(OBJEXT) common.$(OBJEXT) ogconsole.$(OBJEXT) \
Sector.$(OBJEXT) SectorClient.$(OBJEXT) \
SectorClientFrameListener.$(OBJEXT) InputManager.$(OBJEXT) \
networkClient.$(OBJEXT) SectorObjects.$(OBJEXT)
ogsectorclient_OBJECTS = $(am_ogsectorclient_OBJECTS)
ogsectorclient_LDADD = $(LDADD)
am_ogsectorserver_OBJECTS = ogsectorserver.$(OBJEXT) common.$(OBJEXT) \
- networkServer.$(OBJEXT)
+ networkServer.$(OBJEXT) networkServerUser.$(OBJEXT)
ogsectorserver_OBJECTS = $(am_ogsectorserver_OBJECTS)
ogsectorserver_LDADD = $(LDADD)
am_testopenalmanager_OBJECTS = testopenalmanager.$(OBJEXT) \
@@ -93,6 +94,7 @@
AWK = @AWK@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
@@ -101,9 +103,9 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GRAPPLE_CFLAGS = @GRAPPLE_CFLAGS@
-GRAPPLE_LIBS = @GRAPPLE_LIBS@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -171,8 +173,12 @@
ogsectorclient_SOURCES = \
ogsectorclient.cpp \
common.h \
+ LogManager.h \
+ LogManager.cpp \
common.cpp \
- network_protocol.h \
+ ogconsole.h \
+ ogconsole.cpp \
+ networkProtocol.h \
Sector.h \
Sector.cpp \
SectorClient.h \
@@ -190,9 +196,11 @@
ogsectorserver.cpp \
common.h \
common.cpp \
- network_protocol.h \
+ networkProtocol.h \
networkServer.h \
- networkServer.cpp
+ networkServer.cpp \
+ networkServerUser.h \
+ networkServerUser.cpp
testopenalmanager_SOURCES = \
testopenalmanager.cpp \
@@ -272,6 +280,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InputManager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sector.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SectorClient.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SectorClientFrameListener.Po@am__quote@
@@ -279,6 +288,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkClient.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkServer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkServerUser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogconsole.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogsectorclient.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogsectorserver.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openALSoundManager.Po@am__quote@
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/Sector.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -2,7 +2,8 @@
namespace OpenGate{
-Sector::Sector( Ogre::SceneManager * sceneMgr, Network * network ) : sceneMgr_( sceneMgr ), network_( network ){
+Sector::Sector( Ogre::SceneManager * sceneMgr, NetworkClient * network, LogManager * log )
+ : sceneMgr_( sceneMgr ), network_( network ), log_( log ) {
sectorname_ = "Testsector";
avatar_ = NULL;
@@ -13,14 +14,13 @@
//** Create a skybox;
sceneMgr_->setSkyBox( true, "OpenGate/SimpleSkyBox1", 100 );
-// //** Create a light;
- // Ogre::Light * l = sceneMgr_->createLight("MainLight");
+ //** Create a light;
+ Ogre::Light * l = sceneMgr_->createLight("MainLight");
+ // Accept default settings: point light, white diffuse, just set position
+ // NB I could attach the light to a SceneNode if I wanted it to move automatically with
+ // the avatar, but I don't
+ l->setPosition( 0, 0, 0 );
-// // Accept default settings: point light, white diffuse, just set position
-// // NB I could attach the light to a SceneNode if I wanted it to move automatically with
-// // other objects, but I don't
-// l->setPosition( 0, 0, 200 );
-
new OgreOpcode::CollisionManager( sceneMgr_ );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollClass( "SectorObject" );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollClass( "Bullet" );
@@ -46,6 +46,12 @@
Ogre::Real( 500.0 ),
Ogre::Degree( 0.0 ) );
+// createStaticObject( Ogre::String("misc/jumpgate.mesh"),
+// "jumpgate",
+// Ogre::Vector3( 0, -1000, 0 ),
+// Ogre::Real( 10.0 ),
+// Ogre::Degree( 0.0 ) );
+
// createCircle();
createStaticObject( Ogre::String("ogrehead.mesh"),
@@ -80,7 +86,7 @@
int nCollids = report.getNumCollisions();
if ( nCollids > 0 ){
- std::cout << "Collisions: " << nCollids << std::endl;
+ // std::cout << "Collisions: " << nCollids << std::endl;
OgreOpcode::CollisionPair **collisionReport;
report.getAllCollisions( collisionReport );
@@ -93,27 +99,27 @@
static_cast< BaseObject * >( col2->getClientData() )->collide( static_cast< BaseObject * >( col1->getClientData() ) );
}
- std::cout << "CollisionContext attached objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getAttachedObjectCount()) << std::endl;
- std::cout << "CollisionContext owned objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getOwnedObjectCount()) << std::endl;
- std::cout << "CollisionManager shapes: " + Ogre::StringConverter::toString(OgreOpcode::CollisionManager::getSingletonPtr()->getShapeCount())<< std::endl;
+// std::cout << "CollisionContext attached objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getAttachedObjectCount()) << std::endl;
+// std::cout << "CollisionContext owned objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getOwnedObjectCount()) << std::endl;
+// std::cout << "CollisionManager shapes: " + Ogre::StringConverter::toString(OgreOpcode::CollisionManager::getSingletonPtr()->getShapeCount())<< std::endl;
- }
+ }
- bool tmpsegfaultDebug = false;
+ // bool tmpsegfaultDebug = false;
for ( std::map< long, SectorObjectMoveable * >::iterator it = movableObjects_.begin(); it != movableObjects_.end();){
if ( !it->second->update( elapsedTime ) ) {
- tmpsegfaultDebug = true;
- std::cout << "Destructing: " << it->second->name() << std::endl;
+ // tmpsegfaultDebug = true;
+ log_->info( "Destructing: " + it->second->name() );
destructMoveableObject( it->second );
it++;
- std::cout << " done." << std::endl;
+ log_->info( "... done." );
} else ++it;
}
- if ( tmpsegfaultDebug) {
- std::cout << "tmpsegfaultDebug done." << std::endl;
- tmpsegfaultDebug = false;
- }
+// if ( tmpsegfaultDebug) {
+// log_->debug( " tmpsegfaultDebug done." );
+// tmpsegfaultDebug = false;
+// }
if ( avatarDeathSequenceTime_ > 0 ){
avatarDeathSequenceTime_ -= elapsedTime;
@@ -196,7 +202,7 @@
obj->setThrustPercent( 70 );
- MessageShipRegister msg( 0, obj->childID(), obj->name(), obj->mainNode()->getPosition(), true );
+ MessageBodyShipRegister msg( 0, obj->childID(), obj->name(), obj->mainNode()->getPosition(), true );
network_->send( msg );
}
@@ -216,7 +222,7 @@
void Sector::avatarDied( ){
avatarDeathSequenceTime_ = 5.0;
avatar_->setVisible( true );
- MessageShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), false );
+ MessageBodyShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), false );
network_->send( msg );
listener_->avatarDeathSequence( true );
}
@@ -230,7 +236,7 @@
avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
avatar_->reset();
- MessageShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), true );
+ MessageBodyShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), true );
network_->send( msg );
avatar_->setVisible( false );
@@ -300,24 +306,21 @@
object->attachObject( circle );
}
-void Sector::receiveVesselRegister( const MessageShipRegister & msg ){
+void Sector::receiveVesselRegister( const MessageBodyShipRegister & msg ){
if ( msg.senderID() != network_->userID() ){
std::map< long , SectorObjectMoveable * >::iterator it;
if ( ( it = movableObjects_.find( createGlobalID( msg.senderID(), msg.childID() ) ) ) != movableObjects_.end() ){
if ( msg.status() == false ){
- std::cout << "Deregistering " << msg.name() << " " << std::endl;
+ log_->info( "Deregistering " + msg.name() );
destructMoveableObject( it->second );
} else {
- std::cout << "Object " << msg.name() << " allready registered." << std::endl;
+ log_->info( "Object " + msg.name() + " allready registered." );
}
} else {
if ( msg.status() == true ){
- std::cout << "Create object " << msg.name()
- << " " << msg.senderID() << " " << (int)msg.childID()
- << " " << msg.position() << std::endl;
-
+ log_->info( "Create object " + msg.name()+ " " + toStr( msg.senderID() ) + " " + toStr( (int)msg.childID() ) + " " );
SectorObjectMoveable * obj = createMoveableObject( msg.name(), msg.senderID(), msg.childID() );
obj->mainNode()->setPosition( msg.position() );
sendAllVesselStatus( );
@@ -328,7 +331,7 @@
void Sector::sendAllVesselMovements( ){
if ( avatar_ != NULL ){
- MessageShipMovement msg( 0,
+ MessageBodyShipMovement msg( 0,
avatar_->mainNode()->getPosition(),
avatar_->velDirection(),
avatar_->mainNode()->getOrientation(),
@@ -338,11 +341,11 @@
avatar_->scaledRoll(),
avatar_->incNetSequence() );
- network_->send( msg, false );
+ network_->send( msg );
}
for ( std::map< int, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin(); it != localAiObjects_.end(); it ++ ){
- MessageShipMovement msgObj( it->second->childID(),
+ MessageBodyShipMovement msgObj( it->second->childID(),
it->second->mainNode()->getPosition(),
it->second->velDirection(),
it->second->mainNode()->getOrientation(),
@@ -352,13 +355,13 @@
it->second->scaledRoll(),
it->second->incNetSequence() );
- network_->send( msgObj, false );
+ network_->send( msgObj );
}
}
-void Sector::receiveVesselMovement( const std::vector < MessageShipMovement * > & movements ){
+void Sector::receiveVesselMovement( const std::vector < MessageBodyShipMovement * > & movements ){
- std::map < long, const MessageShipMovement * > singleMsg;
+ std::map < long, const MessageBodyShipMovement * > singleMsg;
//** we sort the movement messaged
for ( size_t i = 0; i < movements.size(); i ++ ){
@@ -370,12 +373,13 @@
std::map< long, SectorObjectMoveable * >::iterator it;
- for ( std::map < long, const MessageShipMovement * >::iterator i = singleMsg.begin(); i != singleMsg.end(); i++ ){
+ for ( std::map < long, const MessageBodyShipMovement * >::iterator i = singleMsg.begin(); i != singleMsg.end(); i++ ){
if ( ( it = movableObjects_.find( i->first ) ) != movableObjects_.end() ){
it->second->setFlightProperties( (*i->second) );
} else {
std::cerr << "Requested non existant object for shipmovement: "
- << network_->username( i->second->senderID() ) << " this should not happen." << std::endl;
+ << network_->userName( i->second->senderID() ) << " at: "
+ << i->second->position() << " this should not happen." << std::endl;
}
}
}
@@ -390,7 +394,7 @@
}
void Sector::sendVesselStatus( const SectorObjectMoveable & obj ){
- MessageShipStatus msg( obj.childID(),
+ MessageBodyShipStatus msg( obj.childID(),
obj.shieldPercent(),
obj.armorPercent(),
obj.firePressed(),
@@ -399,17 +403,17 @@
network_->send( msg );
}
-void Sector::receiveVesselStatus( const MessageShipStatus & msg ){
+void Sector::receiveVesselStatus( const MessageBodyShipStatus & msg ){
if ( msg.senderID() != network_->userID() ){
std::map< long, SectorObjectMoveable * >::iterator it;
if ( ( it = movableObjects_.find( createGlobalID( msg.senderID(), msg.childID() ) ) ) != movableObjects_.end() ){
- std::cout << "ReceiveVesselStatus for " << it->second->name( ) << std::endl;
+ log_->cout( "ReceiveVesselStatus for " + it->second->name( ) );
it->second->setStatus( msg );
} else {
- std::cerr << "Requested non existant object for shipstatus: "
- << network_->username( msg.senderID() ) << " this should not happen." << std::endl;
+ log_->fatal( "Requested non existant object for shipstatus: " +
+ network_->userName( msg.senderID() ) + " this should not happen." );
}
}
}
@@ -418,30 +422,30 @@
if ( projectile.parent().userID() == network_->userID() ){
std::cout << "Send: Projectile from " << projectile.name() << " collide with: " << victim->name()
- << " " << victim->userID() << " " << victim->childID() << std::endl;
+ << " " << victim->userID() << " " << victim->childID() << std::endl;
if ( network_->online() ){
- MessageShipAmmoHit msg( projectile.parent().childID(), victim->userID(), victim->childID(), projectile.damage() );
+ MessageBodyShipAmmoHit msg( projectile.parent().childID(), victim->userID(), victim->childID(), projectile.damage() );
network_->send( msg );
}
+ victim->hitByAmmo( projectile.damage() );
}
- victim->hitByAmmo( projectile.damage() );
}
-void Sector::receiveVesselAmmoHit( const MessageShipAmmoHit & msg ){
+void Sector::receiveVesselAmmoHit( const MessageBodyShipAmmoHit & msg ){
if ( msg.senderID() != network_->userID() ){
std::map< long, SectorObjectMoveable * >::iterator it;
if ( ( it = movableObjects_.find( createGlobalID( msg.targetID(), msg.targetChildID() ) ) ) != movableObjects_.end() ){
- std::cout << "ReceiveVesselAmmoHit for " << network_->username( msg.targetID() ) << std::endl;
+ log_->cout( "ReceiveVesselAmmoHit for " + network_->userName( msg.targetID() ) + " " + toStr( msg.damage() ) );
it->second->hitByAmmo( msg.damage() );
} else {
- std::cerr << "Requested non existant object for VesselAmmoHit "
- << "shooter: " << network_->username( msg.senderID() )
- << " victim: " << network_->username( msg.targetID() )
- << " child: " << msg.targetChildID()
- << " damage: " << msg.damage() << " this should not happen." << std::endl;
+ log_->fatal( std::string( "Requested non existant object for VesselAmmoHit " ) +
+ " shooter: " + network_->userName( msg.senderID() ) +
+ " victim: " + network_->userName( msg.targetID() ) +
+ " child: " + toStr( msg.targetChildID() ) +
+ " damage: " + toStr( msg.damage() ) + " this should not happen." ) ;
std::cerr << "Available objects: " << std::endl;
for ( std::map< long, SectorObjectMoveable * >::iterator i = movableObjects_.begin(); i != movableObjects_.end(); i++){
Modified: branches/ogsector/src/Sector.h
===================================================================
--- branches/ogsector/src/Sector.h 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/Sector.h 2007-04-13 16:50:52 UTC (rev 384)
@@ -6,6 +6,7 @@
#include "SectorClientFrameListener.h"
#include "SectorObjects.h"
+#include "LogManager.h"
namespace OpenGate{
@@ -13,7 +14,7 @@
public:
- Sector( Ogre::SceneManager * sceneMgr, Network * network );
+ Sector( Ogre::SceneManager * sceneMgr, NetworkClient * network, LogManager * log );
~Sector( );
@@ -23,10 +24,12 @@
SectorClientFrameListener * listener( ){ return listener_; }
- void setNetwork( Network * network ){ network_ = network; }
+ void setNetwork( NetworkClient * network ){ network_ = network; }
void update( Ogre::Real elapsedTime );
+ LogManager * log() { return log_; }
+
void createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw );
@@ -56,26 +59,29 @@
SectorObject * prevTarget( );
- void receiveVesselRegister( const MessageShipRegister & msg );
+ void receiveVesselRegister( const MessageBodyShipRegister & msg );
void sendAllVesselStatus( );
void sendAllVesselMovements( );
- void receiveVesselMovement( const std::vector < MessageShipMovement * > & movements );
+ void receiveVesselMovement( const std::vector < MessageBodyShipMovement * > & movements );
void sendVesselStatus( const SectorObjectMoveable & obj );
- void receiveVesselStatus( const MessageShipStatus & msg );
+ void receiveVesselStatus( const MessageBodyShipStatus & msg );
void sendVesselAmmoHit( const Projectile & projectile, BaseObject * victim );
- void receiveVesselAmmoHit( const MessageShipAmmoHit & msg );
+ void receiveVesselAmmoHit( const MessageBodyShipAmmoHit & msg );
protected:
- SectorClientFrameListener * listener_;
Ogre::SceneManager * sceneMgr_;
+ NetworkClient * network_;
+ LogManager * log_;
+ SectorClientFrameListener * listener_;
+
std::string sectorname_;
SectorObjectAvatar * avatar_;
@@ -90,7 +96,6 @@
float avatarDeathSequenceTime_;
- Network * network_;
};
} // namespace OpenGate
Modified: branches/ogsector/src/SectorClient.cpp
===================================================================
--- branches/ogsector/src/SectorClient.cpp 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/SectorClient.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -3,8 +3,8 @@
namespace OpenGate{
void SectorClient::createScene( ){
- sector_ = new Sector( sceneMgr_, network_ );
- sector_->createAvatar( network_->usernameMe() );
+ sector_ = new Sector( sceneMgr_, network_, log_ );
+ sector_->createAvatar( network_->userName() );
}
void SectorClient::destroyScene( ){
@@ -28,20 +28,33 @@
createViewports();
- //** spom dont what for
+ //** spom dont know what for
// Set default mipmap level (NB some APIs ignore this)
// Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
// Create any resource listeners (for loading screens)
// createResourceListener();
- //** spom dont what for
+ //** spom dont know what for
// Create the scene
createScene();
- createFrameListener();
+ unsigned long hWnd;
+ window_->getCustomAttribute( "WINDOW", &hWnd );
+ inputManager_ = new InputManager( hWnd );
+ inputManager_->setWindowExtents( window_->getWidth( ), window_->getHeight( ) );
+ //** createFrameListener **
+ frameListener_ = new SectorClientFrameListener( window_, camera_, sector_, network_, inputManager_ );
+ root_->addFrameListener( frameListener_ );
+
+ console_ = new OGConsole( root_, inputManager_ );
+ root_->addFrameListener( console_ );
+ log_->setConsole( console_ );
+
+// OgreConsole::getSingleton().addCommand("quit",&CMD_Quit);
+// OgreConsole::getSingleton().addCommand("screenshot",&CMD_Screenshot);
+
sector_->spawnAvatar();
-
return true;
}
@@ -124,8 +137,8 @@
}
void SectorClient::createFrameListener( ) {
- frameListener_ = new SectorClientFrameListener( window_, camera_, sector_, network_ );
- root_->addFrameListener( frameListener_ );
+// frameListener_ = new SectorClientFrameListener( window_, camera_, sector_, network_ );
+// root_->addFrameListener( frameListener_ );
}
} // namespace OpenGate{
Modified: branches/ogsector/src/SectorClient.h
===================================================================
--- branches/ogsector/src/SectorClient.h 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/SectorClient.h 2007-04-13 16:50:52 UTC (rev 384)
@@ -8,6 +8,8 @@
#include "Sector.h"
#include "SectorClientFrameListener.h"
#include "networkClient.h"
+#include "ogconsole.h"
+#include "LogManager.h"
#include <list>
@@ -15,14 +17,22 @@
class SectorClient {
public:
- SectorClient( Network * nw ) : network_( nw ) {
+ SectorClient( NetworkClient * nw, LogManager * log )
+ : network_( nw ), log_( log ){
root_ = NULL;
+ window_ = NULL;
+ sceneMgr_ = NULL;
+ camera_ = NULL;
+
frameListener_ = NULL;
- sector_ = NULL;
+ inputManager_ = NULL;
+ sector_ = NULL ;
+ console_ = NULL;
}
virtual ~SectorClient(){
if ( frameListener_ != NULL ) delete frameListener_;
+ if ( inputManager_ != NULL ) delete inputManager_;
if ( root_ != NULL ) delete root_;
}
@@ -55,18 +65,19 @@
virtual void destroyScene( );
- Ogre::Root * root_;
+ NetworkClient * network_;
+ LogManager * log_;
+ Ogre::Root * root_;
+ SectorClientFrameListener * frameListener_;
+ Sector * sector_;
+
Ogre::Camera * camera_;
-
Ogre::SceneManager * sceneMgr_;
-
Ogre::RenderWindow * window_;
+ InputManager * inputManager_;
- SectorClientFrameListener * frameListener_;
- Sector * sector_;
-
- Network * network_;
+ OGConsole * console_;
};
} // namespace OpenGate
Modified: branches/ogsector/src/SectorClientFrameListener.cpp
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -1,6 +1,7 @@
#include "SectorClientFrameListener.h"
#include "SectorClient.h"
#include "networkProtocol.h"
+#include "InputManager.h"
#include <iostream>
#include <OgreTextAreaOverlayElement.h>
@@ -9,16 +10,17 @@
namespace OpenGate{
SectorClientFrameListener::SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam,
- Sector * sector, Network * nw,
- bool useBufferedInputKeys,
- bool useBufferedInputMouse )
- : window_( win ), camera_( cam ), sector_( sector ), network_( nw ){
+ Sector * sector, NetworkClient * nw,
+ InputManager * input )
+ : window_( win ), camera_( cam ), sector_( sector ), network_( nw ), inputManager_( input ){
shutDownRequest_ = false;
deathSequence_ = false;
sceneDetailIndex_ = 0;
target_ = NULL;
cameraMode_ = 1;
+ consoleMode_ = false;
+ chatMode_ = false;
sector_->setListener( this );
@@ -27,12 +29,6 @@
windowsHalfWidth_ = (int)(windowsWidth_ * 0.5);
windowsHalfHeight_ = (int)(windowsHeight_ * 0.5);
- unsigned long hWnd;
- window_->getCustomAttribute( "WINDOW", &hWnd );
-
- inputManager_ = new InputManager( hWnd );
- inputManager_->setWindowExtents( windowsWidth_, windowsHeight_ );
-
inputManager_->addKeyListener( this, "SectorClientKeyListener" );
inputManager_->addMouseListener( this, "SectorClientMouseListener" );
inputManager_->addJoystickListener( this, "SectorClientJoystickListener" );
@@ -43,14 +39,15 @@
lastInputWheelState_ = 0;
hudOverlay_ = Ogre::OverlayManager::getSingleton().getByName("OpenGate/SimpleHUD");
+ Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInPanel")->hide( );
Ogre::OverlayElement* hudCenter = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/CenterPointer");
hudCenter->setTop( windowsHalfHeight_ - 16 );
hudCenter->setLeft( windowsHalfWidth_ - 16 );
- hudTarget_ = new Ogre::SceneNode( NULL, "Target" );
- hudTarget_->setPosition( -2.5, -1.9, -6.0 );
- hudOverlay_->add3D( hudTarget_ );
+// hudTarget_ = new Ogre::SceneNode( NULL, "Target" );
+// hudTarget_->setPosition( -2.5, -1.9, -6.0 );
+// hudOverlay_->add3D( hudTarget_ );
hudOverlay_->show( );
@@ -59,9 +56,9 @@
mousePointer_->setTop( windowsHalfWidth_ );
mousePointer_->setLeft( windowsHalfHeight_ );
mouseOverlay_->show();
- chatMode_ = false;
+
// cameraRotateSpeed_ = 36;
// cameraRotateScale_ = 0.0f;
// cameraMoveSpeed_ = 100;
@@ -107,12 +104,8 @@
inputManager_->removeKeyListener( "SectorClientKeyListener" );
inputManager_->removeMouseListener( "SectorClientMouseListener" );
inputManager_->removeJoystickListener( "SectorClientJoystickListener" );
-
- //** neccesary because of new operator in inputmanager;
- if ( inputManager_ != NULL ) delete inputManager_;
}
-
bool SectorClientFrameListener::frameStarted( const Ogre::FrameEvent & evt ) {
if ( window_->isClosed() ) return false;
timeSinceLastSectorUpdate_ += evt.timeSinceLastFrame;
@@ -125,20 +118,16 @@
}
//** start capture network;
- std::vector < std::vector < Uint8 > > msgs;
- std::vector < MessageShipMovement * > movements;
+ std::vector < std::vector < char > > msgs;
+ std::vector < MessageBodyShipMovement * > movements;
network_->pull( msgs );
for ( size_t i = 0; i < msgs.size(); i ++ ){
switch ( msgs[ i ][ 0 ] ){
case PROTO_CHAT:{
network_->ping();
-
- MessageChat msg( &msgs[ i ][ 0 ] );
- std::cout << network_->username( msg.senderID() ) + ": " + msg.message() << std::endl;
-
- Ogre::OverlayElement* hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextChatIn");
- hudChatIn->setCaption( network_->username( msg.senderID() ) + ": " + msg.message() );
+ MessageBodyChat msg( &msgs[ i ][ 0 ] );
+ sector_->log()->chat( network_->userName( msg.senderID() ), msg.message() );
} break;
case PROTO_SHIPREGISTER:
sector_->receiveVesselRegister( &msgs[ i ][ 0 ] ); break;
@@ -146,7 +135,7 @@
sector_->receiveVesselStatus( &msgs[ i ][ 0 ] ); break;
case PROTO_SHIPMOVEMENT:{
//** we handle that in sum, so we can ignore dups because of packet loss
- MessageShipMovement msg( &msgs[ i ][ 0 ] );
+ MessageBodyShipMovement msg( &msgs[ i ][ 0 ] );
movements.push_back( &msg );
} break;
case PROTO_SHIPAMMOHIT:
@@ -156,7 +145,7 @@
break;
}
}
- if ( movements.size() > 0 ) sector_->receiveVesselMovement( movements );
+ if ( movements.size() > 0 ) sector_->receiveVesselMovement( movements );
//** end capture network;
@@ -186,46 +175,53 @@
}
bool SectorClientFrameListener::keyPressed( const OIS::KeyEvent & e ){
+ // std::cout << "SectorClientFrameListener: " << e.key << " " << (char)e.key<< std::endl;
//** ESCAPE leads to shutdown;
if ( e.key == OIS::KC_ESCAPE) { shutDownRequest_ = true; }
+ if ( e.key == OIS::KC_F1 ){
+ consoleMode_ = !consoleMode_;
+ }
+ if( consoleMode_ ) return true;
+
if ( !chatMode_ ){
if ( e.key == OIS::KC_RETURN) {
+ Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInPanel")->show( );
chatMode_ = true;
}
-
+
if ( sector_->avatar() != NULL ){
//** Avatar yaw LEFT;
if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatar()->setScaledYaw( 1.0 ); }
-
+
//** Avatar yaw RIGHT;
if ( e.key == OIS::KC_D || e.key == OIS::KC_NUMPAD6 ) { sector_->avatar()->setScaledYaw( -1.0 ); }
-
+
//** Avatar pitch DOWN;
if ( e.key == OIS::KC_W || e.key == OIS::KC_NUMPAD8 ) { sector_->avatar()->setScaledPitch( -1.0 ); }
-
+
//** Avatar pitch UP;
if ( e.key == OIS::KC_S || e.key == OIS::KC_NUMPAD2 ) { sector_->avatar()->setScaledPitch( 1.0 ); }
-
+
//** Avatar roll (181 == NUM/);
if ( e.key == OIS::KC_NUMPAD0 || e.key == 181 ) { sector_->avatar()->setScaledRoll( 1.0 ); }
-
+
//** Avatar roll (55 == NUM*);
if ( e.key == OIS::KC_NUMPADCOMMA || e.key == 55 ) { sector_->avatar()->setScaledRoll( -1.0 ); }
-
+
//** Avatar increase thrust by 10%;
if ( e.key == OIS::KC_NUMPAD7 ) { sector_->avatar()->incrementThrust(); }
-
+
//** Avatar increase thrust by 10%;
if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatar()->decrementThrust(); }
-
+
//** Avatar press break;
if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( true ); }
-
+
//** Avatar press afterburner;
if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( true ); }
-
+
//** Avatar centering;
if ( e.key == OIS::KC_NUMPAD5 ) {
sector_->avatar()->setScaledYaw( 0.0 );
@@ -235,19 +231,19 @@
//** selfdestruct and eject;
if ( e.key == OIS::KC_F11 ) { sector_->avatarDied(); }
} // if avatar;
-
- //** next Target;
+
+ //** next Target;
if ( e.key == OIS::KC_N ) { setTarget( sector_->nextTarget() ); }
-
+
//** prev Target;
if ( e.key == OIS::KC_P ) { setTarget( sector_->prevTarget() ); }
-
+
//** spawn;
if ( e.key == OIS::KC_F12 ) { sector_->spawnAiObject(); }
-
+
//** Toggle through camera modes;
if ( e.key == OIS::KC_6 ) { toggleNextCamera_(); }
-
+
//** Create one screenshot;
if ( e.key == OIS::KC_SYSRQ ) {
char tmp[ 20 ];
@@ -263,25 +259,31 @@
case 2: camera_->setPolygonMode( Ogre::PM_POINTS ); break;
}
}
-
+
} else { // ** chatmode
if ( e.key != OIS::KC_BACK ) {
- chatString_ += e.text;
+ if ( (int)e.text < 255 && (int)e.text > 0 ) {
+ chatString_ += e.text;
+ } else {
+ std::cout << (char)e.text << " " << e.text << std::endl;
+ }
} else if ( chatString_.length() > 1 ) {
chatString_ = chatString_.substr( 0, chatString_.length() - 1 );
}
- Ogre::OverlayElement* hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextChatOut");
- hudChatIn->setCaption( chatString_ );
+ Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInTextField")->setCaption( chatString_ );
+ // hudChatIn->setCaption( Ogre::UTFString(chatString_.c_str()).asUTF32() );
+ // hudChatIn->setCaption( Ogre::UTFString( chatString_ ).asUTF32_c_str() );
+
if ( e.key == OIS::KC_RETURN) {
-
- MessageChat chat( chatString_ );
+
+ MessageBodyChat chat( chatString_ );
network_->send( chat );
-
+
chatString_.clear();
- Ogre::OverlayElement* hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextChatOut");
- hudChatIn->setCaption( chatString_ );
+ Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInTextField")->setCaption( chatString_ );
+ Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDChatInPanel")->hide( );
chatMode_ = false;
}
}
@@ -317,7 +319,7 @@
// Avatar release afterburner
if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( false ); }
}
- return true;
+ return true;
}
bool SectorClientFrameListener::mouseMoved( const OIS::MouseEvent & e ){
@@ -382,7 +384,7 @@
} else if( lastInputWheelState_ > e.state.Z.abs+10 ) { // mouse wheel down
setTarget( sector_->prevTarget() );
lastInputWheelState_ = e.state.Z.abs;
- }
+ }
return true;
}
@@ -392,7 +394,7 @@
if ( button == 0){
sector_->avatar()->setFirePressed( true );
}
- }
+ }
return true;
}
@@ -402,7 +404,7 @@
if ( button == 0){
sector_->avatar()->setFirePressed( false);
}
- }
+ }
return true;
}
@@ -452,7 +454,7 @@
sector_->avatar()->setScaledPitch( pitch );
sector_->avatar()->setScaledRoll( -roll );
sector_->avatar()->setThrustPercent( thrust * 100. );
- } // if avatar
+ } // if avatar
return true;
}
@@ -463,7 +465,7 @@
if ( button == 0){
sector_->avatar()->setFirePressed( true );
}
- } // if avatar_
+ } // if avatar_
return true;
}
@@ -564,11 +566,9 @@
target_ = target;
if ( target_ != NULL ){
- std::cout << target_->name()<< std::endl;
+ // std::cout << target_->name()<< std::endl;
+ Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetName")->setCaption( target_->name() );
- Ogre::OverlayElement* targetName = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetName");
- targetName->setCaption( target_->name() );
-
// if ( hudTarget_->numChildren() > 0 ){
// hudTarget_->removeAllChildren( );// hudTarget_->getChild( "TargetTrans" ) );
// camera_->getSceneManager()->destroyEntity( "TargetShape" );
@@ -611,7 +611,6 @@
sector_->avatar()->targetArrow()->setDirection( distToTarget.normalisedCopy(),
Ogre::Node::TS_WORLD );
- hudTarget_->setOrientation( target_->mainNode()->getOrientation() );
// Ogre::Vector3 targetPos;
// Ogre::Quaternion targetOrient; targetOri = target_->mainNode().getOrientation();
Modified: branches/ogsector/src/SectorClientFrameListener.h
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.h 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/SectorClientFrameListener.h 2007-04-13 16:50:52 UTC (rev 384)
@@ -21,9 +21,8 @@
public OIS::JoyStickListener {
public:
- SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam, Sector * sector, Network * nw,
- bool useBufferedInputKeys = false,
- bool useBufferedInputMouse = false );
+ SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam, Sector * sector,
+ NetworkClient * nw, InputManager * input );
virtual ~SectorClientFrameListener( );
@@ -58,10 +57,9 @@
Ogre::RenderWindow * window_;
Ogre::Camera * camera_;
Sector * sector_;
- Network * network_;
+ NetworkClient * network_;
+ InputManager * inputManager_;
- InputManager * inputManager_;
-
Ogre::Overlay * hudOverlay_;
Ogre::Overlay * mouseOverlay_;
Ogre::OverlayElement * mousePointer_;
@@ -92,8 +90,9 @@
int windowsHalfWidth_;
int windowsHalfHeight_;
- bool chatMode_;
std::string chatString_;
+ bool chatMode_;
+ bool consoleMode_;
int sceneDetailIndex_ ;
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/SectorObjects.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -14,7 +14,6 @@
}
BaseObject::~BaseObject(){
-
sceneMgr_->getRootSceneNode()->removeAndDestroyChild( mainNode_->getName() );
}
@@ -110,7 +109,7 @@
//** show us a small visible feedback
bbs_->getBillboard( 0 )->setColour( Ogre::ColourValue(0.0, 1.0, 0.0) );
- bbs_->getBillboard( 0 )->setDimensions( 10, 10 );
+ bbs_->getBillboard( 0 )->setDimensions( 5, 5 );
lifeTime_ = max( lifeTime_, maxLiveTime_ - 0.1f );
// sector_->collisionContext()->removeObject( collObj_ );
@@ -224,10 +223,14 @@
mainNode_->detachObject( thrusterParticles_ );
sceneMgr_->destroyParticleSystem( thrusterParticles_ );
+ for ( std::set < Projectile * >::iterator it = projectiles_.begin(); it != projectiles_.end(); ){
+ delete *it;
+ projectiles_.erase( it++ );
+ }
// Projectile globalisieren.
}
-void SectorObjectMoveable::setFlightProperties( const MessageShipMovement & msg ){
+void SectorObjectMoveable::setFlightProperties( const MessageBodyShipMovement & msg ){
if ( forceMovement_ ){
mainNode_->setPosition( msg.position() );
@@ -320,7 +323,7 @@
lastLifeTime_ = lifeTime_;
}
-void SectorObjectMoveable::setStatus( const MessageShipStatus & msg ){
+void SectorObjectMoveable::setStatus( const MessageBodyShipStatus & msg ){
setFirePressed( msg.firePressed() );
setAfterburnerPressed( msg.afterburnerPressed() );
setBreakPressed( msg.breakPressed() );
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/SectorObjects.h 2007-04-13 16:50:52 UTC (rev 384)
@@ -132,9 +132,9 @@
inline virtual long getTypeID() const { return SECTOROBJECTMOVABLE_RTTI; }
- void setFlightProperties( const MessageShipMovement & msg );
+ void setFlightProperties( const MessageBodyShipMovement & msg );
- void setStatus( const MessageShipStatus & msg );
+ void setStatus( const MessageBodyShipStatus & msg );
virtual void collide( BaseObject * object );
Modified: branches/ogsector/src/common.cpp
===================================================================
--- branches/ogsector/src/common.cpp 2007-04-12 19:53:37 UTC (rev 383)
+++ branches/ogsector/src/common.cpp 2007-04-13 16:50:52 UTC (rev 384)
@@ -22,3 +22,11 @@
#include "common.h"
long createGlobalID( int userId, int childId ) { return childId * MAXUSERID + userId; }
+
+void myMSleep( int s ){
+#ifdef WIN32
+ Sleep( s );
+#else
+ usleep( s * 1000 );
+#endif
+}
Modified: branches/ogsec...
[truncated message content] |
|
From: <ult...@us...> - 2007-04-12 19:53:36
|
Revision: 383
http://svn.sourceforge.net/opengate/?rev=383&view=rev
Author: ultrasick
Date: 2007-04-12 12:53:37 -0700 (Thu, 12 Apr 2007)
Log Message:
-----------
made a slight change in an existing part of the primrose texture
+ uploaded another part
+ removed the description text from the xml file of the primrose ship and changed the name from premia -> primrose in the xml
Modified Paths:
--------------
trunk/data/ships/solrain/primrose/primrose.blend
trunk/data/ships/solrain/primrose/primrose.xml
trunk/templates/data/ships/solrain/primrose/parts/54.pspimage
Added Paths:
-----------
trunk/templates/data/ships/solrain/primrose/parts/55 + 56.pspimage
Modified: trunk/data/ships/solrain/primrose/primrose.blend
===================================================================
(Binary files differ)
Modified: trunk/data/ships/solrain/primrose/primrose.xml
===================================================================
--- trunk/data/ships/solrain/primrose/primrose.xml 2007-04-12 00:41:02 UTC (rev 382)
+++ trunk/data/ships/solrain/primrose/primrose.xml 2007-04-12 19:53:37 UTC (rev 383)
@@ -1,12 +1,10 @@
<?xml version="1.0"?>
-<!DOCTYPE ship SYSTEM "../../../opengate.dtd">
<ship type="Player">
<!-- Naming -->
- <name>Premia</name>
+ <name>Primrose</name>
<class>Shuttle Trainer</class>
<faction>Solrain</faction>
- <description>The Premia was the first commercially viable series of spacecraft following the Great Collapse. The latest Premia is a well-balanced ship, combining adequate speed with good weapon capacity and decent shields.</description>
<image>s_c_15.jpg</image>
<model>s_c_15.wings</model>
Modified: trunk/templates/data/ships/solrain/primrose/parts/54.pspimage
===================================================================
(Binary files differ)
Added: trunk/templates/data/ships/solrain/primrose/parts/55 + 56.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/55 + 56.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-12 00:41:08
|
Revision: 382
http://svn.sourceforge.net/opengate/?rev=382&view=rev
Author: ultrasick
Date: 2007-04-11 17:41:02 -0700 (Wed, 11 Apr 2007)
Log Message:
-----------
uploaded the light at the back of the squid.
@coder:
please place the colors between the light and the camera and very close to the light and not behind the light. Otherwise the colors would be nearly unvisible.
You can make the colors and the light rotate in opposite directions. I don't know how this looks in the game. If it is unnecessary because the squid is already rotating in space all the time we should stack the colors and the light as 1 image file again.
Added Paths:
-----------
trunk/data/ships/squadrok/squid/colors.png
trunk/data/ships/squadrok/squid/light.png
Added: trunk/data/ships/squadrok/squid/colors.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/squadrok/squid/colors.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/squadrok/squid/light.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/squadrok/squid/light.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-09 20:59:58
|
Revision: 381
http://svn.sourceforge.net/opengate/?rev=381&view=rev
Author: ultrasick
Date: 2007-04-09 13:59:57 -0700 (Mon, 09 Apr 2007)
Log Message:
-----------
renameing conflux -> squadrok
changed the name because of legal reasons. Perhaps the new name remembers you of the similar word "squadron" and reminds you of a conflux swarm. I don't know if the name is any good, you are welcome to rename them again, if you got a better one in mind.
+ uploaded the fully texturized squid. the light will follow in a seperat file
+ uploaded a missing file of the primrose model
Added Paths:
-----------
trunk/data/ships/squadrok/
trunk/data/ships/squadrok/squid/
trunk/data/ships/squadrok/squid/squid.blend
trunk/templates/data/ships/solrain/primrose/door.jpg
Removed Paths:
-------------
trunk/data/ships/conflux/
Added: trunk/data/ships/squadrok/squid/squid.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/squadrok/squid/squid.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/primrose/door.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/door.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-08 21:06:45
|
Revision: 380
http://svn.sourceforge.net/opengate/?rev=380&view=rev
Author: ultrasick
Date: 2007-04-08 14:06:44 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
added a few more textures to the primrose + removed the wings files because I made some slight changes in the mesh to reduce the amount of faces and vertices
Modified Paths:
--------------
trunk/data/ships/solrain/primrose/primrose.blend
Added Paths:
-----------
trunk/templates/data/ships/solrain/primrose/parts/51.pspimage
trunk/templates/data/ships/solrain/primrose/parts/52 + 53.pspimage
trunk/templates/data/ships/solrain/primrose/parts/54.pspimage
Removed Paths:
-------------
trunk/data/ships/solrain/primrose/primrose.wings
trunk/templates/data/ships/solrain/primrose/parts/51 + 52 + 53 + 54.pspimage
Modified: trunk/data/ships/solrain/primrose/primrose.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/solrain/primrose/primrose.wings
===================================================================
(Binary files differ)
Deleted: trunk/templates/data/ships/solrain/primrose/parts/51 + 52 + 53 + 54.pspimage
===================================================================
(Binary files differ)
Added: trunk/templates/data/ships/solrain/primrose/parts/51.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/51.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/primrose/parts/52 + 53.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/52 + 53.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/primrose/parts/54.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/54.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-04-08 11:47:58
|
Revision: 379
http://svn.sourceforge.net/opengate/?rev=379&view=rev
Author: egore
Date: 2007-04-08 04:47:59 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
forgot to save in blender
Modified Paths:
--------------
trunk/data/misc/jumpgate.blend
Modified: trunk/data/misc/jumpgate.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-04-08 11:47:36
|
Revision: 378
http://svn.sourceforge.net/opengate/?rev=378&view=rev
Author: egore
Date: 2007-04-08 04:47:36 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
start texturing the jumpgate
Modified Paths:
--------------
trunk/data/misc/jumpgate.blend
Added Paths:
-----------
trunk/data/misc/jumpgate.jpg
trunk/data/misc/jumpgate.svg
Modified: trunk/data/misc/jumpgate.blend
===================================================================
(Binary files differ)
Added: trunk/data/misc/jumpgate.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/jumpgate.jpg
___________________________________________________________________
Name: svn:mime-type
+ image/jpeg
Added: trunk/data/misc/jumpgate.svg
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/jumpgate.svg
___________________________________________________________________
Name: svn:mime-type
+ image/svg+xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
