Patch 1 #31

Closed
wants to merge 108 commits into
from

Conversation

Projects
None yet
7 participants

kerbys commented Jul 12, 2012

Some fixes are proposed to the russian translation. Among the others small errors there are important ones ( wrong translation of "Advanced missile ALLOCATION system" which misleads player in gameplay). I'm planning to continue if you don't mind

cybersphinx and others added some commits Jan 21, 2012

@cybersphinx @Cyp cybersphinx Update config folder for 3.1. c716801
@perim @Cyp perim Set default rules back to the old 2.3 balance in regards to the HQ fo…
…r 3.1.
6aca008
@perim @Cyp perim Remove semperfi-js AI from 3.1 b54394e
@cybersphinx @Cyp cybersphinx Change version in configure.ac to 3.1git. e14523d
@Cyp Cyp Merge branch 'bugfixes' into 3.1 8d40cbe
@dak180 dak180 Update the docs for the xcode builds. 373ed8f
@Cyp Cyp Merge branch 'bugfixes' into 3.1 9f4e91c
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update translations.
3a3448a
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Polish translation update by Emdek.
  Update custom translations.
75c8c71
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update team colours to correspond to their names better.
0ad7985
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Add ChangeLog date.
74bb60c
@dak180 dak180 Activate the low qual vids for the xcode beta builds. aeab24c
@cybersphinx cybersphinx Fix the releaseBranch script. 196d503
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Make pathfinding find straighter paths on average.
4d5fdc7
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Fix cross-compilation.
  Add assert for droids added to wrong group.
  qtscript: Try harder not to crash if we fail to load our script context.
  Fix ticket:3094 unit designs in factory menu not appearing when saving and loading.
  Better repo detection for autorevision.sh.
  Revert "Remove hg stuff from autorevision.sh."
  Remove hg stuff from autorevision.sh.
  Remove redundant dependency for version.o.
  Move WZ_WRITEDIR to frame.h and use it for the crashdumps as well.
  Disentangle some Mac includes.
  Actually initialize SDL paste system somewhere.
  Fix crash in semperfi-js

Conflicts:
	src/main.cpp
e756e7f
@dak180 dak180 Fix breakage in the mac builds due to changes in 395cb1b and 5506dae. c6a37b4
@dak180 dak180 Add the error tag back.
This way message will actually show up in xcode builds if reached.
7cc9072
@dak180 dak180 Update Zlib to 1.2.6 and Png to 1.5.8. 15d0fc5
@dak180 dak180 Merge branch 'bugfixes' into 3.1
* bugfixes:
  Fix the help bundle.
  Bring back the WarzoneHelp info.plist which was lost in the shuffle.
  Get all of the scripts that are likely to change with any regularity out of the xcode project.
  OS X: Fetching new build dependency versions is not an error.
  Don't assume Xcode's build products are in the source tree.
  Add OS X help menu items for the man page and scripting docs.
  Simplify dependencies in the xcode build.

Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
ea820dc
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Check if we actually need to hide widgets before hiding them
  Fix player counts for both AI & humans & 'closed' slots in MP games
  Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104
  Fix calling batch file for autorevision.sh script refs: 1759623
  Don't go past the map's player limits when allocating players. fixes ticket:3089
  Fix issues that were overlooked from the revert(s) in ac550ac
  qtscript: Add a note about local variables to the documentation.
  Splice in the Changelog from 2.3.
  Set radarOnScreen to true by default.
  Add general rules script for the campaign.
  Run eventStartLevel always, not only for skirmish.
74c3a89
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  qt script: Document problem with case sensitivity in script defined globals.
  qtscript: Do not save c++ defined special variables to the savegame.
  Quick workaround for scavs going inactive after savegame loading.
  If you save, the load, then save again, then game.scavengers value was set to false even if you have scavengers in the game, and the scavenger script context is not created, leading to an assert and lack of scavenger action in the game. Fixed.
  Update the docs for xcode builds.
  qtscript: enumBlips() isn't 3.2-only anymore.
  qtscript: Improve documentation
  Make sure we do not start multiple AIs for each player when loading a game.
  Fix desynch on offering an AI an alliance.
  When people are kicked, don't lock them out from all other games. They can't join the game they were kicked from anyway.
  Make latency guesser less optimistic.
  Improve screen while waiting for game to start.
  Hopefully make it so conflicts in the xcode project files are automatically resolved.
  qtscript: Add function enumBlips(player) to get a list of non-transient radar blips.
