7623 Commits
Author SHA1 Message Date
Wanne e383a4080c Updated RaknetLib.lib to version 3.4
Added all raknet headers for full raknet support
Added Testclass "TestCB.cpp" which is a test implementation for raknet plugin "File List Transfer". We will use this plugin for file transfer in multiplayer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-28 15:30:07 +00:00
lalien 6a740eb82b Temporary fix for game freeze when a path contains duplicate tiles
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-28 00:28:54 +00:00
SpaceViking 84299f157e Add "USE_AGGRESSIVE_ASSERTIONS" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-28 00:13:12 +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
ChrisL c947784561 Minor fix to allow the bullet graphic to render properly when the shopkeeper panel is open.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-24 23:08:25 +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 9fa220634d Bugfix: Press "ESC" while green progress bar on laptop loads -> Buttons are still visible although Laptop is closes (by InHuMan from Stracciatella Forum)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2630 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-22 18:27:52 +00:00
Wanne bf74b894af Bugfix: Max Merc limit in multiplayer was not evaluated when hiring merc
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-20 18:35:52 +00:00
Wanne 030cfe6876 New GameDir files for Multiplayer UI Patch by Zathras
There is no "official" Release EXE yet in SVN, but there is one for multiplayer testing. Take a look in the Multiplayer's Bears Pit Forum.

http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=210587&page=1#Post210587



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1100 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-19 15:38:22 +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 4c6df7cc2c Quickfix: New option "Force turn mode" is always disabled when playing a multiplayer game
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-14 16:32:44 +00:00
Wanne f588cf5fc0 Updated Chinese.Items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1098 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-13 15:01:44 +00:00
Wanne 2660ca5135 New ja2.exe release build (2620)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-12 23:05:30 +00:00
Wanne 7e4c52ac13 New Release build (2620):
Bugfixes:
- CTD when enemies retreat (by Heinz)
- Open IMP page in laptop and then close laptop using key ESC. You will see button for closing window on strategic map... if you press this button you will have CTD.
- Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Merc are now a little more "talkactive"
- Fixed error creating new soldiers in DoReinforcementAsPendingEnemy
- Fixed some bugs in Shopkeeper interface.
- Fixed CTD when pressing Alt-Y not in cheat mode
- Save/load screen shouldn't appear during quickload
- Fix movement cost problems in 100AP.  Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use.
- Added a condition which should stop the blue asterisk from appearing on an item unless that item is of item class IC_LBEGEAR.

New:
- AI Viewer: To use the AI Viewer build a Debug Version, go to the Strategy Screen and press F12
- Quest Debug System: Quest Debug System dialog is opened by switching to the Tactical screen and press F11.
- New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- "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.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1097 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 22:50:59 +00:00
ChrisL 5815b01f6a Added a condition which should stop the blue asterisk from appearing on an item unless that item is of item class IC_LBEGEAR.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-12 18:16:26 +00:00
Starwalker dbfd9ab591 added two new revolvers (pics by Coolberg)
added ammo crates for two calibers
corrected a few things

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1096 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:10:34 +00:00
Starwalker 439dbf9d68 replaced two revolver pics and added two new ones, all by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1095 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:08:06 +00:00
ChrisL 6be3de2149 Fix movement cost problems in 100AP. Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-09 23:14:43 +00:00
Wanne e3303e321c Fix was lot by merging
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-02 16:07:48 +00:00
Wanne 8afd965a5e Chinese Fixes (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-02 07:22:05 +00:00
Wanne 1dd1881ed6 Chinese: Updated files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-02 07:17:02 +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
inshy 74bd6ca4b3 Fix from Heinz:
1) Fixed error creating new soldiers in DoReinforcementAsPendingEnemy
2) Fixed some bugs in Shopkeeper interface.
3) Fixed CTD when pressing Alt-Y not in cheat mode
4) Save/load screen shouldn't appear during quickload

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-03-01 18:22:56 +00:00
inshy d048034100 Add information for Quest Debug System using DevTools (thanks Heinz)
Add russian description for AI Viewer and Quest Debug System

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1092 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-01 10:34:32 +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
inshy 3c82fa1348 Updated Chinese.Items.xml and Chinese.Pockets.xml (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1091 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-19 06:32:30 +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 a10b0bd6d3 Updated Chinese files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-13 08:35:35 +00:00
Starwalker d19cf3ac1c a few new ammo crates
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1090 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-12 10:40:33 +00:00
inshy 1fcc547e50 Special gift for all fans of Ja2. Original files for AI Viewer. Remained on my HDD from times, when I was testing the game in 1998.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1089 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-11 10:09:56 +00:00
Wanne 7829441397 Bugfix: No we have the working "AI Viewer". The needed files are already in SVN GameDir.
To use the AI Viewer build a Debug Version, go to the Strategy Screen and press F12 (thx to Heinz for support)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-10 19:10:37 +00:00
Wanne f6f1fb144b Added needed Graphic files to new folder Data\DevTools for the AI Viewer window. This only works in Debug Version of the ja2.exe, when you are in Strategy Screen and you press F12.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1088 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-10 19:09:25 +00:00
Wanne f0edab9b48 Bugfix: Bug #137: Open IMP page in laptop and then close laptop using key ESC. You will see
button for closing window on strategic map... if you press this button you will
have CTD.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-09 19:23:10 +00:00
Wanne ba25bbec67 Added missing INI Editor properties for the Many Merc update
Changed the new property "TONY_USES_BR_SETTINGS" from "FALSE" to "TRUE"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1087 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-09 18:31:59 +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 c4f57fa6a7 Added German TITLETEXT_MP_GERMAN.STI, so German Users with English JA2 can also start the game with a German JA2.exe (thx to Scheinworld)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1085 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-04 17:56:25 +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 29858ca0ca Updated Chinese Version GameDir files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-02-02 17:49:07 +00:00
Wanne 20a023e12c Added missing "ja2_options.ini" properties for last exe build (2567):
AUTO_SAVE_ON_ASSERTION_FAILURE
---------------------
GAME_PROGRESS_MINIMUM
GAME_PROGRESS_INCREMENT
IMP_STARTING_LEVEL
SMART_GOGGLE_SWITCH
AUTOMATICALLY_FLAG_MINES
--------------------
MAX_NUMBER_PLAYER_MERCS
MAX_NUMBER_PLAYER_VEHICLES
MAX_NUMBER_ENEMIES
MAX_NUMBER_CREATURES
MAX_NUMBER_REBELS
MAX_NUMBER_CIVS
---------------------
NEW_AGGRESSIVE_AI
---------------------
TONY_USES_BR_SETTING
DEVIN_USES_BR_SETTING

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1083 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-02 17:37:34 +00:00
Starwalker d599ec2351 replaced some launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1082 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-02 12:21:39 +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 4d9742d716 Chinese.Items.xml update
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1077 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-31 16:51:14 +00:00
Wanne 757d29fb37 Updated / Added new Chinese files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-31 16:50:41 +00:00
Starwalker 53baca7a8b updated inventories fo Devin and Tony
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1076 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-29 07:41:10 +00:00