Permalink
Browse files

Misc++

- ozCore
  * String::split() includes empty strings again
- data
  * translations refreshed, rz_base -> oz_base
- cmake
  * boundle is built in build/boundle, not interfering with other builds
  • Loading branch information...
1 parent 8db1e60 commit 0ddf457b431c22b43c07af410b811b4e509573d9 @ducakar committed Feb 4, 2013
Showing with 1,132 additions and 1,953 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 README.md
  3. +38 −32 data/oz_base/lingua/en/oz_base.po
  4. +38 −32 data/oz_base/lingua/sl/oz_base.po
  5. 0 data/{rz_base → oz_base}/ui/style.json
  6. +58 −80 data/oz_main/lingua/en/oz_main.po
  7. +60 −82 data/oz_main/lingua/sl/oz_main.po
  8. +1 −1 data/oz_missions/credits/oz_missions.txt
  9. +6 −8 data/oz_missions/lingua/en/oz_missions.po
  10. +5 −7 data/oz_missions/lingua/sl/oz_missions.po
  11. +272 −122 data/oz_missions/mission/00_tutorial/lingua/en.po
  12. +255 −114 data/oz_missions/mission/00_tutorial/lingua/sl.po
  13. +117 −75 data/oz_missions/mission/01_cvicek/lingua/en.po
  14. +115 −74 data/oz_missions/mission/01_cvicek/lingua/sl.po
  15. +1 −1 data/oz_missions/mission/01_cvicek/main.lua
  16. +1 −1 data/oz_missions/mission/02_zombies/description.json
  17. +21 −0 data/oz_missions/mission/02_zombies/lingua/en.po
  18. +21 −0 data/oz_missions/mission/02_zombies/lingua/sl.po
  19. +4 −6 data/oz_missions/mission/test/lingua/en.po
  20. +4 −6 data/oz_missions/mission/test/lingua/sl.po
  21. +0 −11 data/rz_base/credits/rz_base.txt
  22. +0 −5 data/rz_base/glsl/COPYING.txt
  23. +0 −32 data/rz_base/glsl/celestial.frag
  24. +0 −4 data/rz_base/glsl/celestial.json
  25. +0 −37 data/rz_base/glsl/celestial.vert
  26. +0 −4 data/rz_base/glsl/dmesh.json
  27. +0 −62 data/rz_base/glsl/dmesh.vert
  28. +0 −109 data/rz_base/glsl/header.glsl
  29. +0 −55 data/rz_base/glsl/mesh.frag
  30. +0 −4 data/rz_base/glsl/mesh.json
  31. +0 −40 data/rz_base/glsl/mesh.vert
  32. +0 −31 data/rz_base/glsl/plain.frag
  33. +0 −4 data/rz_base/glsl/plain.json
  34. +0 −35 data/rz_base/glsl/plain.vert
  35. +0 −4 data/rz_base/glsl/plant.json
  36. +0 −47 data/rz_base/glsl/plant.vert
  37. +0 −53 data/rz_base/glsl/postprocess.frag
  38. +0 −4 data/rz_base/glsl/postprocess.json
  39. +0 −4 data/rz_base/glsl/skeletalMesh.json
  40. +0 −53 data/rz_base/glsl/skeletalMesh.vert
  41. +0 −37 data/rz_base/glsl/stars.frag
  42. +0 −4 data/rz_base/glsl/stars.json
  43. +0 −34 data/rz_base/glsl/stars.vert
  44. +0 −49 data/rz_base/glsl/terraLand.frag
  45. +0 −4 data/rz_base/glsl/terraLand.json
  46. +0 −4 data/rz_base/glsl/terraWater.json
  47. +0 −49 data/rz_base/glsl/terraWater.vert
  48. +0 −141 data/rz_base/lingua/en/rz_base.po
  49. +0 −141 data/rz_base/lingua/sl/rz_base.po
  50. +0 −88 data/rz_main/baseq3/maps/testCastle.json
  51. +14 −11 package.sh
  52. +4 −0 src/client/Mesh.cc
  53. +5 −4 src/client/Render.cc
  54. +10 −28 src/ozCore/String.cc
  55. +8 −2 src/ozCore/String.hh
  56. +8 −6 src/tests/CMakeLists.txt
  57. +54 −0 src/tests/collada.cc
  58. +9 −109 src/tests/test.cc
  59. +1 −1 src/tools/ozManifest.cc
