7604 Commits
Author SHA1 Message Date
Wanne 64efff67fa Merged from revision: 6846 and 6847
- Fixed missing text entry in _FrenchText.cpp
- Bugfix: Fixed initialization not working for foreign language *.EnemyTaunts.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6848 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 20:32:04 +00:00
Wanne 72c4a77598 Merged from revision: 6844
- Fixed French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6845 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 09:35:38 +00:00
Wanne 67f1f2771a Merged from revision: 6840
Added the new 4 molle items (just in English)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6841 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-28 08:24:48 +00:00
Wanne 33571338f0 Merged from revision: 1926
4 new MOLLE items (by Off_Topic)
- 1 MOLLE Backpack/Combat Combo, 
- 1 Stand alone MOLLE Combat pack and 1 stand alone MOLLE Backpack
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329539/Creating_a_MOLLE_backpack_set_.html#Post329539

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1927 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-28 08:13:03 +00:00
Flugente df4cdfdab2 Added transformations from map-editor tripwire to standard tripwire (#1524).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1924 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-27 21:37:54 +00:00
Flugente 461cfc405e Merged revision(s) 6836 from branches/ja2_source_official_2014:
Fix: incorrect gridno calculation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-26 22:07:28 +00:00
Flugente 0c4f5c5df5 Merged revision(s) 6833 from branches/ja2_source_official_2014:
Fix: on certain conditions, gpCurrentTalkingFace gets garbage values assigned. If BOOLEAN fTalking then does get a value > 0, the incorrect face does not get cleaned.

This worked until now, but we cannot rely on garbage values alone.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-26 18:15:09 +00:00
Flugente d6186aca15 Merged revision(s) 6826-6828 from branches/ja2_source_official_2014:
- Minor code improvements and cleanup
- Fix from r6775 is no longer necessary.
- Code improvement: Instead of calling inv.size() repeatedly, just call it once and remember that value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-26 12:18:43 +00:00
Wanne d4aa35a66e Merged from revision: 6824
Map Editor Fixes/Improvements (by Buggler)
- Better UI feedback after last item deleted from item stack in editor item mode
- Improved editor room number increment code. 'Shift + LMB' when drawing room numbers will reuse same room number on next input
- externalized hardcoded button tooltip text in editor tile selection window 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-26 08:15:40 +00:00
Flugente 405b073416 Merged revision(s) 6822 from branches/ja2_source_official_2014:
- Fix: autoresolve battle reports sector wrong
- Fix: reports over #255 are not accessible

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-25 17:11:25 +00:00
Flugente 518ae3d56b Merged from revision: 6820
Fix: unable to load savegame if more than 255 incidents occured

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-25 16:20:03 +00:00
Wanne 515d17e408 Merged from revision: 6818
Updated French Files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-25 15:37:28 +00:00
Flugente 491050e8c8 Merged from revision: 6814
- Fix: HOURS_BETWEEN_STRATEGIC_DECAY was not read from ini (by anv)
- Fix: squads exceeding 20 cannot be accessed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6815 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-22 21:37:13 +00:00
Wanne e3bc68948e Merged from revision: 6812
Reworked Sectory actions menu (CTRL + .) (by Sevenfm)
- Also added support for 16 medium size buttons dialog.
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/329932.html#Post329932

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6813 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-22 13:28:48 +00:00
Wanne 581c1cc3c5 Merged from revision: 1922
- Updated Ja2_Options.INI and INIEditorJA2Options.xml comments (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1923 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-22 08:05:51 +00:00
Wanne 8f07164e78 Updated French Files (by hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6811 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-21 17:14:33 +00:00
Wanne 8cca415daa Merged from revision: 6804
- Updated French text files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6807 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 19:41:19 +00:00
Wanne c47f8cb8fc Merged from revision: 6804
- Updated / added French files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 19:40:05 +00:00
silversurfer 603550b5ae Fix for ammo icon in description box which showed another shifted description box when ammo type was invalid.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328324/Re:_BUGZILLA_report_all_bugs_h.html#Post328324

Ammo type of such weapons will now be reset to 0 (standard ball ammo).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6798 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 17:38:35 +00:00
silversurfer 762f1074f3 Fixed bug with merc swap feature which was introduced with Waldo the mechanic. Faces were swapped incorrectly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6797 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 12:00:26 +00:00
Wanne 850a53b75f Merged from revision: 6795
- UB crashing after helicopter crash in new game (junk variables removed) (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 09:02:21 +00:00
Wanne b63b43f648 Merged from revision: 1920
Fixes (by Buggler)
- removed IMPROVED_BOMB_PLANTING option, enabled by default
- removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1921 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-20 08:50:35 +00:00
Wanne d643847f42 Merged from revision: 6792
Fixes (by Buggler)
- draw NCTH cursor indicator after health bar indicator due to potential overlap (thanks to Sevenfm)
- removed IMPROVED_BOMB_PLANTING option, enabled by default
- removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim
- streamlined burst & auto mode right click aim mechanism

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6793 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-20 08:49:56 +00:00
Kriplo 056e5e31c5 Thanks to Flugente, he perform quick fix for overhead map crash after sector is cleared from enemy, but actual problem was created by me in r6744, I overwrite one condition by mistake, so this will fix the real source of problem.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 18:17:58 +00:00
Wanne b038ab4f0d Merged from revision: 6786
Added missing text line in French version
- L"Refuel site"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6787 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 18:14:51 +00:00
Flugente 49cba321b5 Fix: M.E.R.C. accounting displayed too many mercs per page (page 2 and following)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:21:04 +00:00
Flugente f5dfddb0fc FixFix: non-merc planted explosives that fire fragments caused crashes. A few functions had to be fixed.
Note: keep in mind that we cannot assume that BULLET's pFirer will be valid. Check wether ubFirerID is NOBODY first.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6776 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:14:30 +00:00
Flugente 4541487c3b Fix: Opening up sector map could cause crashes.
Note: I am not really sure at what causes the error here, this is probably due to some recent changes in overheadmap. For the time, this fixes that, though someone with better knowledge should fix the real problem eventually.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6775 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:12:04 +00:00
Flugente e1b1712205 Fixed dropdown menu glitches
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6774 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:06:50 +00:00
Flugente 27db170b39 Fix: overly long loadscreen hints caused crashes when displayed in log. Maximum loadscreen length is now 190 (was 256).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6773 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-19 14:05:59 +00:00
Wanne 83be50c97c Merged from revision: 6767
- Moved hard coded "Next page" button text for Alumni site to language files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-17 07:49:21 +00:00
Wanne 5f92048f5a Merged from revision: 6764
Fixes (by Buggler)
- fixed hotkey switch weapons AP cost and empty hand swap
- adjusted colors for militia equipment item shading
- fixed IMP background button states and previous button array list

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-15 13:20:31 +00:00
Wanne 8d5ed89e14 Merged from revision: 6761
- Campaign Stats: Externalized hard coded "and" text to language specific text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6762 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-13 20:30:39 +00:00
Wanne 56056b8841 Merged from revision: 1917
- Added missing updated snitch traits for some mercs. This feature was added in GameDir revision: 1906 (by anv)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-13 16:32:19 +00:00
Wanne 3804ef6650 Merged from revision: 6759
- Updated French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-13 07:59:56 +00:00
Wanne e51b013da1 Merged from revision: 6756
Bugfix: Fixed old (unsupported map version error) A1 map in French version
- Added the English A1 map, which works fine

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-12 15:33:59 +00:00
Flugente 59c4dfc8f7 Spotter ini settings were lost in previous commit
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1916 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-10 18:39:21 +00:00
Wanne 06123089bb Bugfixes (by anv)
- Fixed Dimitri's recruitment,
- Fixed proper morale gains/losses

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6748 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-10 16:27:21 +00:00
Wanne 8503fc26c2 Visual tactical improvements (by Sevenfm)
1) Improved cover indicator:
SHOW_COVER_INDICATOR
0 - nothing
1 - show as small square to the right of health bar
2 - show using color of merc's name
3 - same as 1, show only in stealth or when disguised
4 - same as 2, show only in stealth or when disguised

2) Enemy rank (exp. level) icons:
SHOW_ENEMY_RANK_ICON
0 - do not show
1 - show icon
2 - show icon from .sti (not yet implemented)

3) Enemy health bar:
SHOW_ENEMY_HEALTH
0 - do not show
1 - show health as text (default)
2 - show health bar
3 - show health + ap
4 - show health + ap + shock
5 - show health + ap + shock + morale
6 - show health + ap + shock + morale + bp

4) Minor improvements:
Enemy awareness sign now shows up only in stealth/disguised mode.
Turned on Extended Disarm Dialog for turnbased (it was implemented but turned off)