6d476a8
@vexed vexed Merge branch 'bugfixes' into 3.1 fd753a6
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Update translations.
  Change "System message" to "Server message" for the MOTD.
  Only show "player x joined" message in the lobby when it is someone else.
  Fix libvorbis linking.
  Make research button flash more consistently.
  Always show droids in production, even if obsolete.
  Fix another research cancellation not registering in UI.
b113965
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Fix ChangeLog date.
231b638
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  qtscript: Add an html target using hevea for the docs.
  qtscript: Use lstlisting in the docs.
  Fix radar/unit design in campaign for away missions.
  qtscript: Add function to enumerate base structures in away missions.
  qtscript: Add selection by structure type to enumStruct.
  Add new shortcuts for unit selection.
  Clean up src/selection.cpp/h.
  qtscript: Document add/removeReticuleButton parameters.
  qtscript: Remove OPTIONS as an alias for the COMMAND button.
  Change new PIE modes to use flags instead of connectors.
  Fix incorrect rounding 1% HP as 0 HP (indestructible features)
  Fix incorrect speed bars for vtol.
  Fix ticket:3137 - Nexus AIs loaded for javascript AIs
  Allow PMs to player 8 and 9.
119ac53
@vexed vexed Merge branch 'bugfixes' into 3.1 3d36a2a
@perim perim Set 3.1's qtscript version properly. b49039f
@vexed vexed Merge branch 'bugfixes' into 3.1 127a7df
@dak180 dak180 Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update the docs for xcode builds.
  Update translations.
  Update ChangeLog.
  Search data/mp for map files in addition to data/base.
  Bump netcode, since I forgot in last commit.
  Let the host kick people in non alliance games. (left+right click over ready button of the player you want kicked)
fa05b80
@vexed vexed Merge branch 'bugfixes' into 3.1 b27a5f9
@vexed vexed Merge branch 'bugfixes' into 3.1 1ec8bdb
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Make debug messages work in campaign mode.
7eb89ba
@vexed vexed Merge branch 'bugfixes' into 3.1 9e6c534
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Explain how the cursor system works a bit better, and make it easier to edit these blasted things. Created a external file called cursorselection, that can be loaded into a spreadsheet for easy editing.
  French translation update by Amiral JCDG.
  Polish translation update by Emdek.
  Do not complain to all players in game, on attempted loading of tank on cyborg transport.
  Make "Go to Transport" button work sensibly.
  Do not land all 150 VTOLs on the same tile.
  Clean up actionVTOLLandingPos() interface.
  Reduce tank dancing.
  Don't remove autorevision.h on make clean, take 2.
  Show allied unit counts.
  Try to be more consistent with gameTime usage.
  cleanup: Remove unused define.
  cleanup: Remove redundant QScriptEngines.
  Enable the OpenGL 1.4/VBO fallback on Macs.
  Revert "qtscript: Do not call destroyed event twice for each object."
caeca03
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes: (21 commits)
  Remove useless duplicate line.
  cleanup: Constify and match interpolatePos and interpolateAngle.
  Prevent division by zero in interpolateSpacetime().
  maint: Update mailing list address.
  dpkg: No more mods.
  Don't try to send limit data before hosting a game.
  cleanup: Put bHosted into multiint.h.
  linux: Make gdb backtrace all threads.
  Get rid of useless warnings, take 2.
  Add qslint to the Warzone app bundle.
  Fix and reorganize dependencies for the mac builds of the tests.
  Don't waste 200 ms before droids start moving.
  Muzzle flash fix for Assault Cannon & Cluster/HEAP Bomb projectile's texture fix and fix TCmask for Plasmite Flamer AA Flak Cannon Sunburst AA Rocket Array
  Add pie(state|types).h to the xcode project.
  Show milliseconds, if game speed is set to very slow.
  Fix dead pointer usage following lone droids dying during repair at repair facility.
  Allow Super+click as alternative to Meta+click or Alt+click.
  Don't assume we are still in demolish mode if not a droid type that can't do that. fixes ticket:2106
  Try not to allow multiple mouse presses when trying to kick people out of game. closes ticket:3209
  Don't display the demolish cursor over unbuilt structures. fixes ticket:3118
  ...
bc79512
@cybersphinx cybersphinx dpkg: Update package version number for 3.1. a0b35f7
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1 0718856
@dak180 dak180 Merge branch 'bugfixes' into 3.1
* topic/bugfixes:
  Update the mac doc bundle.
