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,282 Commits 9 Branches 6 Tags
75ddf38ece87f7cb3fab28caec71b61ba549c497
Commit Graph
2282 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 0650b2b3ed - Bugfix: Santos Barkeeper (!= HERVE) misses speech and edt files 
o This bug was introduced when making the possibility to have different EDT / NPC / speech files for the 4 Santos barkeepers (see revision: 6183)
o Now the fallback to HERVE (id = 151) if a file is missing seems to work correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6208 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-08 06:58:12 +00:00
Wanne 739d9a47d8 - Now it is possible to use the newly added DG M.E.R.C merc on an "older" savegame before those merc got integrated (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-07 19:55:35 +00:00
Flugente 3b4d32be40 Fix: loading a savegame that was started with an exe without ENABLE_BRIEFINGROOM was impossible with an exe with ENABLE_BRIEFINGROOM enabled. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-07 11:10:12 +00:00
Wanne 2b23cbad54 - Bugfix: When "Enemy drop all" is selected, sometimes default attachments were not dropped (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-07 09:01:45 +00:00
Flugente 09b56d534c - print interrogation progress as float number 
- spy selftest in pointless without disguise
- inventory explosion creates a sound

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-04 19:37:27 +00:00
Flugente 86f1a862a5 Fix: militia profile names weren't used 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-02 19:42:12 +00:00
Flugente 45f27fd815 Fix: covert gear was uncovered due to too high coolness when disguised as a soldier (should only apply to hand items) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-02 19:03:14 +00:00
Wanne c7f5dda4d7 - Bugfix: ETA Travel Popup screen location was wrong (not initialized) in the new additional screen resolutions (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-01 18:38:04 +00:00
Wanne 5089f24cba Brother Santos Patch (by Jazz) 
- Brothers Santos use these same files edt and npc (151.edt and 151.npc). After use of this small patch, brothers can use separate files npc and edt.
o Herve - 151.edt and 151.npc
o Peter - 152.edt and 152.npc
o Alberto - 153.edt and 153.npc
o Carlo - 154.edt and 154.npc

If the files do not exist, then the game reads default files 151.edt and 151.npc

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-01 18:34:49 +00:00
Wanne 36c0d5b56d - Bugfix: Fixed encyclopedia crash after selecting menu entry in main menu 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 19:28:45 +00:00
Wanne 4c7e235e81 - Reworked LuaInitNPCs.cpp\h, Luaglobal.cpp\h and few cosmetic changes (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 19:16:35 +00:00
Flugente 50f0b71fb1 Fix: CIV_NAMES_VALUES were overwritten after reading 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:48:43 +00:00
Wanne fabb28ee14 - Enabled the briefing room feature (define) in the executable 
o To use the briefing room on the laptop, the BRIEFING_ROOM option has to be enabled in ja2_options.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:46:32 +00:00
Wanne b0687c344a - Externalized 2 breathing values to APBPConstants.ini (by silversurfer) 
o With those values you can define the minutes needed to regenerate BP in real-time mode
o BP_RT_BREATH_RECOVER_MODIFIER, BP_RT_BREATH_DEDUCT_MODIFIER
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/322238/Re_Breath_regeneration_is_too_.html#Post322238


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:29:17 +00:00
Wanne fe6d9e8a13 - Fixed MERC Buy Equipment flag not properly set by reverting & fixing buggy code optimizations in r6075 (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:08:04 +00:00
Flugente 952e40a427 - changed poison symbol position 
- added SOLDIERTYPE* argument to GunIncreaseHeat(), which allows for soldier-specific heat generation modification

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 02:56:10 +00:00
Wanne 12ec4ad8bb - NCTH Scope Modes Update (by silversurfer) 
o Updated formula to get better results with different scopes
o 10x scopes are still useless on "normal" maps. Could be better on bigmaps (70+ tiles)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-27 11:08:12 +00:00
Flugente 5a89f6fa62 Fix: civilians could openly wield covert guns 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-26 18:19:33 +00:00
Wanne f43521f1fb BUGZILLA #629: Removed unused TONY_USES_BOBBY_RAYS_SETTING and DEVIN_USES_BOBBY_RAYS_SETTING from game, because they are externalized to the merchants xml files (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6160 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-26 07:22:06 +00:00
Wanne 5130c43d50 BUGZILLA #573: IMP creation skills (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6159 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-26 05:56:22 +00:00
Wanne 58e9e8a7db - New Feature: Added possibility to swap merc position order in tactical team panel (by silversurfer) 
o Just select the merc and press CTRL + Left Key for moving the merc one position to the left / CTRL + right key for moving the merc one position to the right
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/321935/Re_Drag_mercs_around_on_Merc_b.html#Post321935


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6156 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-25 06:33:47 +00:00
Wanne fa2fe99b1d - Bugfix: NCTH - Scope Penalties (by silversurfer) 
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/321860/Re_NCTH_Scope_penalties_below_.html#Post321860


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6155 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-25 06:30:57 +00:00
Wanne 911e255bb0 - New Feature: Added possibility for CIV_TEAM (e.g: Kingpin, ...) to drop ALL their stuff (like you can do for enemies and militia) (by silversurfer) 
o On/Off feature in ja2_options.ini (CIVILIANS_DROP_ALL)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-25 06:29:02 +00:00
Flugente 270766a080 Fix: for day vision range reduction formula for daylight was wrong for non-gun items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6145 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-20 21:40:56 +00:00
Wanne c70cfef99c - Added folder 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-20 20:28:58 +00:00
Flugente 821893ce68 - Fix: item name in spy disguise notification was wrong 
- MTAs don't have to stop when no hand item is found (the ones in the trunk use this though)
- Fix: militia drops sector equipment it took, even if it should not drop other gear - otherwise militia ould 'consume' sector invetories

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-20 17:41:23 +00:00
Wanne 3ade79cf63 - Disabled the ENABLE_BRIEFINGROOM define per default 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6140 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-19 11:24:08 +00:00
Wanne 7033074a01 New Lua Externalization (Quests.lua) (by Jazz) 
- New File "Quests.lua"
- Modders can now define new events relating to tasks (from 0 to 254)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6139 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-19 11:19:57 +00:00
Flugente 24476657f6 switch order of arguments to make function faster 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6138 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-17 21:57:34 +00:00
Flugente 49018d85ec improved multiturn action cost handling 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6126 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-16 16:40:15 +00:00
Flugente 38308680db Fix: AMMOTYPE::highExplosive was sometimes interpreted as an item number, sometimes as boolean, and sometimes a an index over explosives. It is now treated as an item number 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-16 15:05:41 +00:00
Wanne 47b1594d53 - Multiplayer: Re-enabled the enemy interrupt fix per default (cause it seems to work better than without the fix ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6123 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-14 08:30:05 +00:00
Wanne cea54da006 - Fix: VS 2005 compilation: Dependency of ModularizedTacticalAI was not set for the ja2 project (Solution -> Properties -> Project Dependencies) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6122 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-14 07:54:00 +00:00
Wanne 4e3f468a4c - Multiplayer: Fixed crash/freeze when clicking "Host" in the host screen 
o It seems the feature "soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia" (revision 6071) makes trouble with multiplayer. So I disabled the feature and initialization of the xml files in a MP game
o Removed the re-initialization of the xml files when clicking on the "Multiplayer Game" menu button. Cause I think the re-initialization is not neede.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6121 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-14 00:12:11 +00:00
Wanne 8f41617845 - Encyclopedia / Briefing Room Updates (by Jazz) 
o Improved record
o Restart game of Briefing Rooms
o New Action for NPC (recruiting / unrecruiting)
NPC_ACTION_RECRUIT_PROFILE_TO_EPC = 700
NPC_ACTION_UNRECRUIT_EPC = 701

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-13 22:34:43 +00:00
Wanne 742494ec77 - Updated Briefing room / Encyclopedia (by Jazz) 
o Both features are currently disabled, because the use huge amount of memory. There also seems to be some big memory leaks in Encyclopedia
o see builddefines.h (ENABLE_ENCYCLOPEDIA, ENABLE_BRIEFINGROOM)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6118 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-10 20:12:56 +00:00
Flugente b5835754cc Fixed display bar of attached ammo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6115 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-05 19:38:41 +00:00
Flugente 24000fd605 Fix: crash on getting hit by high-numbered object 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6105 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-30 20:46:19 +00:00
Flugente 2d7443213b Fix: last shot of magazine-fed launcher was removed too early 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6104 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-30 00:12:10 +00:00
Flugente c38e079edc - interrogation point calculation was suboptimal 
- Fix: removed unnecessary check
- robots cannot climb roofs, windows, fences or walls anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6103 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-28 21:32:40 +00:00
Flugente 9bd26015e5 cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-27 21:01:04 +00:00
Flugente f92f70c78d cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-27 20:38:52 +00:00
Flugente 921394b24c Fix: allow longer soldier names to be displayed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-25 21:31:30 +00:00
Flugente e4d345dc48 Fix: crash when using switches connected to doors 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-25 19:19:59 +00:00
Flugente 64e4677ba7 SHOW_HEALTHBARSOVERHEAD allows hiding the health and fatigue bars over your selected mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6098 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 16:57:52 +00:00
Flugente 10a0c07822 Fix: scope modes take Aimlevel modifiers on scopes/sights into account 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 15:52:05 +00:00
Flugente 45659c18a3 made sure that faulty xmls don't lead to three major traits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 15:10:27 +00:00
Flugente 2bf92c7301 Vehicle data is no longer saved and loaded into savegames, as it was externalised to xml a long time ago 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 14:25:47 +00:00
Wanne 42e8c48cac - VS 2010 Bugfix: Fixed LINKING error when compiling MapEditor version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6090 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-20 20:12:10 +00:00
Wanne dce7152770 - Chinese translations (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-19 18:55:23 +00:00