Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,728 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

634 Commits (master)

Author SHA1 Message Date
vexed 38dd24351e Merge branch 'newbugfixes' 
Conflicts:
	data/mp/stats/weapons.txt
 2013-12-13 23:24:37 -05:00
vexed b7753a36a2 make -Cpo update-po 2013-12-11 22:26:09 -05:00
vexed 5e8c17e4a9 Merge branch 'newbugfixes' 2013-12-08 23:53:38 -05:00
vexed 2673956a89 Updated Turkish translation 
This commit fixes typos and consistency problems. Also double space,
    punctuation, capitalization problems.

    Patch by wakeup
    Closes ticket:4140
 2013-12-08 23:52:53 -05:00
vexed f29d13b4e8 Merge branch 'newbugfixes' 
Conflicts:
	data/mp/stats/weapons.txt
	src/Makefile.am
	src/ai.h
 2013-12-07 21:26:19 -05:00
vexed 564a8e9225 Remove odd characters at the begining. 
Odd, since it was a straight copy.

Complaint by BuildBot.

refs ticket:4130
 2013-12-03 22:55:32 -05:00
vexed 4868883811 Update Hungarian translation by mtomi78 
closes ticket:4130

Note: please use the actual po name of hu.po, not hungarian.po
 2013-12-03 20:58:04 -05:00
vexed 4f37b25b91 Update Spanish Translation by Saberuneko 
closes ticket:4137
 2013-12-03 20:58:03 -05:00
automerge b513f163aa Merge branch 'bugfixes' 2013-12-02 08:00:32 +01:00
per e9643818d1 Remove dead code, which means removing two entire files. 2013-12-01 18:10:17 +01:00
per e3be45d636 Move the tiny contents of iV_ShutDown() into screenShutDown() and shut down ivi.h and ivi.cpp 2013-12-01 17:46:24 +01:00
cybersphinx 59592bc4df Update translations. 2013-11-29 18:40:55 +01:00
cybersphinx 82d77b700c Italian translation update by Alpha93. 
Closes #4121.
 2013-11-29 18:40:21 +01:00
cybersphinx 7e866083c1 Hungarian translation update by mtomi78. 
Closes #4120.
 2013-11-29 18:39:50 +01:00
vexed e37254f59e Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-11-20 20:42:09 -05:00
cybersphinx 38b65aa26a Update translations. 2013-11-20 19:05:17 +01:00
cybersphinx a31930ed1d French translation update by machintruc. 
Closes #4113.
 2013-11-20 19:04:37 +01:00
cybersphinx a2d4952dda Hungarian translation update by mtomi78. 
Closes #4117.
 2013-11-20 19:02:15 +01:00
vexed b4b019aa5a Merge branch 'bugfixes' 
Conflicts:
	src/init.cpp
	src/multiint.cpp
	src/power.cpp
 2013-11-19 22:18:46 -05:00
cybersphinx ea8e66a9e3 Fix Hungarian translation. 
Refs #4112.
 2013-11-17 17:10:12 +01:00
cybersphinx feafcad20c Hungarian translation update by mtomi78. 
Closes #4112.
 2013-11-17 16:26:37 +01:00
cybersphinx 4f5a7c3d2e Merge branch 'bugfixes' 
* bugfixes:
  Hungarian translation update by mtomi78.
  If we are a VTOL, ignore ground units when moving over them. In other words, don't try to move around them, since you can fly over them.
 2013-11-16 03:57:25 +01:00
cybersphinx 3106ec26ba Hungarian translation update by mtomi78. 
Closes #4110.
 2013-11-16 03:56:28 +01:00
automerge 8b058539e7 Merge branch 'bugfixes' 2013-11-08 08:00:05 +01:00
cybersphinx 0f7a152599 Update translations. 2013-11-04 14:37:14 +01:00
cybersphinx 7e24f1f5f3 Update POTFILES.in and custom translations. 2013-11-04 14:37:12 +01:00
cybersphinx dd9a750e13 French translation update by machintruc/cpasmoi. 2013-11-04 14:33:34 +01:00
automerge 0c75c0a0bb Merge branch 'bugfixes' 2013-10-07 08:00:05 +02:00
cybersphinx 2e3d054a8b Brazilian translation update by Tucalipe. 
Closes #4081.
 2013-10-05 15:23:35 +02:00
cybersphinx 5986ef0f32 Turkish translation update by Ayhan Görgülü. 
Closes #4080.
 2013-10-05 15:21:46 +02:00
automerge feb2ae5af8 Merge branch 'bugfixes' 2013-09-27 08:00:03 +02:00
cybersphinx a5973b75f8 Portuguese translation update by HolyDragoon. 
Closes #4050.
 2013-09-26 16:22:40 +02:00
cybersphinx a8fb3c93d4 Hungarian translation update by mtomi78. 
Closes #3909.
 2013-09-26 16:21:15 +02:00
cybersphinx 86cbe5ec70 Italian translation update by Alpha93. 
Closes #4074.
 2013-09-26 16:20:16 +02:00
cybersphinx dd85dadf3f French translation update by cpasmoi/machintruc. 
Closes pull request 35.
 2013-09-26 16:17:51 +02:00
per 6a9ca8c0e8 Implement lazy loading of PIE files. There is no longer any need to add them in WRF files 
before referencing them from stats or other files.
 2013-09-07 16:27:36 +02:00
haonoq 1aa8ee20ce Merge branch 'bugfixes' 2013-07-05 23:36:16 +00:00
cybersphinx 68e2bf11ee Simplified Chinese translation update by Peng. 
Closes #4017.
 2013-05-20 21:22:21 +02:00
cybersphinx e932438488 Hungarian translation update by mtomi78. 
Closes #3966, #3969, #3973, #4000.
 2013-05-05 14:45:51 +02:00
cybersphinx cc28ec9300 Update POTFILES.in. 2013-05-05 14:42:22 +02:00
automerge 6bb8745c70 Merge branch 'bugfixes' 2013-02-25 08:00:29 +01:00
cybersphinx 940d3b069a Update translations. 2013-02-24 22:22:18 +01:00
cybersphinx cd603e2987 Polish translation update by Emdek. 
Closes #1347.
 2013-02-24 22:21:11 +01:00
cybersphinx 9aad6b0b6b Hungarian translation update by mtomi78. 
Closes #3934.
 2013-02-24 22:19:59 +01:00
cybersphinx 3740ecafcd Merge branch 'bugfixes' 
* bugfixes:
  Update POTFILES.in again.

Conflicts:
	po/POTFILES.in
 2012-12-14 14:29:39 +01:00
cybersphinx c0d97ea032 Update POTFILES.in again. 
The last update included some stray files that shouldn't have been
there.
 2012-12-14 14:23:56 +01:00
cybersphinx 7152019eae Update POTFILES.in. 2012-12-14 14:06:45 +01:00
cybersphinx 9ba2e2968f Merge branch 'bugfixes' 
* bugfixes:
  Update POTFILES.in.
  Update the mac docs (changes in generation).
  QuesoGLC: Fix potential crash when some OpenGL features are disabled.
  Greek translation update by Nikos Papadopoylos.
 2012-12-14 14:06:02 +01:00
cybersphinx 3bac3b8420 Update POTFILES.in. 2012-12-14 14:04:08 +01:00
cybersphinx 91a7c1a2d5 Greek translation update by Nikos Papadopoylos. 
Closes #3703.
 2012-12-10 17:30:29 +01:00