ab101da
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Only show landing lights when they're actually somewhere on the map.
  cleanup: Simplify setNoGoArea a bit.
  Make escape work again when the mouse is over the menu.
  Pathfind to oil wells which are only accessible from a diagonal tile.
  Rearm on rearming pads instead of beside rearming pads.
  Make VTOL rearming pads stay above ground.
  Move radar handling from processInput() to processRadarInput().
  Fix broken multiplayer.
  Externalize the custom build rule scripts.
5f06516
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes: (27 commits)
  Don't change radar option when clicking on scanlines.
  Use the same text for the unit colour options everywhere.
  Improve factory selection.
  cleanup: Remove some useless code.
  French translation update by Amiral JCDG.
  Load and save factory numbers.
  Properly disable unit design/radar without HQ in mp/sk.
  Add __LINE__ to debug() routines to show exact line it is being called from. On LOG_WARNING, only ouput the warning one time and supress the rest.
  Change it so you can deconstruct anything but blueprints. Fixes ticket:3312
  When debug mode is enabled also enable the flag
  Change defaults to window mode & 640x480, so people can see the system dialog popups if something goes wrong on init.
  Fix spacing a bit for host lobby screen
  Fix Assert to check for Super Transporter as well
  update MSVC solution file Disable mimimalRebuild since it was slower than doing /Mp
  Fix suboptimal paths on multiple droids pathfinding to same location.
  Show correct AI names, even when AI list differs from the host's.
  Remove unused SS_BEING_DEMOLISHED.
  Update droid height after unloading specific droid from transport.
  Show health as well as build progress when selecting incomplete enemy structures.
  Set »ingame.JoiningInProgress[i] = false;« in NET_InitPlayer().
  ...
c9529ec
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Spanish translation update by Saberuneko.
  dpkg: Explicitly depend on xmlto.
  Simplify the OS X crash dialog.
  Save our openGL info so we can write it out. Save game version / time / openGL stats / and misc. other things that we can use to debug issues to a gameinfo.ini (in savegames) or WZdebuginfo.txt (on fatal errors) file that can be easily uploaded to us.
77ad00b
@cybersphinx cybersphinx Update translations. 93a7176
@cybersphinx cybersphinx Update version numbers for 3.1 beta7. 52e04f8
@cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta7." a6b9d6d
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update translations.
  Update files to translate.
