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
2,323 Commits 9 Branches 6 Tags
46b72db71487f5b503d8245fe12d09c1935b0d1c
Commit Graph
2323 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 46b72db714 Fix: bad commit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-17 18:58:27 +00:00
Flugente ce3369f72e Slightly improved loading times. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-17 18:55:00 +00:00
silversurfer 5cfda83df4 Bugfix for compiler errors in VS2008 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-13 15:54:54 +00:00
Wanne 9b8169cd58 Merged from revision: 7391 
- Show helicopter icon in team view mode and restored helicopter passengers indicator (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-12 17:03:45 +00:00
Flugente 36e9d15edc New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects. 
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

Requires GameDir >= r2099.

Does not break savegame compatibility.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-10 13:45:11 +00:00
Wanne 09244c2369 Merged from revision: 7382 
- Fixed eliminated patrol groups not being replenished (by anv)
- Fixed en route patrol reinforcements not obeying grace period settings (by Buggler) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7383 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-09 11:07:21 +00:00
Wanne b4af6cec69 Merged from revision: 7380 
Fixes (by Buggler)
- Fixed lost items when autoplace stacks from sector inventory to vehicle inventory
- Changed autoplace items priority to stacking first; previous order: specialized pockets > stacking > other pockets
- Improved autoplace stacks logic from sector inventory
- Fixed OIV vehicle inventory figure sti not loaded

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-09 11:06:08 +00:00
Wanne 1e0738d644 Merged from revision: 7378 
- Translated _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-06 19:36:49 +00:00
Wanne 8dabe65ba6 Merged from revision: 7372 
- Added custom game resolution (by Buggler)
- Minor additions to editor popup text (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-05 17:03:16 +00:00
Wanne 29e09f869e Merged from revision: 7368 
MapEditor: Bugfix: Changed tempstring from 30 characters to 40 characters which fixes crash in French version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-30 17:19:47 +00:00
Flugente fdb56dda59 Fix: mercs pause too long after talking 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-28 21:02:45 +00:00
Wanne 4fea831e82 Merged from revision: 7365 
- Translated texts for Chinese version (by Jason Lejardo)
- Translated texts for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-27 10:40:38 +00:00
Wanne 05fdcb5d2e Merged from revision: 7363 
- Map Editor now properly handles all available items without empty placeholders in between (by anv)
- Added item compare popup help text (by Buggler)
- Enemy icons will not be shown as 10x icons in 640x480 due to visibility issues (the rest remains as it is) (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-26 13:07:32 +00:00
Wanne caa8f58c0e Merged from revision: 7361 
- Translated text for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-23 17:58:27 +00:00
Wanne a79be62f21 Merged from revision: 7359 
Fixes (by Buggler)
- new error message when launching game in fullscreen beyond desktop resolution
- fixed cycling previous item hotkey in cheat mode
- refactored main menu button and hotkey code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-22 16:40:02 +00:00
silversurfer 9f5aa4c227 Bugfix for crash in main menu when the player pressed 'n' for new game. 
New option in CTHConstants.ini:
IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = FALSE/TRUE
When activated it will make iron sights more powerful over longer distances. This is an experimental switch. The formula might need to be tweaked.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-22 09:55:56 +00:00
Wanne d7d1cce626 Merged from revision: 7350 
Fixes (by Buggler)
- Fixed mouse region for item stack popup in strategic screen for non-standard resolutions
- Disabled Ctrl+Click for dropping item to sector inventory in combat
- Disabled Sector Inventory Stack Popup in combat
- Removed unused Ja2Options.ini: MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY and STAMINA_HIT (by Buggler & Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-21 18:07:47 +00:00
Wanne f086611d21 Merged from revision: 7344 
Fixes (by Buggler)
- Centered strategic screen in non-standard resolutions
- Fixed message log disappearing when clicking map border buttons
- Minor fix for increased MAX_BUILDINGS limit 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-19 13:48:27 +00:00
Wanne 615c561dc1 Merged from revision: 7342 
Fixes (by Buggler)
- Fixed roof issues for explored rooms in big maps not properly saved
- Increased MAX_CLIMBSPOTS_PER_BUILDING and MAX_BUILDINGS to 255

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-17 21:04:02 +00:00
Flugente 05cb329230 - Fix: Tanks take damage even when crushing down simple wooden fence. (by anv) 
- dynamic opinion events no longer happen for non-player or vehicular characters
- renamed a flag

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-15 21:00:59 +00:00
Wanne 64bd7f3f07 Merged from revision: 7338 
- Translated _ChineseText.cpp (by Jason Lejardo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-15 20:03:02 +00:00
Flugente 24a78e5dc3 If <BloodiedItem> is set on a blade, the blade weapon wil be replaced with th specified item when a person is hit with it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-14 20:55:26 +00:00
Wanne 696e9ccdff Merged from revision: 7335 
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-14 19:38:20 +00:00
Wanne 3628b26e69 Merged from revision: 7331 
- Fixed wrong translated French text (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-12 19:33:39 +00:00
Wanne 0a16af6fe2 Merged from revision: 7329 
- Fixed Movement box and Militia Popup box x-coordinates in non-standard resolutions (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-12 10:10:13 +00:00
silversurfer 3aa6e6e200 New modifier for NCTH to alter the behaviour of the scope penalty: 
- AIM_TOO_CLOSE_THRESHOLD = 0.8

This defines the point within scope range where the penalty starts.

http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334158/Re:_(Potential)_NCTH_Code_Chan#Post334158


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7328 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-11 15:22:37 +00:00
Flugente 0efc3b7241 - When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer. 
- Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- various prisoner fixes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-10 21:19:26 +00:00
Wanne 7fb31cc9c8 Merged from revision: 7325 
- Fixed too long text in French Map Editor texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-10 19:28:04 +00:00
Flugente 3389f3fb24 Fix: overflow in EliminateAllEnemies(...) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-08 23:12:26 +00:00
Wanne 8ddeff6988 Merged from revision: 7318 
- Added support for multilanguage INTERFACE/ITEMINFOADVANCEDICONS.sti (e.g: GERMAN\ITEMINFOADVANCEDICONS_GERMAN.sti, FRENCH\ITEMINFOADVANCEDICONS_FRENCH.sti, ...)
- Fixed compilation errors in GERMAN version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-08 20:32:42 +00:00
Flugente 2b63a5b568 Fix: mercs got opinion events on themselves. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-08 19:00:24 +00:00
Flugente 2f1dcdaa47 Added icons for enemy tanks in strategic map. 
Requires GameDir >= r2062.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-07 21:59:47 +00:00
Wanne 1736d546d6 Merged from revision: 7312 
- Fixed compilation error in French MapEditor build

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-07 20:23:52 +00:00
Wanne dfb67dac75 - Translated missing texts for French version (by hrvg) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-07 19:30:22 +00:00
Wanne 09fea2685d Fixed compilation error in VS 2010 (by cocsackie) 
- The new dynamic opinion cpp files were added to the VS project as "include" instead of type "compile"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7302 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-30 20:15:09 +00:00
Wanne 1eaea26f79 - Fixed compilation error for Polish EXE 
- Fixed missing entries in VS2010 filters, but the EXE does not compile in VS 2010 (VS 2005 and VS 2008 works fine)
o I get 28 errors regarding methods of the Dynamic Opinions (
-> Unresolved external symbols: RefreshBoxes(), InitMyBoxes(), SaveDynamicDialogue(), ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-30 19:02:05 +00:00
Flugente b1148f9040 set language back to english 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-30 17:28:26 +00:00
Wanne b856eece9d - Added new texts for feature "dynamic dialogue" to the language specific cpp files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-29 17:07:03 +00:00
Flugente a83f38a36e Dynamic Dialogue update: pressing 'ESC' in tactical also fast forwards the dialogue boxes. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-28 10:15:02 +00:00
Flugente 3a9cb5ecc3 New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-27 22:12:29 +00:00
Wanne b083314318 Merged from revision: 7295 
- fix: bug with static structures display shifted when viewing top left corner of map in certain resolutions (1440x900, 1600x900, possibly others) (by anv & Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-27 06:43:57 +00:00
Wanne 75ddf38ece Vehicle Bugfixes (by anv) 
- fix: problem with ctrl not swapping passengers on seats further than 6
- fix: vehicle ramming people not working properly when driving in non-diagonal directions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-27 06:41:55 +00:00
Wanne d6a3e34d1f Merged from revision: 7292 
- Fixes in _Ja25ChineseText.cpp (by Lejardo)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-25 17:57:53 +00:00
Wanne 4f0ee82ccb Merged from revision: 7290 
- Fixed inaccessible or lost items for moving items from mercs to sector inventory when a different tactical map is loaded (by Buggler & anv)
- Revert fix on queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-25 17:53:15 +00:00
Wanne ff34f538d9 Merged from revision: 7287 
Fixes (by Buggler)
- Disabled calling reinforcements from patrol groups when queen wakes up as they will not be replenished (thanks anv)
- Fixed queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting
- Alternative hotkey ~ (tilde) to toggle merc inventory in strategic screen like in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-23 17:46:10 +00:00
silversurfer 9419e1b8b9 Bugfix: In tactical right-clicking on a merc portrait with the squad list open instead of minimap crashed the game. Inventory view only allows display of minimap therefore the view will now be reset to minimap whenever a merc portrait is right-clicked. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-21 17:15:55 +00:00
Wanne dbc852ea74 Vehicle Update: Roadkill with vehicles and ramming (by anv) 
- new feature: ramming people - set with Tactical Gameplay Settings > ALLOW_CARS_DRIVING_OVER_PEOPLE and Tactical Gameplay Settings > ALLOW_TANKS_DRIVING_OVER_PEOPLE - when shift is pressed planned vehicle route will go through people. Those who will stay on its path will be hit, causing wounds and knock-outs.
- new feature: ramming structures - when shift is pressed planned vehicle route will go through obstacles. When vehicle hits the structure on its path it will be destroyed, causing small damage to vehicle too (with exception of tank). Tactical Gameplay Settings > CARS_RAMMING_MAX_STRUCTURE_ARMOUR and Tactical Gameplay Settings > TANKS_RAMMING_MAX_STRUCTURE_ARMOUR settings control how well armoured structure can be driven through and amount of potential damage for vehicle.
- see: http://www.ja-galaxy-forum.com/ubbthreads.php/topics/333829/Drivable_Vehicles#Post333829


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-21 10:07:11 +00:00
Wanne fc78fb6031 Merged from revision: 7282 
- Bugfix: AP_JUMPWALL and AP_JUMPOFFWALL were swapped when read from ini. (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-21 10:02:22 +00:00
silversurfer a56dc9107b Bugfix: Replacing one attachment with another will now cost AP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-20 18:42:54 +00:00
Wanne 68717329fc Fixes (by Buggler) 
- Added notification in message log when mercs cannot climb with backpack
- Reorganized hotkeys code in alphabetical order for easy reference
- Moved item transformation hotkey from 'Y' to 'Shift + T' due to hotkey being used to call up chatbox in networked game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-20 12:33:03 +00:00