Commit Graph
100 Commits
Author SHA1 Message Date
Wanne 44e4f96c0f Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-07 12:46:18 +00:00
Wanne d7a48bbe1a Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9232 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-04 17:11:38 +00:00
Wanne c53721f0bd Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-06 22:17:35 +00:00
Wanne 7a14a167fb Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-09-02 19:14:51 +00:00
Wanne 9b189b84f7 Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-08-03 16:26:50 +00:00
Wanne 6535c81157 Updated Chinese Texts (by kmoi & zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8985 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-04-27 18:21:16 +00:00
Wanne 8c74a30b35 Updated Chinese Text files (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8898 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-10-01 09:42:09 +00:00
Wanne e14444f14a Multiplayer: Disabled rooftop climbing, because its not syncing correctly between the clients
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8866 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-13 17:43:36 +00:00
Wanne 1e66fe2ba7 Multiplayer:
- Disabled fragments, because this can crash the game when stepping on a mine, ...
- Enabled rooftop climbing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-09 09:32:49 +00:00
Wanne 9bc4b2bfb6 Translated a few German Texts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-08 22:11:29 +00:00
Wanne aa0d52f790 Translated a few German texts
Moved // TODO.Translate comments
Fixed missing \n in text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8850 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-08 19:30:44 +00:00
Wanne dc23302696 Fixed compilation error when trying to compile JA2UB version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8849 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-08 18:46:45 +00:00
Wanne 5f54d43760 Fixed compilation error (sqrt) when compiling in Visual Studio 2010
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8848 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-07-08 18:28:31 +00:00
Wanne 611b5f4d8c Added files to ignore list
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8776 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-03-28 16:54:05 +00:00
Wanne d76d4574c9 Chinese Translation updates
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8773 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-03-17 10:05:52 +00:00
Wanne 12abe8c5bc Bugfix: Fixed INTEL-Button wrong placement x button position, if DISEASE-Button is not displayed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8772 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2020-03-17 09:48:16 +00:00
Wanne a077019d13 Updated Chinese text files (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-09-10 19:17:52 +00:00
Wanne c5fdd05778 - Updated Chinese Translations (by TBS & zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2019-01-28 15:43:22 +00:00
Wanne d65368b6ff Chinese Fixes (by zwwooooo)
- Fixed "new colours on ammotypes not work when use WINFONTS for Chinese version
- Updated Chinese Translations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8646 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-12-19 09:57:05 +00:00
Wanne 8ae2eacfcd Chinese Translation updates (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-09-24 07:44:27 +00:00
Wanne ada2d374c4 Updated Chinese Text files (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8611 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2018-09-11 11:37:10 +00:00
Wanne f0698366e8 Updated Chinese texts (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-18 10:19:57 +00:00
Wanne b6dde6a0da Updated Chinese texts (by TBS & zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-09-12 11:19:56 +00:00
Wanne 91faf8a182 Fixed compilation error in VS2005
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2017-01-23 19:28:19 +00:00
Wanne ea9d5f74a5 Fixed a few translations for Chinese version (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-11-29 20:45:03 +00:00
Wanne 6c737fefd3 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt()
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-11-02 13:24:17 +00:00
Wanne 926b9d9e5c Updated Chinese translation and adjustments in WinFont (by zwwooooo and TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-17 16:38:36 +00:00
Wanne bdc6aaf460 Updated Chinese text file (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-10-06 18:00:03 +00:00
Wanne c83847a407 Fix: Item's short name in tactical interface, Chinese characters smearing bug
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-28 08:31:22 +00:00
Wanne 721e9effe9 Updated Chinese Text translations (by TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-28 08:24:27 +00:00
Wanne 8c3902e1b6 Fixed compilation error that was popping up when compiling a non English version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-13 09:18:33 +00:00
Wanne 1e51250475 Multiplayer: Completely disabled interrupts in a COOP game, because it is still buggy. So the ALT + E workaround on the server (to give turn back to client on stuck interrupt) should not be needed anymore
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-09-12 18:03:19 +00:00
Wanne 835e948735 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt()
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-08-22 19:24:14 +00:00
Wanne c676a48cd5 Fix: Added explicit BOOLEAN check for pSoldier->bVisible (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-23 05:24:45 +00:00
Wanne c969dce2b3 Bugfix: Button Image (WM_AUTOFIRE) was not unloaded (by Subotai)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-03 19:28:54 +00:00
Wanne 23d4051473 Fixed problems with enemy rooftop climbing (by sevenfm)
- Also updated "Water", "DeepWater" and "WaterTooDeepForAttacks" methods: Added bLevel parameter (by sevenfm)
- see: http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22966&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8110 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-15 12:40:54 +00:00
Wanne 80bfe613e8 Bugfix: Briefing Room: Deleted unused/wrong text box from briefing room (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-10 21:01:35 +00:00
Wanne 446484f6ca UB 1.13 Fixes (by Jazz)
- Externalized more hardcoded grid numbers


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8097 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-08 21:06:31 +00:00
Wanne ea6e30d8c8 UB 1.13 Fixes (by Jazz)
- The problem was fixed with the mark of underground sectors on the strategic map (J14-1,K14-1,L15-2,L15-3).
- Fixed the problem with moving from the sector K14-1 to K15-1.
- Procedure HandleMovingTheEnemiesToBeNearPlayerWhenEnteringComplexMap was blocked in the file strategicamp.cpp.
- Added a few new parameters to the file UB_Options.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-07 18:41:45 +00:00
Wanne b905632044 Moved WHO logo on the laptop page a view pixels to the right (to make more space for the headline text)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-03 18:50:45 +00:00
Wanne fa2d284034 - Moved hardcoded disease text "(undiagnosed)" to the language specific files text files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-02 16:14:11 +00:00
Wanne b5fd88b50f Bugfix: Doubled the string buffer size for all the Disease text fields for Disease.xml file, because in Russian language long text fields are cut (in Russian language one character needs 2 bytes)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-02 16:05:02 +00:00
Wanne ee7b935456 Disease: Added support for language specific Disease files (German.Disease.xml, French.Disease.xml, ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-03-01 23:00:27 +00:00
Wanne 757e094a89 Bugfix: Doubled the string buffer size the bio text field for OldAIMArchive.xml file, because in Russian language, character Bio was cut (in Russian language one character needs 2 bytes)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-02-27 17:49:04 +00:00
Wanne bd6ba9b773 - Multiplayer Bugfix: After synchronizing client data, the cached item names did not get reinitialized
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-24 20:02:39 +00:00
Wanne b0207aadcb Reenabled the "AI Viewer" in Strategy screen when pressing F12 in a DEBUG 1.13 version
- The AI Viewer was disabled in Revision 7727 (I don't know why ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-23 16:15:38 +00:00
Wanne b430965027 Fixed compilation error in VS 2005
- Missing "include <math.h>" in ASD.cpp
- Missing cast argument to FLOAT inside sqrt() function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8021 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-15 08:09:52 +00:00
Wanne 48413a9242 Fix: Fixed crash, when clicking on "Done" button after "Auto Resolve" has been finished (pGroup NULL pointer)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-03 11:43:38 +00:00
Wanne 38e77c7295 Fix: Fixed compilation errors when trying to compile UB version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-11-04 08:12:47 +00:00
Wanne a3806919ad Bugfix: Allow shooting on "water tiles" instead of showing the "?", if our soldier is on ground level > 0
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7998 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-10-23 14:47:15 +00:00
Wanne 91eef3098c - Equip Milita Improvements: I've written code, which adds attachments to free positions on the gun militia chose to pick up (by navaroe)
- Bugfix: Reinforcements:  Parts of roadblocks were resurrected after reinforcements death (by navaroe)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-10-15 10:40:58 +00:00
Wanne fbd5cc001f - Updated Chinese translations (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-10-05 19:31:35 +00:00
Wanne 6d08593bd0 MeLoDy Updates
- Increased horizontal table column width to fit longer merc names


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-13 15:21:55 +00:00
Wanne b9a07dd36a MeLoDy Updates
- Increased horizontal table column width to fit longer merc names
- Externalized header texts 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-13 13:49:41 +00:00
Wanne ffdcb827df Externalized Quest strings (Encyclopedia) (FactDescText, QuestDescText) to the language Text files
- See comment // TODO.Translate

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-13 12:00:23 +00:00
Wanne a2589f7034 Bugfixes / Improvements (macros) of Assignments (by Franimus)
- Fixed warning for INT8 overflow on scroll region priority, seemingly had no effect though
- Use new assignment macros
- Bugfix - POWs' activity level being overwritten
- Feature - automatically bandage bleeding mercs on a PATIENT assignment
- Bugfix - mercs treated at facilities should not use mercs' medkits
- Added 3 new enums for facility doctor, patient, and repair
- Bugfix for facility patients not detected as being in a facility
- Bugfix - iBurstAPCost was ignoring half of its calculation due to extraneous semicolon


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-12 11:27:28 +00:00
Wanne 56072fdd0f Updated JA2 1.13 Credits (thx to Scheinworld)
Updated Version Number

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-07-14 20:17:33 +00:00
Wanne 02d52875c6 - Added missing texts for Chinese Version (gzDisplayCoverText[])
- Fixed invalid characters in some language texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7910 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-07-12 12:07:37 +00:00
Wanne 2d5e68a86d - Commented out restricted Scroll ID/viewport as viewport for A10_B1 map shifts around in non-640x480 resolutions. As such 'Restricted Scroll ID' textbox becomes irrelevant in mapeditor (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-05-31 18:16:06 +00:00
Wanne deba6d7ac0 Merged from revision: 7757
Multiplayer Bugfix: Reverted the "endless interrupt bugfix" for the pure client, because it was not working correctly, and the server could not press ALT + E to give the turn back to the client, if stuck.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-28 12:54:15 +00:00
Wanne c94ac421ae Merged from revision: 7725
- Fixed typos in English AIM Bios and source texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7726 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-02-04 19:25:06 +00:00
Wanne fd1ecb2edf Merged from revision: 7716
- Improved message prompt when launching game in fullscreen mode on unsupported screen resolutions instead of just those that's set to larger than primary desktop resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7717 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-01-07 20:05:23 +00:00
Wanne 134b534718 Merged from revision: 7683
Fixed a few errors in Russian translation (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-28 09:37:06 +00:00
Wanne eebb57ed38 Merged from revision: 7678
Editor Fixes (by Buggler):
- '~' (tilde) hotkey to toggle level cursor if applicable; CTRL hotkey for placing objects on roof removed 
- Fixed missing roof cursor for non-vanilla size maps
- Updated editor popup text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-09 15:57:15 +00:00
Wanne eaa153b310 Merged from revision: 7676
Features (by anv)
- new Ja2_Options.ini setting - HIDE_EXPLORED_ROOM_ROOF_STRUCTURES (e.g. sandbags) at ground level view
- Hold CTRL hotkey in mapeditor to place any object on roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7677 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-06 13:37:25 +00:00
Wanne bb264d6815 Merged from revision: 7674
- Fixed merc lighted movement popup text in options screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-06 12:57:40 +00:00
Wanne de99bcdb4f Merged from revision: 7672
Increased MAXATTACHMENTS size from 30000 to 40000 which is needed for the amount of attachments in AIMNAS mod (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-05 19:13:54 +00:00
Wanne 62287f7672 Merged from revision: 7670
Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-04 16:51:53 +00:00
Wanne 0ef41fffd7 Merged from revision: 7668
- Externalized hardcoded TownInfo text which shows the number of Total # of prisoners/capacity, to language text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-12-01 20:57:11 +00:00
Wanne 5064e59785 Merged from revision: 7666
- Updated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-29 17:20:31 +00:00
Wanne 6e0823d5d1 Merged from revision: 7662
Fixed typos in Source Code texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-24 17:13:16 +00:00
Wanne 7b700ac5c2 Merged from revision: 7657
Fixed missing "," for pHelicopterEtaStrings[] for Dutch, Italian, Polish and Russian Version (thx to Woquit)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-11-17 19:51:08 +00:00
Wanne af1f5c5e17 Merged from revision: 7605
Multiplayer: Added additional info text for using the chat by pressing 'y' in the Multiplayer Start screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-24 06:59:07 +00:00
Wanne 852f5bd5bb Merged from revision: 7603
- Fixed _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-21 18:46:12 +00:00
Wanne e000abcc57 Merged from revision: 7586
Multiplayer Bugfix:
- Improved (fixed) interrupt endless clock when enemy interrupts (CO-OP game) (tested by Woquit)
- Override turn (ALT + E): Now it is possible again for the server to give the turn back to itself
- Updated MP Version Number to 3.1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 14:08:28 +00:00
Wanne f9cad94471 Merged from revision: 7579
Externalized (by Buggler):
- Kingpin's faction sector and roaming gridno around tony shop if they become hostile
- Queen's alternate grid no if basement sector is cleared
- Doreen's kids sector that is being freed
- Single sector towns does not give global loyalty bonus instead of previously hardcoded Tixa and Orta sector
- Enemy investigation town sectors if current loaded sector is player-controlled
- Associated town sectors to mine when mine runs out

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-17 16:25:58 +00:00
Wanne ee63f86aed Merged from revision: 7573
- Deleted wrong texts in _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-15 19:20:34 +00:00
Wanne 00999d673a Merged from revision: 7565
Multiplayer Bugfix: Fixed endless clock on enemy interrupt on the server, by reverting the non working interrupt fix which was introduced in revision 5623
- INFO: The endless clock on the client still occurs on certain enemy interrupts, but this can be fixed by pressing ALT + E on the server and giving the turn back to the client.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-14 18:22:18 +00:00
Wanne 982ad644a8 Merged from revision: 7561
- Fixed hardcoded sam site sectors for gubEnemyEncounterCode (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7562 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 19:25:40 +00:00
Wanne d6fc14b738 Merged from revision: 7559
- Fixed SectorNames.xml tags not properly read in non-ENG versions (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 19:23:44 +00:00
Wanne 06367419c0 Merged from revision: 7548
Bugfix: Place inventory on same bLevel as merc when dropping items through map screen inventory (by Ocular)
- see: http://www.ja-galaxy-forum.com/ubbthreads.php/ubb/showflat/Number/336500/gonew/1/[PATCH]_Place_inventory_on_sam#UNREAD

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7549 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-09 11:34:54 +00:00
Wanne 6c2273f4eb - Added support for new resolution: 960x540
- Custom Resolution (25) can now set to any user specific resolution (X, Y) value, but must be at least 640x480 resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-04 15:55:21 +00:00
Wanne a2b40cd51b Driveable Vehicles Tanks Update (by Ocular)
- New ja2_options.ini entry: TANK_MINIMUM_PROGRESS
- This defines the progress (0-100), when the enemy can use tanks for attacks and patrols

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-03 09:47:15 +00:00
Wanne 6de39a6ff2 Merged from revision: 7525
- Fixed bug with game selecting helicopter loading screen when reloading game (by anv)
- Fixed autoplace stacks logic from sector inventory on r7380 commit (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-17 18:46:09 +00:00
Wanne 260f09356c Merged from revision: 7512
- Translated skills menu entries for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-12 16:21:36 +00:00
Wanne 84089c3c0c Merged from revision: 7500
- Fixed wrong camo type worn off message (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-08 19:32:17 +00:00
Wanne d3100e3c4e Merged from revision: 7484
Fixes (by Buggler)
- Commented code due to weird results when swapping filled LBE items that has pockets of the same size
- Fixed militia remains in loaded sector on using Unassign All button and then not assigning any militia to the loaded sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-03 16:29:19 +00:00
Wanne 3f4f8004ec Merged from revision: 7478
- Updated _RussianText.cpp (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-02 19:49:28 +00:00
Wanne 64ed0c22b7 Merged from revision: 7472
- Updated _Ja25RussianText.cpp (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-01 19:38:05 +00:00
Wanne 684e1d6148 Externalized Difficulty Settings
- Removed #ifdef DIFFICULTY_SETTING. Now the new difficulty settings code is always active (by Jazz)
- Removed unused INI reading settings

These parameters were moved to the file DifficultySettings.xml.
** Ja2_Options.INI **
ENEMY_AP_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_KILLS_PER_PROGRESS_POINT_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
INITIAL_GARRISON_PERCENTAGES_NOVICE  , _EXPERIENCED, _EXPERT, _INSANE
MIN_ENEMY_GROUP_SIZE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
UNLIMITED_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_STARTING_ALERT_LEVEL_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_ALERT_DECAY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_AWARE_BATTLES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
EVALUATION_DELAY_VARIANCE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_DAYS_AFTER_PATROL_DESTROYED_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AGGRESSIVE_QUEEN_AI_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
PERCENT_EXTRA_ELITES_EXPERIENCED , _EXPERT, _INSANE
MAX_MERC_DEATHS_EASY , _EXPERIENCED, _EXPERT, _INSANE
		
** Creatures_Settings.INI **
CREATURE_SPREAD_TIME_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BASE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_INIT_BONUS_SPREAD_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_POPULATION_MODIFIER_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_TOWN_AGGRESSIVENESS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
		
** CTHConstants.ini **
BASE_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AIM_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-31 13:39:23 +00:00
Wanne 2bbd80892c Merged from revision: 7436
- Changed MP Version to 3.0
- Changed default value for BASE_SIGHT_RANGE to 14 (as suggested by silversurfer)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-28 10:55:00 +00:00
Wanne 344797f6af New Feature: Added up to 15 game difficulty settings (by Jazz)
- Externalized the difficulty setings to "TableData\DifficultySettings.xml" file
- Some INI Settings (ja2_options.ini, CTHConstants.ini and Creature_Settings.ini) moved from INI file to this xml file
- see #define DIFFICULTY_SETTING

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-28 10:30:40 +00:00
Wanne 5e8ba14f42 Merged from revision: 7434
Updated Game Option popup text on tweaked hotkeys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7435 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-27 07:31:39 +00:00
Wanne dd4935efae Merged from revision: 7431
Multiplayer Bugfix: Sector starting edge (N, E, S, W, Center) was wrong initialized

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-26 20:07:03 +00:00
Wanne 73ce03a240 Merged from revision: 7429
Tweaked hotkeys (by Buggler & Sevenfm)
- 'Alt + R' for reloading merc weapon (new)
- 'X' for alternate hotkey for 'P', Prone
- 'Ctrl+Alt+W' for toggling Wireframes (remapped)
- 'W' for alternate hotkey for 'L', Look
- 'Ctrl+Alt+G' for toggling Artificial Merc Light (remapped)
- 'G' for toggling formation movement (remapped)
- 'Ctrl+Alt+I' for toggling Glow Items (remapped)
- 'Ctrl+T' for forced turn mode (remapped)
- 'Ctrl+Alt+Shift+T' for test capture in cheat mode (remapped)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-26 11:14:50 +00:00
Wanne b54ffadd08 Merged from revision: 7425
Updated _RussianText.cpp (by Sevenfm, Valiant, Coppermine, Pooh, Jinaya)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-26 09:27:34 +00:00
Wanne ac5cfc9fba Merged from revision: 7418
- Renamed save game files for all languages to "SavedGames*.sav" and the folder to "SavedGames"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-25 22:11:55 +00:00
Wanne 5717e2b8b8 Merged from revision: 7411
Bugfix: Dud grenades (by cocsackie)
- Dud is not set up properly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7412 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-25 11:01:39 +00:00
Wanne 27c9a9ce6b Merged from revision: 7401
Fixes (by Buggler)
- Fixed enemies retreating to inaccessible sectors
- Fixed hardcoded interrogation sector values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-20 04:39:30 +00:00
Wanne a205b41ba5 Merged from revision: 7397
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-20 04:26:31 +00:00