09c5d84
@perim perim 3.1: Fix production of barbarian foot soldiers. They were classified as
heavy bodies, when factory only could produce light bodies. Closes ticket:3358
scavfact.js: Remove useless conversions to world coordinates. Closes ticket:3356
951abc1
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes: (22 commits)
  Actually use the include from our included quesoglc.
  Spanish translation update by Saberuneko.
  Update translations.
  Make unit design/radar depend on the existence of an HQ, not the base setting.
  Disable unit design when HQ gets destroyed in mp.
  Avoid mixing up droid orders during lag.
  Don't bother even checking to send maps if not host.
  Handle host drop errors. Restart the background screen on errors (instead of looking at a small map preview)
  Add debug command "damage me" to facilitate debugging issues related to damage level. Note: you can't kill a droid / structure with this command. Used to debug retreat levels & autorepair issues & ...
  Subtract closed slots from displayed max players.
  Distinguish between wrong version, wrong mod and full game.
  Add IMAGE_NOJOIN_FULL and IMAGE_NOJOIN_MOD.
  Fix the lock icon to always show it being locked when a password is set. Remove the box when we don't use a password & in skirmish games.
  Try to fix the output of netlogs.
  Fix border on tooltips
  Try to switch to windowed mode if user is in FS mode on LOG_FATAL errors. This may, or may not work on some platforms. (http://www.libsdl.org/docs/html/sdlwmtogglefullscreen.html) "Toggles the application between windowed and fullscreen mode, if supported."
  Don't display repair icon if we are hovering the mouse over ourselves, and we are damaged.
  Update changelog
  Fix problem with continent generation, where rightmost and bottommost tiles would be treated as passable. Closes ticket:3269. Thanks to NoQ for debugging.
  Fix problem with trucks not being available before HQ. This closes ticket:3344 and closes ticket:3337 and adds new qtscript function enableTemplate(). Original patch by vexed.
  ...
5e1740a
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update translations.
  Polish translation update by Emdek.
  Prevent % in research messages from breaking translations.
  Remove trailing commas from the research messages.
  Revert back to flashing the intel button by default. (New players to the game have no idea what "New Intelligence Report" meant if they don't have the vids installed)
  Make it more obvious the game is free to anyone who wants it. Thanks to Kreuvf for the wording.
  Don't scale the font, just use the regular size when displaying meter.
  Don't spawn artifacts in campaign games, that is only done via scripts, since they serve a specific function in the campaign.
  Don't prevent the use of the scroll wheel when the build / research / design / whatever window isn't up yet.
  Restore missing check, so artefacts are only dropped by factories.
  Fix release builds, busted in fe80d02
  Fix screen shake to only shake on things that are explosive by nature, (power plants, factories, etc), and not on walls. Change shake time to be in proportion to what was destroyed, minimal time for features (skyscrapers), to a longer time for a laSat blast.
  Don't assert when babas burn to death, and the pointer is still in the active list (apsDroidLists) or that pointer is still "in use" by another droid, and also clean up the messages and attribute them to LOG_DEATH.
  Avoid orders given to tanks of wrong player.
  Update Png to 1.5.10.
  Update the mac documents package.
  Synchronise barrel and artefact placement.
  Synchronise game random seed randomly at game start.
  Fix clockwise skidding.
  Make the FetchPrebuilt script smarter about replacing incorrect tarballs.
079087a
@cybersphinx cybersphinx VA-based fallback for terrain renderer.
Patch adds VA-based fallback for terrain render, thus lowering OpenGL
requirements from 1.4+vbo ext to 1.2 for this component. TCMask uses
texture crossbar feature from 1.4 (or 1.3+ext). Patch by I-NoD.
Refs #3248.
fb42df2
@cybersphinx cybersphinx Split --fallbackmode into --noshaders and --novbos.
Closes #3248.
d9e35f1
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Brazilian translation update by Tucalipe.
  Hungarian translation update by mtomi78.
  Polish translation update by Emdek.
  Fix save game load crash due to dangling, dead target from structures.
  Map fixes and updates: GreatRift, MizaMaze, Wheel.
  Hungarian translation update by mtomi78.
  Keep default secondary order from droid initialization if no replacement order found in savegame. Should fix ticket:3359
  Use Clang wherever possible.
6ed2964
@cybersphinx cybersphinx Skip oil resources that would crash the game in the map preview.
Refs #3247.
1974546
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  German translation update by Kreuvf.
  Make pink/purple and orange/yellow more distinguishable on radar.
  Update ChangeLog.
  Update player number for lint.cpp and the map conversion tools.
  Turkish translation update by Ayhan Görgülü.
a7a007a
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update the mac doc bundle.
bbe4066
@cybersphinx cybersphinx Update translations. 5996b89
@cybersphinx cybersphinx Update version numbers for 3.1 beta8. 7dc7d95
@cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta8."
This reverts commit 7dc7d95.

Revert "Update translations."

This reverts commit 5996b89.
42024d9
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Add scripts to generate translation statistics.
  Update custom translations.
  Add assertion against duplicate file descriptors.
  Only send 2 desynch logs per player on desynch.
  Add oil barrels on all clients.
cf77b27
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 4879779
@Cyp Cyp Merge branch 'bugfixes' into 3.1 880ee8e
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 6236028
@vexed vexed add sequences to base with 9 FMVs as discussed on ML. Fix Makefile
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/tags/2.3.5@11721 4a71c877-e1ca-e34f-864e-861f7616d084
(cherry picked from commit e151241)

Conflicts:
	data/Makefile.am
2ef3d7f
@vexed vexed Change default for screen shake to on 4beba1f
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 9546393
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 b763c32
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 a28bcf9
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
b2ee34e
@cybersphinx cybersphinx Update translations. ab9c729
@cybersphinx cybersphinx Update version numbers for 3.1 beta9. e705adb
@cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta9."
This reverts commit e705adb.

Revert "Update translations."

This reverts commit ab9c729.
778a426
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 a31b9ab
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 2a794be
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update ChangeLog.
  Spanich translation update by Saberuneko.
  Hungarian translation update by mtomi78.
805c254
@cybersphinx cybersphinx Update translations. 29a0bd7
@cybersphinx cybersphinx Update version numbers for 3.1 beta10. 968172d
@cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta10."
This reverts commit 968172d.

Revert "Update translations."

This reverts commit 29a0bd7.
4a1e029
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 f04b5dd
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 ddb696c
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 2738fe8
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 f996fa0
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 49d60d4
@Cyp Cyp Merge branch 'bugfixes' into 3.1
Conflicts:
	src/game.cpp (Dropped 1974546 changes, which were now redundant.)
d227d3a
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 3928607
@Safety0ff Safety0ff Fix hardcoded number of frames for structure animations.
N.B. Animation rates remain hardcoded for now.

Closes #1871.
(cherry picked from commit 55bea09)
02ced5e
@Safety0ff Safety0ff Convert code and models from hard coded animation intervals to model …
…defined animation intervals.

Also assert on PIE files with bad animation data.

Closes #3539.
(cherry picked from commit 75ff207)
b3dc944
@Safety0ff Safety0ff Don't reserve frame 0 for team colour (we use tcmask now).
Fixes bug in animation found by Berg.
(cherry picked from commit 2a9548a)
ecacd97
@Safety0ff Safety0ff Fix texture animation data loading for pie 3
(cherry picked from commit 7c451d5)
cea701a
@Cyp Cyp Merge remote branch 'origin/bugfixes' into 3.1
Conflicts:
	lib/ivis_opengl/screen.cpp
c348761
@Cyp Cyp Merge branch 'bugfixes' into 3.1
Conflicts:
	lib/ivis_opengl/screen.cpp
9732dc7
@Cyp Cyp Merge branch 'bugfixes' into 3.1
Conflicts:
	lib/ivis_opengl/screen.cpp
	lib/ivis_opengl/screen.h
	src/terrain.cpp
db1e828
@vexed vexed Revert "Fix texture animation data loading for pie 3"
This reverts commit cea701a.

(will commit this to bugfixes instead!)
f3df64a
@vexed vexed Revert "Don't reserve frame 0 for team colour (we use tcmask now)."
This reverts commit ecacd97.

(Will commit to bugfixes instead!)
da94f64
@vexed vexed Revert "Convert code and models from hard coded animation intervals t…
…o model defined animation intervals."

This reverts commit b3dc944.

(will commit this to bugfixes instead!)
41b8034
@vexed vexed Revert "Fix hardcoded number of frames for structure animations."
This reverts commit 02ced5e.

(will commit this to bugfixes instead!)
f13b0e3
@Cyp Cyp Merge remote branch 'origin/3.1' into 3.1 828292f
@vexed vexed Merge branch 'bugfixes' into 3.1 2ccf4e0
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 02395b3
@Cyp Cyp "Fix" object selection bounding boxes and clicking on terrain, by sca…
…ling by a random factor.

This shouldn't work, but works in the sense that two wrongs make a right, two bugs make a feature.
d697c42
@Cyp Cyp Merge branches 'screenscalehack' and 'bugfixes' into 3.1
Conflicts with 'bugfixes':
	lib/ivis_opengl/screen.cpp
	lib/ivis_opengl/screen.h
	src/clparse.cpp
5c1e204
@cybersphinx cybersphinx Merge branch 'bugfixes' into 3.1
* bugfixes:
  Update translations.
  Update the mac doc bundle.
  Update ChangeLog.
  Remove unused variable, and fix some narrowing stuff.
  Fix loading of campaign savegames.
3bb326b
@cybersphinx cybersphinx Update translations. 8d8539f
@cybersphinx cybersphinx Update version numbers for 3.1 beta11. e8a51a2
@cybersphinx cybersphinx Revert "Update version numbers for 3.1 beta11."
This reverts commit e8a51a2.
df98e34
@cybersphinx cybersphinx Revert "Update translations."
This reverts commit 8d8539f.
5b8165e
@Cyp Cyp Merge branch 'bugfixes' into 3.1
Conflicts:
	lib/ivis_opengl/screen.cpp
f556d62
@Safety0ff Safety0ff Merge branch 'bugfixes' into 3.1 aeeec83
@cybersphinx automerge Merge branch 'bugfixes' into 3.1 e370f0f
@kerbys kerbys Update 3.1 fd615e8
Owner

vexed commented Feb 5, 2014

Hi, we really dislike github's mere/pull request, our bug tracker @ http://developer.wz2100.net would be the correct venue for these things, as explained in http://forums.wz2100.net/viewtopic.php?f=1&t=11570

Translations will be applied before our next release.

vexed closed this Feb 5, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment