1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,316 Commits 9 Branches 6 Tags
1e0738d644f99343a36070e4f3128d5245ead273
Commit Graph
324 Commits
Author SHA1 Message Date
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 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 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
Flugente 2a799a5870 - New: WidgetBase serves as a base for future widgets. 
- Fix: ctd if dropdown contained exactly one entry

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-10 20:53:56 +00:00
Flugente b118cf07b7 Merged revision(s) 7254 from branches/ja2_source_official_2014: 
Deleted TAIWANESE language versions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-02 19:00:06 +00:00
Flugente 8927918913 Fix: skill display crashed and/or was badly aligned when selecting many traits (by cres) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-02 17:21:23 +00:00
Flugente 6448b332ec Merged revision(s) 7251 from branches/ja2_source_official_2014: 
code cleanup & removed some warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-01 21:50:14 +00:00
Flugente be52b5bf76 Fix: CTD on MeLoDY website if player has no active mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-05-31 20:09:52 +00:00
Wanne d88ca480fb - Bugfix: The variable fErrorFlag was not initialized with FALSE, which could result in showing the laptop website error dialog (text content from variable pErrorString[]) 
- Bugfix: Fixed wrong button and text position in the laptop website error dialog (text content from variable pErrorString[])

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-05-30 12:04:21 +00:00
Flugente 5e9289b450 - New Feature: dynamic opinions allows mercs to form opinions about each other depening on actions they/the player take or do not take. These can be viewed in the 'MeLoDY 'website. See also http://www.bears-pit.com/board/ubbthreads.php/topics/333259.html#Post333259 
- Requires GameDir r2050.
- new background property: <dislikebackground> allows mercs to dislike specific backgrounds
- Fix: snitches did not correctly prevent misbehaviour
- Fix: morale event was not handled
- Fix: DropDowns did not refresh when using the arrow buttons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-05-28 22:10:42 +00:00
Wanne 262b1ea128 Merged from revision: 7230 
Fixes (by Buggler)
- Added first page and last page buttons to history log
- Fixed pick up backpack on the same grid to cost the same as manually picking it up instead of no cost
- Display message when dropping and picking backpacks for all mercs in sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-05-23 19:07:05 +00:00
Wanne 4c0bd0e03a Merged from revision: 7134 
- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7135 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-04-06 14:43:48 +00:00
Wanne 873b9908dc Merged from revision: 7110 
- Bugfix: Language version of *.CampaignStatsEvents.xml not working correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-24 09:48:49 +00:00
silversurfer 0516abde05 fixed infinite loop (by JosephCKohn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7104 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-21 09:15:51 +00:00
Flugente d83ae2a4c8 Merged revision(s) 7049 from branches/ja2_source_official_2014: 
Fix: problems with loading IMP profiles between different game versions (checked on IMP from 6670, 6901, 7047) (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-11 21:26:11 +00:00
Flugente b39954aee7 Merged revision(s) 7018 from branches/ja2_source_official_2014: 
- Fix: reloading while mercs are exiting the helicopter could lock the gamescreen.cpp
- Fix: helicopter airdrop could lock up if mercs were in a bad animation
- Fix: wrong battle report texts used

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-03 21:03:36 +00:00
Flugente 3ae95a6c20 Merged revision(s) 6997-6998 from branches/ja2_source_official_2014: 
- Campaign stats take spy actions and SAM sabotages into account
- spy encounters are not reproted if nothing of interest happened
- Fix: error in food system automatic canteen refill
- Fix: if min enemy group size is too high, the AI never replensishes garrisons, thereby severely dumbing down the game.
- Fix: enemy groups do not receive minimum size
- Fix: enemy groups sizes are cut down needlessly


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-01 01:48:43 +00:00
Wanne 8a9857c26e Merged from revision: 6989 
Bugfix (by Buggler)
- Fixed incorrect shipping costs in BobbyR Shipment page
- Duplicate laptop webpage hotkeys (e -> Enter, q -> BACKSPACE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-27 15:46:37 +00:00
Flugente 9e393cd5e3 Merged revision(s) 6985 from branches/ja2_source_official_2014: 
- Fix: battle reports no longer report that a team came from north if it was already in sector.
- Fix: red lines at wrong locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6986 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-26 20:59:25 +00:00
Flugente f00bc1aa14 Merged revision(s) 6971 from branches/ja2_source_official_2014: 
Fix: MERC members accounts not displayed if they were at the end of the list


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-24 21:06:37 +00:00
Wanne 201fcf4001 Merged from revision: 6961 
- Bugfix: John Kulba (and other NPCs) did not show up on MERC website even if MERC_WEBSITE_ALL_MERC_AVAILABLE  = TRUE (by anv)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-22 16:44:15 +00:00
Wanne 1e90e7447a Merged from revision: 6946 
- Bugfix: Fixed wrong IMP mail result entry for Radio Operator skill

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6947 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-20 08:17:00 +00:00
Wanne 11037729f0 Merged from revision: 6905 
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-12 17:22:40 +00:00
Flugente cb3304e93f Merged revision(s) 6894 from branches/ja2_source_official_2014: 
Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-10 00:28:04 +00:00
silversurfer 553171b717 Bugfix for number of minor traits (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-07 15:02:45 +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
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
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 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
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
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
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 d5b4599e9c New Trait: Snitch (Trait 22) (by anv) 
Every midnight snitches will give you a report about their collegues' opinions. Information includes:
- merc whining about high death rate,
- merc whining about player reputation,
- merc whining about his low morale,
- merc whining about some other merc (unliked, not only hated),
- merc planning to quit (leave without renewing contract, only AIM mercs) next day,
- merc whining about player inactivity,
- merc whining about player owing them money (you can only owe money to MERC mercs).

List of snitches (trait 22)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6723 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-01-01 12:02:23 +00:00
Wanne 44cf72a2e0 - Fixed compilation error for JA2UB define (by anv) 
- Added missing string to _FrenchText.cpp
- Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-28 18:27:09 +00:00
Flugente 24d76b6b06 Fix: battle reports were wrongly copied 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-24 22:10:29 +00:00
Wanne 644ca237a4 Updated VS 2013 project files 
- Added links to new Campaign Stats files (H, CPP)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-23 09:34:18 +00:00
Flugente f4dcc15ffa New Feature: Campaign History collects combat data and displays battle reports on the website. 
requires GameDir >= r1901.

For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/329205.html#Post329205

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-22 23:22:45 +00:00
Flugente faba9ea713 Helicopter features (by anv): 
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

Appropriate Data in GameDir r1897.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-19 22:01:44 +00:00
Wanne 135e576d27 Re-Fixed mercs Files.cpp (by Buggler) 
o I assumed it was a Chinese character, but Buggler told me it was Korean. Anyway, we removed it ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6677 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-03 10:29:20 +00:00
Wanne 5c062ff752 Extended "Merc Random Stats Feature" (by Jenilee) 
- Added 4th option for MERCS_RANDOM_STATS (MERCS_RANDOM_STATS = 4)
  o full randomization of mercs, including traits, gear kits and all statistics
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328769.html#Post328769

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6676 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-03 10:14:15 +00:00
Wanne 8c4201e335 - Fixed wrong encoding and damaged content of mercs Files.cpp (by Buggler) 
- Moved Chinese Character from mercs Files.cpp to _ChineseText.cpp, so we can have correct encoding of mercs Files.cpp


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-03 09:24:24 +00:00
Wanne c8f4108225 Hotkey Updates (by Buggler) 
- Duplicate all applicable arrow hotkeys to WASD hotkeys in Laptop mode (w -> UP, a -> LEFT, s -> DOWN, d -> RIGHT)
- Remapped squad 14 to 'Ctrl + 4' in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-02 20:14:14 +00:00
Wanne 08236ee9f4 Added VS2013 solution and project files (by JMich) 
- You can also open them with VS 2012
- I just changed the toolset for all projects to V100 (VS 2010) instead of V120 (VS 2013), because I don't have VS 2013 installed. If anyone can't compile with VS 2013, we simply switch back to V120 toolset

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-21 07:57:52 +00:00
Wanne 874193d197 Fixed VS 2012/2013 compilation errors (by JMich) 
- Solution and Project files for VS 2013 will follow
- It still compiles and works in VS 2005/2008/2010 :-)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-20 07:52:55 +00:00
Wanne 496616a2bd Fixed screen not refreshing for '1' - '4' Bobby Ray hotkeys (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-18 19:42:33 +00:00