Commit Graph
469 Commits
Author SHA1 Message Date
Wanne 80eebe69bd - Bugfix: Enemies should also drop LBE gear (by Roadkill)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3123 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-07-22 07:36:42 +00:00
Wanne e47495fe0d - Bugfix: EDB: Rendering of "Hide Muzzle Flash" icon
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-07-21 08:12:15 +00:00
Wanne 2cae5ff707 - Bugfix: Adding or removing "possible placement locations" for bloodcats, in any of the bloodcat maps, causes the program to create 0 bloodcats as a "defense mechanism" (by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-07-08 09:03:11 +00:00
Wanne 3b4b76cf56 - Bugfix: At the end of an underground battle, all stationary enemy garrisons in the SURFACE sector directly above disappear completely (by Headrock & Wil473)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3087 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-07-07 08:37:43 +00:00
Wanne 1d3313182d Spread Patterns MOD (by Zilpin)
- VS 2008 Update

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3010 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-15 18:20:01 +00:00
Wanne 5cd81280bc Spread Patterns MOD (by Zilpin)
* You also have to update GameDir folder *

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3009 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-15 18:00:07 +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 3850e27bc5 - Merged Source Code from MP branch Revision 2972
enable intro videos in VFS mode
workaround for original intro hack
allow to get real path of a file (only CVFSFile)
streamline Allocator usage in VFile
small non-VFS mode fixes in MPHostScreen.cpp
Synced "Cutting Fences" in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-06 16:13:00 +00:00
Wanne 47db604b50 *** Merged Code from Multiplayer Branch Revision 2960 ***
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-04 21:01:45 +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 afaba958c5 Added "Real Time Mode" (by borys762 and The_Bob)
- To look for code changes search for "The_Bob" comments
- There are 2 new entries in the ja2_options.ini in the [JA2 Tactical Settings] section: ALLOW_REAL_TIME_SNEAK, QUIET_REAL_TIME_SNEAK

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2921 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-06-02 10:25:42 +00:00
Wanne f7e798aa01 Update comment for UDT
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-27 12:44:18 +00:00
Wanne 6bf05babcb - Added Ultra Dynamic Tooltips by Telpscorei (to see the changes, search the code for //SCORE)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-27 12:43:45 +00:00
Wanne 8491b9b09b Code now handles localized version of ShippingDestinations.xml (German.ShippingDestinations.xml, Russian.ShippingDestinations.xml, ...) (by Arynn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-22 11:53:38 +00:00
SpaceViking bd74fac6cc Add checks around all use of bMercOpinion
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-13 22:32:44 +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
SpaceViking 46279f61b9 Change test for doors to use team ID
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-11 12:39:34 +00:00
Wanne b0eb1baf7e Bugfix: Enable all terrorists in game, if all terrorists should be available (defined in the ja2_options.ini) (fix by Sandro)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-08 13:37:22 +00:00
Wanne a0b75319ad Bugfix: Problems with refreshing fast help text in mapscreen (by jones bearpit)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 20:07:22 +00:00
Wanne c54e61ce75 Bugfix: Morale and ice-cream truck (by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 19:10:04 +00:00
Wanne 51d3771927 - Bugfix: NIV fix with displaying town names (by jonas bearpit)
- Removed the RakNet warnings when building a Release version (I added the missing PDB file)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2795 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-02 15:19:30 +00:00
Wanne 5840adc4ec Bugfix: negative APs didn't actually have any effect on the next turn because they were being reset to 0 before they could have any effect (by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-24 16:00:41 +00:00
Wanne 598709f33d - Added Dealtar's and Zilpin's Airport Externalization
- Needed GameDir files are already committet to SVN GameDir

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-21 20:27:56 +00:00
ChrisL b69207b743 Disabled some of the charges associated with the Increased Aiming Costs option.
Corrected a AP display issue when you had to turn while a weapon was not in a ready position.
Updated build version.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 21:43:14 +00:00
ChrisL a2740bfbdb Bugfix: APs to shoot when weapon not ready and we have to change facing was displaying wrong.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-11 00:24:35 +00:00
ChrisL 36eb308270 Made an APBPConstant a little clearer. Before it was labeled as part of the suppression system when in reality it's not.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 20:43:52 +00:00
ChrisL 23a8f63bd8 Corretion to the 100AP/HAM integration. Also made an APBPConstant a littler clearer (hopefully).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 19:25:24 +00:00
ChrisL 72174db37c Updates to the HAM/100AP integration.
Added Min/Max Suppression Tolerance values (from Headrock).
Bugfix: Took away the ability to reload a weapon from the item description box while using an ammo crate.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 15:28:41 +00:00
Wanne d593be35c4 - Removed a CPU intensive AI calculation function which was used by HAM (thx to Headrock)
- Fixed some compilation warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-01 20:02:28 +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
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
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 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 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
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
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
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
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
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 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 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
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
ChrisL ddd90f5317 Bugfix: Corrected the shopkeeper interface so that the clock and town strings are displayed in the correct location.
Bugfix: Added a condition so that the clock doesn't try to display on the SM Panel while in NIV mode.  It was displaying, just hidden under the radar screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-08 16:41:34 +00:00
ChrisL 7e7c27b61d Bugfix: Removed the ability to manually jump fences while wearing a backpack.
Bugfix: Force shopkeepers to drop LBENODE items to the ground instead of trying to return them to the soldier during a sale.  This keeps items in the LBENODE from being lost.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-01-06 17:14:43 +00:00
SpaceViking 5c9ff9cbc4 Use local buffer for storing modified string instead of original copy
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-12-15 23:32:24 +00:00