View
@@ -15,7 +15,7 @@ option( OZ_DYNAMICS "Build complete ozDynamics library with ODE support." OFF )
option( OZ_LUAJIT "Use use LuaJIT 2.0 instead of official Lua." OFF )
option( OZ_SDL2 "Use SDL 2.0 instead of SDL 1.2." OFF )
option( OZ_NET "Enable networking support." OFF )
-option( OZ_GL_ES "Use OpenGL ES 2.0 instead of OpenGL 2.1+." OFF )
+option( OZ_GL_ES "Use OpenGL ES 2.0 instead of OpenGL 2.1." OFF )
option( OZ_NONFREE "Enable support for building S3TC textures." OFF )
option( OZ_STANDALONE "Install layout appropriate for launching from its own folder." OFF )
View
@@ -24,7 +24,7 @@ development packages for the following libraries:
- Lua 5.1 or 5.2 or LuaJIT 2.0
- SDL 1.2 or 2.0
- SDL_ttf
-- OpenGL 2.1+ or OpenGL ES 2.0
+- OpenGL 2.1 or OpenGL ES 2.0
- OpenAL 1.1
- libvorbis
- FreeImage
@@ -2,60 +2,65 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenZone\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-07-29 15:20+0100\n"
+"PO-Revision-Date: 2013-02-04 18:05+0100\n"
"Last-Translator: Davorin Učakar <davorin.ucakar@gmail.com>\n"
"Language-Team: Davorin Učakar <davorin.ucakar@gmail.com>\n"
-"Language: \n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: English\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Country: UNITED KINGDOM\n"
+"X-Generator: Poedit 1.5.4\n"
-#: src/client/ui/CreditsMenu.cc:160
-#: src/client/ui/MissionMenu.cc:178
+#: src/client/ui/CreditsMenu.cc:148 src/client/ui/MissionMenu.cc:190
msgid "Back"
msgstr "Back"
#: src/client/ui/SettingsFrame.cc:75
msgid "Close"
msgstr "Close"
-#: src/client/ui/MainMenu.cc:138
+#: src/client/ui/MainMenu.cc:143
msgid "Continue"
msgstr "Continue"
-#: src/client/ui/BuildMenu.cc:64
+#: src/client/ui/BuildMenu.cc:63
msgid "Create"
msgstr "Create"
-#: src/client/ui/MainMenu.cc:142
+#: src/client/ui/MainMenu.cc:191
msgid "Credits"
msgstr "Credits"
-#: src/client/ui/DebugFrame.cc:101
+#: src/client/ui/DebugFrame.cc:102
msgid "Debug"
msgstr "Debug"
-#: src/client/ui/MainMenu.cc:143
+#: src/client/ui/MainMenu.cc:193
msgid "Exit"
msgstr "Exit"
-#: src/client/ui/MainMenu.cc:104
-msgid "Licensed under GNU GPL 3.0. Game data archives and libraries distributed with OpenZone are work of various authors and use separate licences. For more details see doc/README.html and files named README.txt and COPYING.txt inside game data archives."
-msgstr "Licensed under GNU GPL 3.0. Game data archives and libraries distributed with OpenZone are work of various authors and use separate licences. For more details see doc/README.html and files named README.txt and COPYING.txt inside game data archives."
+#: src/client/ui/MainMenu.cc:126
+msgid ""
+"Licensed under GNU GPL 3.0. Game data archives and libraries distributed "
+"with OpenZone are work of various authors and use separate licences. For "
+"more details see doc/README.html and files named README.txt and COPYING.txt "
+"inside game data archives."
+msgstr ""
+"Licensed under GNU GPL 3.0. Game data archives and libraries distributed "
+"with OpenZone are work of various authors and use separate licences. For "
+"more details see doc/README.html and files named README.txt and COPYING.txt "
+"inside game data archives."
-#: src/client/GameStage.cc:141
-#: src/client/GameStage.cc:366
+#: src/client/GameStage.cc:128 src/client/GameStage.cc:357
msgid "Loading ..."
msgstr "Loading ..."
-#: src/client/ui/MainMenu.cc:140
+#: src/client/ui/MainMenu.cc:189
msgid "Missions"
msgstr "Missions"
-#: src/client/ui/MusicPlayer.cc:183
+#: src/client/ui/MusicPlayer.cc:163
msgid "Music Player"
msgstr "Music Player"
@@ -67,45 +72,47 @@ msgstr ""
"NOT IMPLEMENTED.\n"
"You can change your settings by manually editing the following files:"
-#: src/client/ui/QuestFrame.cc:40
-#: src/client/ui/QuestFrame.cc:134
+#: src/client/ui/QuestFrame.cc:41 src/client/ui/QuestFrame.cc:135
msgid "No quest"
msgstr "No quest"
-#: src/client/Profile.cc:58
+#: src/client/Profile.cc:57
msgid "Player"
-msgstr "Me"
+msgstr "Player"
-#: src/client/ui/MainMenu.cc:139
+#: src/client/ui/MainMenu.cc:150
msgid "Quickload"
msgstr "Quickload"
-#: src/client/ui/MainMenu.cc:141
-#: src/client/ui/SettingsFrame.cc:60
+#: src/client/ui/MainMenu.cc:190 src/client/ui/SettingsFrame.cc:60
msgid "Settings"
msgstr "Settings"
-#: src/client/GameStage.cc:464
+#: src/client/GameStage.cc:453
msgid "Shutting down ..."
msgstr "Shutting down ..."
-#: src/client/ui/CreditsMenu.cc:168
+#: src/client/ui/MainMenu.cc:192
+msgid "Web"
+msgstr "Web"
+
+#: src/client/ui/CreditsMenu.cc:156
msgid "engine developer"
msgstr "engine developer"
-#: src/client/ui/QuestFrame.cc:62
+#: src/client/ui/QuestFrame.cc:63
msgid "failed"
msgstr "failed"
-#: src/client/ui/QuestFrame.cc:56
+#: src/client/ui/QuestFrame.cc:57
msgid "in progress"
msgstr "in progress"
-#: src/client/ui/CreditsMenu.cc:181
+#: src/client/ui/CreditsMenu.cc:171
msgid "package"
msgstr "package"
-#: src/client/ui/QuestFrame.cc:59
+#: src/client/ui/QuestFrame.cc:60
msgid "successful"
msgstr "successful"
@@ -133,4 +140,3 @@ msgstr ""
"\n"
"UI icons\n"
"Davorin Učakar\n"
-
@@ -2,60 +2,65 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenZone\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2012-07-29 15:20+0100\n"
+"PO-Revision-Date: 2013-02-04 18:05+0100\n"
"Last-Translator: Davorin Učakar <davorin.ucakar@gmail.com>\n"
"Language-Team: Davorin Učakar <davorin.ucakar@gmail.com>\n"
-"Language: \n"
+"Language: sl_SI\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Slovenian\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Country: SLOVENIA\n"
+"X-Generator: Poedit 1.5.4\n"
-#: src/client/ui/CreditsMenu.cc:160
-#: src/client/ui/MissionMenu.cc:178
+#: src/client/ui/CreditsMenu.cc:148 src/client/ui/MissionMenu.cc:190
msgid "Back"
msgstr "Nazaj"
#: src/client/ui/SettingsFrame.cc:75
msgid "Close"
msgstr "Zapri"
-#: src/client/ui/MainMenu.cc:138
+#: src/client/ui/MainMenu.cc:143
msgid "Continue"
msgstr "Nadaljevanje"
-#: src/client/ui/BuildMenu.cc:64
+#: src/client/ui/BuildMenu.cc:63
msgid "Create"
msgstr "Umesti"
-#: src/client/ui/MainMenu.cc:142
+#: src/client/ui/MainMenu.cc:191
msgid "Credits"
msgstr "Zasluge"
-#: src/client/ui/DebugFrame.cc:101
+#: src/client/ui/DebugFrame.cc:102
msgid "Debug"
msgstr "Razhroščevanje"
-#: src/client/ui/MainMenu.cc:143
+#: src/client/ui/MainMenu.cc:193
msgid "Exit"
msgstr "Izhod"
-#: src/client/ui/MainMenu.cc:104
-msgid "Licensed under GNU GPL 3.0. Game data archives and libraries distributed with OpenZone are work of various authors and use separate licences. For more details see doc/README.html and files named README.txt and COPYING.txt inside game data archives."
-msgstr "Pogon OpenZone je pod licenco GNU GPL 3.0. Podatkovni arhivi in knjižnice distribuirane skupaj z OpenZone so delo različnih avtorjev in so pod drugačnimi licencami. Za podrobnosti glej doc/PREBERI.html ter datoteke z imeni COPYING.txt in README.txt v podatkovnih arhivih."
+#: src/client/ui/MainMenu.cc:126
+msgid ""
+"Licensed under GNU GPL 3.0. Game data archives and libraries distributed "
+"with OpenZone are work of various authors and use separate licences. For "
+"more details see doc/README.html and files named README.txt and COPYING.txt "
+"inside game data archives."
+msgstr ""
+"Pogon OpenZone je pod licenco GNU GPL 3.0. Podatkovni arhivi in knjižnice "
+"distribuirane skupaj z OpenZone so delo različnih avtorjev in so pod "
+"drugačnimi licencami. Za podrobnosti glej doc/PREBERI.html ter datoteke z "
+"imeni COPYING.txt in README.txt v podatkovnih arhivih."
-#: src/client/GameStage.cc:141
-#: src/client/GameStage.cc:366
+#: src/client/GameStage.cc:128 src/client/GameStage.cc:357
msgid "Loading ..."
msgstr "Nalagam ..."
-#: src/client/ui/MainMenu.cc:140
+#: src/client/ui/MainMenu.cc:189
msgid "Missions"
msgstr "Misije"
-#: src/client/ui/MusicPlayer.cc:183
+#: src/client/ui/MusicPlayer.cc:163
msgid "Music Player"
msgstr "Predvajalnik"
@@ -67,45 +72,47 @@ msgstr ""
"NI IMPLEMENTIRANO\n"
"Nastavitve lahko spreminjaš v naslednjih datotekah:"
-#: src/client/ui/QuestFrame.cc:40
-#: src/client/ui/QuestFrame.cc:134
+#: src/client/ui/QuestFrame.cc:41 src/client/ui/QuestFrame.cc:135
msgid "No quest"
msgstr "Ni naloge"
-#: src/client/Profile.cc:58
+#: src/client/Profile.cc:57
msgid "Player"
-msgstr "Jaz"
+msgstr "Igralec"
-#: src/client/ui/MainMenu.cc:139
+#: src/client/ui/MainMenu.cc:150
msgid "Quickload"
msgstr "Zadnje shranjeno"
-#: src/client/ui/MainMenu.cc:141
-#: src/client/ui/SettingsFrame.cc:60
+#: src/client/ui/MainMenu.cc:190 src/client/ui/SettingsFrame.cc:60
msgid "Settings"
msgstr "Nastavitve"
-#: src/client/GameStage.cc:464
+#: src/client/GameStage.cc:453
msgid "Shutting down ..."
msgstr "Zaustavljam ..."
-#: src/client/ui/CreditsMenu.cc:168
+#: src/client/ui/MainMenu.cc:192
+msgid "Web"
+msgstr "Splet"
+
+#: src/client/ui/CreditsMenu.cc:156
msgid "engine developer"
msgstr "avtor pogona"
-#: src/client/ui/QuestFrame.cc:62
+#: src/client/ui/QuestFrame.cc:63
msgid "failed"
msgstr "spodletelo"
-#: src/client/ui/QuestFrame.cc:56
+#: src/client/ui/QuestFrame.cc:57
msgid "in progress"
msgstr "v teku"
-#: src/client/ui/CreditsMenu.cc:181
+#: src/client/ui/CreditsMenu.cc:171
msgid "package"
msgstr "paket"
-#: src/client/ui/QuestFrame.cc:59
+#: src/client/ui/QuestFrame.cc:60
msgid "successful"
msgstr "zaključeno"
@@ -133,4 +140,3 @@ msgstr ""
"\n"
"ikone uporabniškega vmesnika\n"
"Davorin Učakar\n"
-
File renamed without changes.
Oops, something went wrong.

0 comments on commit 0ddf457

Please sign in to comment.