Recommended settings for regular gameplay (from video example above):
INDIVIDUAL_ENEMY_NAMES = FALSE
INDIVIDUAL_ENEMY_RANK = FALSE
SHOW_ENEMY_RANK_ICON = 1
SHOW_ENEMY_HEALTH = 4
SHOW_COVER_INDICATOR = 2
SHOW_ENEMY_ADDITIONAL_INFO = 1
SHOW_ENEMY_WEAPON = TRUE

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/329674/Re:_Code_Snippets.html#Post329674

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1915 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-10 16:22:25 +00:00
Wanne 7782384be5 Visual tactical improvements (by Sevenfm)
1) Improved cover indicator:
SHOW_COVER_INDICATOR
0 - nothing
1 - show as small square to the right of health bar
2 - show using color of merc's name
3 - same as 1, show only in stealth or when disguised
4 - same as 2, show only in stealth or when disguised

2) Enemy rank (exp. level) icons:
SHOW_ENEMY_RANK_ICON
0 - do not show
1 - show icon
2 - show icon from .sti (not yet implemented)

3) Enemy health bar:
SHOW_ENEMY_HEALTH
0 - do not show
1 - show health as text (default)
2 - show health bar
3 - show health + ap
4 - show health + ap + shock
5 - show health + ap + shock + morale
6 - show health + ap + shock + morale + bp

