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
990 Commits 9 Branches 6 Tags
14750c69037748c420d8a80c1a9a3d0ed45fd665
Commit Graph
990 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 14750c6903 ********************************************************** 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-28 18:38:52 +00:00
Wanne a98c44ac78 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3336 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2010-02-28 08:35:46 +00:00
Wanne 7024919b15 - Added missing HAM 3.6 texts to GermanText.cpp 
- Updated ChineseText.cpp (by zwoo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3329 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-24 10:16:22 +00:00
Wanne da4bef0a4a - Fixed return values in FindAnyAwakeTrainers() and FindAnyAwakeTrainees() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 22:31:13 +00:00
Wanne c45a64ee33 - Added missing language text strings for HAM 3.6 
- Search for "TODO.Translate" 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 16:47:14 +00:00
Wanne f010769397 ************************* 
* HAM 3.6 (by Headrock) *
*************************
- Info: Needed GameDir files for HAM 3.6 are not committed yet to the SVN GameDir. Will do that in the next few days
- For more infos on HAM 3.6 check out: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=244808&page=0&fpart=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-20 15:49:46 +00:00
Wanne 53821fcf49 Various Bugfixes by Headrock: 
- Fixed: NPC and PC movement errors
- Fixed: Boxers in San Mona do not leave the boxing ring after the fight
- Fixed: Darren does not pay the cash after you won the boxing fight 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-18 19:16:57 +00:00
Wanne c8bf95490a Cover Patch (by CptMoore) 
- Removed a line of code which fiddled with chance to hit calculation.
- Cover Display now works correctly with multiple enemies.
- Cover Display has no problems with stance anymore.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-02-02 12:41:02 +00:00
inshy 37a3047503 -translated new lines for russian language 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-12-26 16:17:09 +00:00
Wanne b3dd563694 - Bugfix: Enhanced IMP Creation: When choosing female, after leaving color choosing, the "email" button is removed. That's because the code tries to remove a button which do not exist (for big/small body) so it grabs the first one around (fixed by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-11-24 14:59:40 +00:00
Wanne ea1b814e8f - Bugfix: Fixed CTD when throwing item (grenade, rock, throwing knife, ...) in tactical when item description box is open 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-31 17:33:15 +00:00
Wanne 8f1f24499b - New Release EXE build: 3287 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-23 09:40:34 +00:00
Wanne 527fc97784 - Updated Cover system (by CptMorre) 
o made display cover system performance independant of map size. 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-23 07:52:39 +00:00
Wanne a94cfc2492 - Updated cover system (by CptMoore) 
o New settings:

* New settings *

gGameExternalOptions.ubStanceEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "STANCE_EFFECTIVENESS", 10, 0, 100);
How much the stance influences the view range reduction. Prone will give you 10% (default) view reduction / cover.

gGameExternalOptions.ubLBEEffectiveness = iniReader.ReadInteger("JA2 Tactical Settings", "LBE_EFFECTIVENESS", 50, 0, 100);
Dual welding the longest sniper rifles with full attachements, having a third backup sniper rifle, one combat pack and one backpack will give a 50% (default) sight penalty with the default settings.

* Removed settings *

