1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,170 Commits 9 Branches 6 Tags
b17bb900ea5d20714f30a6e952449e564df4fc15
Commit Graph
108 Commits
Author SHA1 Message Date
inshy b17bb900ea -Fixed some problems with russian letters in IMP page (by ViSoR) 
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-01-07 20:49:51 +00:00
Wanne 4fb6d788fc - updated _FrenchText.cpp (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4772 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-28 11:49:02 +00:00
Wanne c1fe373866 - Fixed a few French translations (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4767 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-28 08:40:21 +00:00
Wanne a09ddf536e - Improved init code of language specific xml files 
o When the xml file contains an error an error is shown to the user instead of ignoring it

- Shortened text in _FrenchText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4763 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 19:57:10 +00:00
Wanne 91dfc2e5eb - Updated French texts (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 10:41:00 +00:00
Wanne b755a1758b - Removed the "// TODO.Translate" comments for texts, that are already translated 
- Added missing line to STR16 MPClientMessage[] =


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4754 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 07:45:50 +00:00
Wanne cb3956fe6e - Fixed compilation errors in _FrenchText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 07:00:25 +00:00
Wanne 9bae9e99b4 - Updated french texts (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4750 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-27 06:49:36 +00:00
Wanne a2eaf80830 - Fixed text problems on money UDB popup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4746 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-26 12:26:24 +00:00
Wanne cf89b2119d - Fixed a few EDB description text mistakes (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4742 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 19:27:32 +00:00
Wanne 084da4e980 - Multiplayer Improvements: 
o Disabled a few ingame options, that does not work correctly with multiplayer. The user cannot enable those options.
-> TOPTION_ALLOW_REAL_TIME_SNEAK
-> TOPTION_ALLOW_CROWS
-> TOPTION_ALLOW_SOLDIER_TOOLTIPS
-> TOPTION_USE_AUTO_SAVE
-> TOPTION_TOGGLE_TURN_MODE
-> TOPTION_USE_NCTH
o When the server enters the strategy map, the airspace view is shown together with an info message how to switch sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4738 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 10:24:00 +00:00
Wanne f9d8e061e9 - Updated French translation (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4735 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-24 06:22:52 +00:00
Wanne 069f46d92f - Updated French Translation (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-13 18:00:36 +00:00
Wanne d74db4da3a - Updated French Translation (by arkantos) 
- Fixed error in UDB description text in all languages (by arkantos)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-13 17:38:42 +00:00
Wanne f110b44770 - Deleted 3 unused text variables 
gzAmmoStatsFasthelp[ 20 ];
gzArmorStatsFasthelp[ 20 ];
gzExplosiveStatsFasthelp[ 20 ];


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-12 21:31:46 +00:00
Wanne dc76f39c1c - Fixed text in _FrenchText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-11 14:57:52 +00:00
Wanne 03b63f17dc - French text translations (by arkantos) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4697 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-11 14:44:00 +00:00
Wanne fa2af2de1a - Changed the encoding for ALL language texfiles to UTF 8 
o Now we can also build FUNCTIONAL Polish version with VS 2005 instead of only building with VS 2008/VS 2010

- Multiplayer fixes and improvements
o Increased MP version to v1.9
o Added and info output text when the AI interrupts the pure client, that the game could hang and the server should press ALT + E
o Disabled the possibility, that the server could always give himself the turn with ALT + E. Now when pressing '1' on the dialog instead of giving the server the turn, the dialog closes without any action
o Disabled the possibility, that the server could kick himself from the game when pressing ALT + K and then selecting '1'. The '1' button now cancels the dialog without doing any action.
o Disabled the possibility, that the server could kick a client in the strategy screen
o When client gets kicked from tactical, the game automatically switches to spectator mode for the kicked client
o Disabled Encyclopedia and Briefing room links from the laptop

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-06 16:06:33 +00:00
Wanne 262b05817a - Bobby Ray Bugfixes (by Buggler) 
o Fixed enabling/disabling filter buttons
o Rearranged BR's Guns sorting buttons to have same layout as Ammo's, e.g. 'Heavy W.' becoming last button
o Shifted 'Subtotal' to accomodate 7 figures in browsing screen
o Reassigned weird cheatmode financing key. New key: '=' +10k; '+' +100k; '-' -10k; '_' -100k. Formerly: '=' +100k; '-' -10k


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-10-04 16:11:17 +00:00
Wanne 8828a3da3c - Bugfix: Allow "255" as valid in the JOIN-IP Address 
o Fixed text problem in the "You must enter a valid ..."

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-09-21 08:42:33 +00:00
Wanne 9e40cee476 - New Shortcuts (by Buggler) 
New Hotkeys
o Strategic Screen:
Hotkey 'r': Mobile Milita Restrictions

o Sector Inventory (with popup text):
Hotkey ',': Previous Page
Hotkey '.': Next Page
Hotkey 'Esc': Exit Sector Inventory 

o Addtional Changes:
Bobby Ray's button text 'Punch. W.' changed to 'Blunt W.' - more appropriate & consistent with XML Item Class name

o Cosmetic Corrections in Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-09-12 17:44:05 +00:00
Wanne 1687c148f9 - New Feature: Added option to disable the automatic cursor swap (between exchanging positions and other actions eg. talking). (by tazpn) 
o if enabled in the option screen, the cursor will not change periodically to the exchange position.
o if enabled, you can manually exchange positions by pressing 'x'
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290487#Post290487

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-09-09 06:50:17 +00:00
Wanne 2170bd5b4e - Bugfix: Fixed incorrect email message text for new custom user merc (uiIndex >= 178), when merc is availabe for business on AIM 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-21 13:47:46 +00:00
ChrisL af82df815b Corrected Vision Range Bonus display issue on UDB. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-07-12 19:23:31 +00:00
Wanne 4c098a5097 - Fixed type mistakes (Hardest battle, Surgeries undergone) (thx to Zalpha) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-27 18:01:28 +00:00
Wanne 4b55d692c7 BUGZILLA #539: Formatting of "No funds available" output screwed due to tab char 
o I also moved the hardcoded English text to the proper language text files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 13:03:56 +00:00
ChrisL 1652167097 BUGFIX 500 - Corrected "equiped" spelling error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:56:35 +00:00
Wanne 6e2bdd557c **************************************************************************** 
** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 11:04:47 +00:00
Wanne 50916acbdb ************************************************************************** 
* Merged Language specific GameDir from Development Trunk: Revision 4067 *
**************************************************************************
- This will be the official Beta 2011 build version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 14:12:49 +00:00
Wanne 91087ca8c0 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:11:09 +00:00
Wanne 14750c6903 ********************************************************** 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-28 18:38:52 +00:00
Wanne c45a64ee33 - Added missing language text strings for HAM 3.6 
- Search for "TODO.Translate" 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 16:47:14 +00:00
bugmonster 5b11e6790e - removed loading of unused ja2_logo.STI 
- message "windowed mode requires a color depth of 16bpp" localized (need translation to Dutch & German)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-08-30 10:11:36 +00:00
Wanne aebc4f2e88 Bugfix: EDB Fix by Headrock 
- Show Burst AND Auto penalty instead of only ONE (usually Burst penalty) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-06 16:47:31 +00:00
Wanne 17f44f63e8 Corrected one sentence for Enhanced IMP Creation in the language specific text files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2957 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 17:27:54 +00:00
Wanne 7445ba2051 Merged "Enhanced IMP Creation" (by Sandro) 
- For code changes search for // SANDRO
- Tooltips can now be toggled on/off in the options screen instead of "Random IMP Personality" option
- Updated Version Number for new Release Build (2949)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-04 10:44:23 +00:00
Wanne 12f0ed5554 Externalized new messages for the Real-Time Mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-02 13:19:33 +00:00
Wanne 2f36054c50 Updated language spec text files from MP branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2914 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-30 00:01:02 +00:00
Wanne 128e7e7647 - Updated language text files from MP branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2894 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-27 08:43:11 +00:00
Wanne 2e99cbe784 Improved Game Settings (by Arynn) 
- fixed corruption of ja2.set
- ja2.set will no be saved to ja2_settings.ini
- a few more minor game setting fixes and error tracings


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2844 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-12 11:52:35 +00:00
Wanne 516e08e905 - Merged/updated text files from multiplayer project branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-11 11:26:38 +00:00
Wanne 753dc7d605 - Merged/updated text files from multiplayer project branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2816 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 11:31:56 +00:00
Wanne 1ec9fda897 - Merged/updated text files from multiplayer project branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-06 07:54:04 +00:00
Wanne a9b029e854 - Corrected spelling mistakes in _GermanText.cpp (thx to Scheinworld) 
- Merged text files from multiplayer branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2786 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-30 12:27:27 +00:00
Wanne 8935f20145 - Merged/updated text files from multiplayer project branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-28 19:47:30 +00:00
Wanne f927aa7388 - Translated MP Text in _GermanText.cpp 
- A few minor adjustments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-12 23:01:40 +00:00
Wanne 305d3e4cea - Added the new strings from the multiplayer branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-11 18:38:52 +00:00
Wanne 17279936bc - Added the new strings from the multiplayer branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-10 18:23:34 +00:00
Wanne 9b9e22f09d - Fixes/Improvements to Option screen (by Arynn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-10 10:36:08 +00:00
Wanne 335747c3ff Added Headrock's HAM 2.8 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 12:20:30 +00:00