4) Minor improvements:
Enemy awareness sign now shows up only in stealth/disguised mode.
Turned on Extended Disarm Dialog for turnbased (it was implemented but turned off)

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/329674/Re:_Code_Snippets.html#Post329674

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6747 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-10 16:21:59 +00:00
Kriplo d0897d912c Brief: //dnl ch82
- Fix glitches in overhead map with cliffs.
Details:
- Overhead map never correctly show maps which contains cliff tiles. Some of glitches was incorrect placement for cliff shadows, not rendering complex multi tiles at edges, draw black line spots mostly close to map edges. All of this glitches also go to radar map during creation.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6744 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-09 20:51:02 +00:00
Kriplo a3a9b29ead Brief: //dnl ch83
- Fix BigMaps cliff-prone problem.
Details:
- Bug which prevent merc to go prone and crawl in big maps with cliffs was reported by Buggler who already find source of problem which lies in DB_STRUCTURE_TILE struct variable sPosRelToBase. This variable contains relative position to base tile which and cannot simply be change to INT32 as data from JSD files are loaded into it. However reason for problem is because sPosRelToBase is not updated for quite bunch of structures when map size is changed so add macro which in real time perform conversion and update sPosRelToBase value.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-08 21:16:35 +00:00
Flugente 49de642d7d IDs use NOBODY, profiles use NO_PROFILE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-07 21:04:07 +00:00
Flugente b387091a8c IDs use NOBODY, profiles use NO_PROFILE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6735 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-07 20:32:51 +00:00
Flugente 8044ea108d Fix: error message when repairing
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 17:04:09 +00:00
Wanne 626c89e9ce Externalizations (by Buggler)
- option for crepitus to attack a random player-controlled town, not just the originating town
- externalized creatures spreading hardcoded defines to Creatures_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1913 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-06 15:36:51 +00:00
Wanne c0d49d3f16 Externalizations (by Buggler)
- creature xml to use other insertion directions if per-determined direction is invalid
- swapped East and South Insertion_Code enum to be align with Strategic_Move enum
- option for crepitus to attack a random player-controlled town, not just the originating town
- externalized creatures spreading hardcoded defines to Creatures_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6732 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 15:35:52 +00:00
Wanne 27fb0562ee Alternate new shortcut "ALT + Right Mouse Button" for showing skill (traits) menu in Tactical (by Sevenfm)
- Old also working shortcut: "SHIFT + 4"
- moved menu to cursor position instead of soldier's position
- see (youtube): https://www.youtube.com/watch?v=RS7AKv0rWq0



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 15:30:18 +00:00
Flugente 907a4b6b40 Fix: backgrounds not showing up
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-03 17:17:52 +00:00
Wanne f28b6686aa Improved health bar in tactical (by Sevenfm)
Option SHOW_HEALTHBARSOVERHEAD is now integer:
0 - no bar
1 - default health bar
2 - small version of new bar
3 - large version of new bar
4 - small health bar + AP indicator
5 - large health bar + AP indicator

Note: cover indicators are enabled only in turnbased combat or when sneaking
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1912 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-03 17:15:57 +00:00