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
835 Commits 9 Branches 6 Tags
fa5d04f8987a67dbfc24264ee2e5fbb0d2ad62a2
Commit Graph
208 Commits
Author SHA1 Message Date
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 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 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 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 c486577d89 Bug fix for invalid coordinates problems (outside valid range of 1-16) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-17 02:40:59 +00:00
Wanne bc16d41a6b SpaceViking forgot to add a new CPP file to the Strategic Project. The game compiles now. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-15 22:56:34 +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 f64f58fbf8 Bugfix: I've simply added a condition to a pair of assertions so that they won't run when a soldier is assigned to a vehicle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-12 16:51:34 +00:00
ChrisL e646ffda20 Resolved an assertion error that occurs when retreating from a sector while inside a vehicle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-08 16:53:45 +00:00
ChrisL 8505cd45cd Fixed a crash/freeze that could occur when trying to Sell All or Delete All items while the item description box was open. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-01-06 16:33:16 +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 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 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
ChrisL 944dacd8a4 Fixed a 100AP conversion issue for morale and suppression fire. 
Fixed a CTD caused by trying to "pickup" an item from sector inventory while simultaneously looking at that items description box.
Upgraded an INT8 to INT16 in training functions to try and catch a problem with INI values being set too high.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-15 00:12:34 +00:00
Wanne ac6de87d47 Multiplayer: Override panel key is now bound only to key "7" instead of 5, 6 and 7 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2418 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-11-14 15:23:34 +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 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
ChrisL 8c437af085 Resolved a Strategic AI.cpp assertion error resulting from army composition values totaling more then 100%. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-30 16:03:40 +00:00
ChrisL 33a9f17760 Bugfix to resolve an assertion error relating to the helicopter. 
Change to BobbyRays information as proposed by Headrock.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-10-17 15:56:58 +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 6f2af55cba Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team. 
Fixed a bug where hired RPCs would not get items stored in their gunsling or knife pockets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-23 23:14:49 +00:00
ChrisL f7ffba090e Fixed an assertion error that occurs if you try and save a game immediately after an autobattle has completed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 18:25:17 +00:00
ChrisL 3e8d006329 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 16:27:07 +00:00
ChrisL e6f9406ffe Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE. 
Removed the "Major Version Update" system from the map editor.  Now, maps will be updated only when they are actually loaded.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-11 14:57:12 +00:00
ChrisL 0a1b40237d Updated code to support language specific cities.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-29 16:12:08 +00:00
Wanne e3dd3f5487 First step in making the Cities.xml useable with other languages (Russian.Cities.xml, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-18 12:49:34 +00:00
ChrisL 7e37a07476 Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-12 17:09:29 +00:00
ChrisL 382fff0437 Possible fix for the intermittent sector inventory right-click issue. 
Fixed the display AP cost for shooting (when you also have to change facing and/or ready a weapon) so that it correctly matches the APs that are really charged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-08 23:26:20 +00:00
ChrisL a2c73aab6d Fixed the MapEditor configuration so that it will compile a "release" version of the editor instead of the "debug" version that had been created. People should use this updated configuration to generate the Map Editor instead of messing with the defines in the builddefines.h file. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-25 15:33:58 +00:00
Wanne 5b1405b717 - bugfix Bug-ID: 101: No bloodcats in tactical by bloodcats ambush 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2219 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 21:20:11 +00:00
Wanne 2015c0f362 - bugfix: Exclusive multiplayer condition was missing in AddPossiblePendingMilitiaToBattle() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-04 05:50:50 +00:00
lalien 23b8b0c624 Fixes for VS2003 
- added files
- changed Credits.cpp to non Unicode version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-31 11:56:39 +00:00
haydent 5957abba5b disabled mp reading of ja2_options.ini to take default values only. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2200 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-26 10:56:45 +00:00
haydent b701a71e23 modified mp bobby rays to show inv. also disabled reinforcements in MP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2199 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-25 13:51:05 +00:00
Wanne f17cc948a4 - fixed map editor incompatibility with the merged multiplayer code 
- fixed crashes when loading modified maps in tactical
- added missing "is_networked" condition to the method AddPossiblePendingEnemiesToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-17 21:51:32 +00:00
Wanne d576fc6b99 - made a few project changes, so that the map editor exe can be compiled 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-16 18:12:15 +00:00
haydent 66d55cf08a * fixed bullet artifacts and removal ! 
* hopefull disable of grenades
* added a LOS check from your mercs to a door to see if it should be animated or not.

* looked into the "ENEMY_ENABLED" issue, it is not double defined, the one in network.h is part of a struct and not connected. made some changes to do tests for ==0 or ==1 rather than boolean. but i believe there must be some misunderstanding possibly. ENEMY_ENABLED only enables or disables the enemy AI, And only when coop is enabled... when its not there is no ai whatsoever, but you can still get into deathmatch battle under the various ini settings.

enjoy, the bullets are finishing themselves off much better now ! :)


 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-16 08:36:19 +00:00
lalien 3e22dce318 Merged Multi Player Project into main branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 08:20:47 +00:00
Wanne 9445ded9e2 Fixed bug #94: Merc with no ammo in autocombat = CTD 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-04 18:53:49 +00:00
ChrisL 5a57354297 Fixed item "beaming" bugs that allowed items to be grabbed from a sector your merc wasn't currently in. 
Fixed the map editor so that "Nada" items don't appear in the item lists.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-29 17:33:49 +00:00
ChrisL b4b31cdb06 Fixed a CTD that occurs when closing sector inventory while the item description window is open. 
Added a new ALLOW_SECTOR_DESCRIPTION_WINDOW flag to the ja2_options.ini that allows players to turn off the stack popup and item description functionality for the sector inventory panel.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-21 21:04:35 +00:00
ChrisL ece7ec25bb Resolved an inadvertent memory leak I put into the code while fixing a previous CTD. 
Cleaned up the cursor graphics so that the cursor is properly updated when reloading stacks of weapons from the stack popup screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-21 06:39:01 +00:00
ChrisL 896891431d Fixed a CTD that occured when reloading a weapon from the sector inventory panel. 
Fixed the sector inventory panel so that you could reload weapons that could be stacked.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-18 22:41:09 +00:00
ChrisL 2d5c6e2996 Fixed a bug in the "sell all" strategic inventory screen options. Money now gets sold without modification and unreachable items can't accidentally be sold. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-17 16:47:50 +00:00
Wanne 104f964760 fixed an exploit where no enemies are present in starting sector: Go to tactical before you hire any merc. Then hire a merc and compress time until merc arrives. Then you arrive in Omerta and no enemies are present. Also the chopper animation was not played. 
I simply disabled the "Go to tactical button" if the user has not hired any merc. This eliminates all the "bad" side effects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-03 17:49:56 +00:00
ChrisL bbc4447ab6 Fixed a bug that would cause a freeze while in OldInv mode at the very start of the game if you didn't open the tactical inventory panel before trying to open the strategic inventory panel. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-02 21:34:11 +00:00