gGameExternalOptions.fMovementSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "MOVEMENT_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fStanceSightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "STANCE_SIGHT_ADJUSTMENT", TRUE);
gGameExternalOptions.fLBESightAdjustment = iniReader.ReadBoolean("JA2 Tactical Settings", "LBE_SIGHT_ADJUSTMENT", TRUE); 



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-23 07:42:17 +00:00
Wanne 1e036ea548 - Updated Chinese text file (by zwoo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-21 18:52:52 +00:00
Wanne 9bbd342855 - Reverted test changes in Buildings.cpp 
- Updated Exe release build: 3274

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-21 18:13:37 +00:00
Wanne a98eda12a5 - Moved the new cover properties to section "JA2 Tactical Section" 
- Updated texts for new cover system
- Updated build number to 3274
- New exe release build: 3274

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-21 13:27:41 +00:00
Wanne defc028a14 - Updated Build number 
- Cover System Infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=235489&page=0&fpart=1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-19 21:12:20 +00:00
Wanne 5ae8695264 - Translated new cover texts for German version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-19 21:04:59 +00:00
Wanne 09268b81e8 Updated Version of the Cover System (by CptMoore) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3270 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-19 20:35:43 +00:00
bugmonster 09a3f95d6f - fixed a few typos in russian text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-08 12:48:04 +00:00
Wanne ba6cb14f9b - Bugfix: Fixed bug, where enemies do not climb on rooftops anymore, when ASTAR is disabled 
.) The bug was introduced in revision 1534 (TileEngine/Buildings.cpp)
.) Overhaul reworked the code for climbing on buildings and it seems the bug was introduced there
.) I created a new define "VANILLA_BUILDING_CLIMBING" (defined in Building.h). If defined the "old" building climbing code will be used. If not defined Overhauls code will be used (and so enemies do not climb on buildings). Overhauls code should be fixed and then used instead of the "old" vanilla building climbing code.
.) I also disabled ASTAR pathing, because it is a HUGH PERFORMANCE killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-10-05 15:28:59 +00:00
Wanne 3641bc6770 - Updated "JA2 windowed mode ..." for Dutch version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-04 07:56:37 +00:00
Wanne 45d3a04362 Externalized "Bobby Ray tooltips show possible attachments" from HAM 3 (BOBBY_RAY_TOOLTIPS_SHOW_POSSIBLE_ATTACHMENTS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-04 07:37:11 +00:00
Wanne a20ac7fb1c - Bobby Ray Tooltips (Fixes) (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-09-03 07:39:34 +00:00
bugmonster 1f3882f378 - added translation of message "windowed mode requires a color depth of 16bpp" to German 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-08-31 16:45:03 +00:00
bugmonster 5b11e6790e - removed loading of unused ja2_logo.STI 
- message "windowed mode requires a color depth of 16bpp" localized (need translation to Dutch & German)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-08-30 10:11:36 +00:00
inshy 30792631ce -Fixed some mistakes in Russian. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3159 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-08-27 10:02:56 +00:00
Wanne da7e88e759 - Automatic cancellation of running if the merc is in a running state and was not moved since last turn (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3138 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-26 07:29:46 +00:00
Wanne 33b5bbe863 - Bugfix: Character in running state will loose breath points each turn if no action is performed (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-25 11:28:28 +00:00
Wanne 5c9f9e71f9 - Fixed a few Visual Studio compiler warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3129 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 21:35:50 +00:00
Wanne 3a2db52065 - Bugfix: Refreshing bug in strategy merc list in resolution 640x480 and 800x600 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3125 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-22 19:02:55 +00:00
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 06a2af0fa6 Win 98 VFS Fixes (by BirdFlu) 
- add ini option to disable UNICODE in VFS (and use the current codepage)
- when UNICODE disabled in VFS, open files with default encoding (instead of UTF8/16) filenames


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3118 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-20 08:14:37 +00:00
Wanne 98507b972b - Merged 2 fixes from MP Branch 
o VFS: don't convert empty strings
o Updated _PolishText.cpp

- New EXE Release (Build: 3111)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-15 17:25:07 +00:00
Wanne 5a9f0b16b1 - Merged 2 fixes from MP Branch 
o VFS: don't convert empty strings
o Updated _PolishText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-14 08:37:08 +00:00
Wanne 826340978a - Bugfix: If user changes shipping destination location in "ShippingDestinations.xml", Bobby Ray was still under construction if the "original" shipping destination was not under players control. 
This occured because of hardcoded DRASSEN AIRPORT COORDINATES (BOBBYR_SHIPPING_DEST_SECTOR_X, BOBBYR_SHIPPING_DEST_SECTOR_Y, BOBBYR_SHIPPING_DEST_SECTOR_Z)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-11 12:01:26 +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 8f3f28aea8 - TEMPORARY Bugfix: Temporary fix in method "NumEnemiesInSector()" to avoid assertion errors if the "source" sector was along the map's edge (by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-07 08:44:02 +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 daee7613a8 - New MP Connect Screen STI image 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-07-02 17:15:02 +00:00
Wanne dfda109971 - Bugfix: IMP Creation -> String Array for holding the Attribute selection text was too short and so we got a buffer overrun in Debug version 
- IMP Creation: Moved second info text for skill page some pixels up, because in Russian version text is longer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-30 14:45:12 +00:00
inshy 53be2f3ef5 Translated to russian all lines for new IMP. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3054 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-30 11:17:05 +00:00
Wanne 8a129722ac New EXE Release (Build: 3042) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-28 18:10:56 +00:00
Wanne cb0ceabb82 *** Merged Code from Multiplayer Branch Revision 3040 *** 
Bugfixes: Bobby Ray Shipment
- Re-enabled stealing from delivery sector (STEALING_FROM_SHIPMENTS_DISABLED)
- Re-enabled & externalized chance that whole shipment is lost (CHANCE_OF_SHIPMENT_LOST)
- Re-enabled delivery from John Kulba

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-28 16:51:52 +00:00
Wanne efa9df5930 - Updated _ChineseText.cpp 
- Fixed compilation Error in Chinese Version in "Multi Language Graphic Utils.cpp" (because of missing ";")

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-27 07:16:18 +00:00
Wanne 0e078dd386 * Merged Source Code from MP branch Revision 3025 * 
- Shipment Bugfix: Stop time compression when shipment and email arrives
- Shipment Bugfix: Fixed duplication of items from shipment. This bug occured, when loading a savegame with at least 2 depending shipment orders



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-26 16:18:05 +00:00
Wanne 20c8fb646d - Bugfix: Reset the pressed keys (ALT, \) after the console opened 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-26 08:36:20 +00:00
Wanne 7fc0de5ccd - Bugfix: On "sell all" also unreachable items were sold (fix by Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-06-25 18:20:08 +00:00