Commit Graph
190 Commits
Author SHA1 Message Date
inshy 434a45c4d3 Translated new text for Russian version.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 12:35:50 +00:00
Wanne bd6448278c - Forgot to add the "," character after a text line
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 11:57:02 +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
ChrisL dffb0fc7fe Found a bug in the russian text file that was preventing the creation of russian builds.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2738 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 22:31:39 +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
inshy 9a65840def Translated new text for Multiplayer and HAM.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 13:58:17 +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
Wanne a465bebf14 Fixed a bug when creating the application, it was only possible to start ONE instance of the game. Now it is possible to start as many instances of the game you would like.
So this is very helpful for debugging and running 4 clients on one single PC (each client needs its own JA2 installation folder).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-26 05:09:52 +00:00
lalien 0c6801fb61 Fixed szSoundEffects definition
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-24 20:41:54 +00:00
Wanne 8fe93de1f5 Translated new MP UI messages for German version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-22 19:36:20 +00:00
Wanne 8fa1c2a4e6 Merged Multiplayer UI patch from Zathras:
New Features
- Added hits, misses, accuracy to scoreboard
- Added in-game chat with history
- Added more options from the ini to the host screen, Use NIV and Enable
civillians
bugfixes
- Clients connecting at the same time controlling the wrong client
- Team Deathmatch working again
- Refreshing the player list after a player changes team / edge
- AI is always on for Co-op now
- There is now always a scoreboard in Co-op even when you lose.
- scores on the Co-op scoreboard have been fixed for all deaths including
bleeding
- Start Game button now only appears for server
- Fixed cleaning up game resources on disconnection
- Disabled the 1,2,3,4 keys for connecting / disconnecting
- Fixed victory conditions for all game modes
- Fixed players names getting copied into TeamTurnString each game resulting
in multiple names
- Fixed Assertion bug caused by the game sometimes calling
SetCurrentWorldSector more than once before placement of mercs
- Fixed a bug that was possible when merging items such as M14 and EBR stock
on mapscreen.
- Fixed bug with game starting while a player was in chat, closes chat
window when game is starting
- Fixed bug with game starting while a player was in the options screen, if
the player leaves the mapscreen while ready, they are set to unready
- Team and Spawn direction popups changed to use buttons to open/close them
- Disabled players joining after the laptop has been unlocked, as they would
be out of state with any hires


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-19 15:31:55 +00:00
inshy d28c42b353 fixed polish text...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2627 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-18 19:03:10 +00:00
inshy fa5d04f898 Translated new strings for Forced Turn Mode (French)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2626 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-18 18:47:48 +00:00
inshy 9fe8221e31 Translated new strings for Forced Turn Mode (Russian and Polish)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-18 12:29:08 +00:00
Wanne 9fe479ab0a Update _ChineseText.cpp (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2613 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-02 07:06:25 +00:00
Wanne c4e483539f Updates / Fixes by Arynn
- Fixed: Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Fixed: Merc are now a little more "talkactive"
- Update: New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- New: New "Forced turn base mode" option in the option screen and also available via keyboard shortcut (CTRL+ALT+SHIFT+T) in tactical.
This forces the game to go in turn based mode when there are enemies in the sector.

INFO: There is a new STI Graphic (OPTIONSCREENADDONS2.sti) which is needed for the updated option screen.
You can download the file from http://ja2.h758491.serverkompetenz.net/Wanne/NewOptionScreen/OPTIONSCREENADDONS2.sti
Put this file in your Data\Interface folder. If I build a new release I will upload the file to SVN GameDir and then remove it from my private download folder.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-28 09:16:25 +00:00
Wanne a64a66bdf3 Update _ChineseText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2591 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-13 08:37:30 +00:00
Wanne d626d8c835 Updated _ChineseText.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-05 10:35:36 +00:00
Wanne d86193fe97 Externalized Chinese specific (unicode) texts to _ChineseText.cpp and saved the Unicode files back to ASCII (thx to Kriplo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-03 19:19:33 +00:00
Wanne f7de64d294 - Bugfix: CTD when enemies retreat (by Heinz)
- Updated Chinese Text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2572 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-02 17:55:46 +00:00
Wanne c23dc27c7b - translated "goggle text" in German Version to German
- New EXE build (2567)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-02 07:24:41 +00:00
Wanne 8b0305e221 Chinese specific update (by zww from tbs)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-31 18:20:16 +00:00
Wanne a6adf843b8 1) some fix in russiantext.cpp (by inshy)
2) fixed mistakes in UFS web page (was missing ","), add missing line (by inshy)
3) added russian layout for IMP Begin screen, now russian users can type name of they heroes using russian letters. Fixed position for male\female text in russian version (by Heinz)
4) fixed wrong position for items in inventory (by Heinz)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-21 15:21:36 +00:00
Wanne 2364f70c5d Chinese Fixes: Changed code to use "Chinese.Items.xml", some smaller fixes for chinese version (by Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-20 14:47:34 +00:00
SpaceViking 2858c74013 Updated "check goggles" message for French, Polish, and Russian.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-17 02:40:14 +00:00
SpaceViking f26095d86f Space Viking's many mercs changes plus numerous generic bug fixes
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-15 01:26:13 +00:00
Wanne 6a205f870a Stracciatella (Tron) Rev.2609: Fix a gross vanilla mistranslation in the German translation for the term "shooting range".
Stracciatella (Tron) Rev.2840: Fix a vanilla mistranslation in the German translation for the term "hired".
Stracciatella (Tron) Rev.4935: Correct vanilla mistranslations and improve German translation, mostly regarding texts for Bobby Ray.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-09 19:33:40 +00:00
Wanne de508be6a2 -fixed overlaping text in UFS web in laptop (for polish version)
-minor changes for french version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-05 13:27:50 +00:00
Wanne bc7014a079 Bugfix: Lua shutdown (possible NULL reference)
Russian, French and Polish texts update
Fonts update (for future Italian version)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-29 14:08:35 +00:00
Wanne e95d4b8bca VS 2008 project files update
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-12 20:21:32 +00:00
Wanne 599f658232 Updated VS 2008 Project Files (thx to BirdFlu)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-10 20:57:37 +00:00
Wanne b8c1ceffee New Release Build (2445)
BE SURE TO UPDATE FROM SVN GAME DIR (REV. 1060) TO GET THE UDPATED GAME DATA FILES (FONTS) FOR THIS SOURCE MODIFICATION, BECAUSE OF FRENCH VERSION ADJUSTMENTS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-05 22:44:55 +00:00
Wanne 9d08dd56a1 Updated VS 2008 Project Optimizations to VS 2005 Project Optimizations (Result: Build smaller Executables)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-24 19:26:52 +00:00
Wanne 45301a79da Updated VS 2008 solution file. It now opens in Visual Studio 2008 by double clicking.
Updated chinese texts.
INFO: To display chinese fonts correct, you have to install eastern languages in windows.
Control Panel -> Regional Language Settings -> Language Tab -> Install Eastern languages (checkbox)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-22 10:55:30 +00:00
Wanne 647afe10c8 Added VS 2008 solution and project files
To compile with VS 2008 you have to disable the fist line in "Standard Gaming Platform\input.cpp". Just look for comment "// VS2008"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-21 22:15:22 +00:00
Wanne 032fd1f353 - Added Chinese language support (thx to Noword from TBS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2424 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-20 07:43:57 +00:00
Wanne 8f2201afe4 - on-the-fly convertation of all codepages to unicode (by lalien and bugmonster). I think this is needed for a Polish release in the future.
BE SURE TO UPDATE FROM SVN GAME DIR (REV. 1050) TO GET THE NEEDED GAME DATA FILES FOR THIS SOURCE MODIFICATION 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2417 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-14 11:50:38 +00:00
Wanne 59f652c6a2 - Replaced all "Jagged Alliance 2" strings to "Jagged Alliance 2 v1.13"
- Added missing tooltip text for Enhanced Desription Box in the settings
- New Release build 2415

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2415 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-13 14:06:46 +00:00
ChrisL 905ce20125 Enhanced Description Box, v1.3. By Headrock
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-13 01:11:59 +00:00
ChrisL 3cd3ef39cb 100AP project integration
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-06 00:46:54 +00:00
Wanne d63ae7501b Bugfix: JA2 now shuts down without an error, if the desktop colors are not set to 16 bit color after the message box appears
Changed some text strings from "Jagged Alliance 2 v1.13" to "Jagged Alliance 2", so the game consistently used "Jagged Alliance 2".

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-11-04 19:44:03 +00:00
ChrisL 26201b3816 Updated build number
--Editor fixes from Kriplo
Implementation for mouse wheel support
Implementation for mouse middle button support
Fix for adding on roof tiles
Fix assertion when leave editor mode
On saving map check of entry points are add
Fix for to many ToolTip messages in place walls
Fix assertion on loading map without entry points
Fix assertion in Sector Summary if DevInfo directory not exist
Fix for problem of losing map edgepoints
Fix problem with losing stuff from LBE
Fix crash in meanwhile
--Fixes from Headrock
Fixed a typo in the Health experience calcuation for strategic movement
Added "Draw" cost to weapons help data


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-13 21:05:28 +00:00
ChrisL fa21f87a59 Tron and Kriplo's fix for the "off-by-one" bug.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-10-10 22:47:07 +00:00
Wanne 52a28a8268 Updated _DutchText.cpp (from Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-09-22 17:18:40 +00:00