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
1,714 Commits 9 Branches 6 Tags
f43521f1fb1ef5c8dc7ed968e23ec30a56f9eebd
Commit Graph
886 Commits
Author SHA1 Message Date
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
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
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 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
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 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 befe76b049 - Fixed 'Unsettled bills' for MercID > 170 on game restart (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-19 10:31:34 +00:00
Flugente 27f18605d9 sope modes no longer uses fixed magnifications, and no longer differs per team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6084 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 20:14:02 +00:00
Flugente 22bd1956f1 Fix: status bar of attached grenades was shown incorrectly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 18:05:18 +00:00
Flugente 1b00117b7e when using alternate weapon holding under NCTH, still apply projection factor from non-scope/sight attachments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-15 23:04:09 +00:00
Flugente cefa9cfcc1 Fix: when using scope modes with NCTH, non-internal projection factor from lasers was ignored. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-14 21:11:24 +00:00
Flugente 44d9b88042 once again, forgot to add a file... 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6072 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-11 13:22:18 +00:00
Flugente ee416f72bc new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool. 
WARNING: GameDir revision >= 1672 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6071 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-10 23:30:42 +00:00
Wanne 576866b63e Improved Random Stats Feature (by Buggler) 
- Added random starting salaries in Ja2_options.ini
- Added more options for random stats & tweaked existing formula


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-10 20:36:15 +00:00
Flugente c0372cccd1 speed up handling of personal light 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-07 00:05:24 +00:00
Flugente 59646b9dcd - Fix: crash when switching to bayonet while aimed 
- Fix: batteries were drained for inactive flashlights

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6067 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-06 23:35:17 +00:00
Flugente 1c74ca4bf1 new feature: fixed bayonets (still in need of animation) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-05 20:56:00 +00:00
Flugente 9d2da7e440 Fix: VS2008 & VS2005 compatibility 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-05 14:16:36 +00:00
Flugente fadd849359 new feature: dynamic flashlights allows usable flashlights 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-03 23:31:28 +00:00
Flugente 3bc5ff75cc significantly cleaned up includes (by IoP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 22:42:08 +00:00
Wanne e8f8e8ae5b - Added slower <bEvolution> rates, growth slowdown will be more pronounced on higher stat values. (3 - 0.75x; 4 - 0.5x; 5 - 0.25x) (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 17:12:43 +00:00
Flugente 8fb494ff53 new disabilities: 
- 'deaf' reduces hearing ability
- 'shortsighted' reduces sight range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6049 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 00:15:51 +00:00
Flugente 265fd3bc61 Fix: EPC inventory cannot be accessed, and Nails does not allow to take his vest 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 21:23:55 +00:00
Flugente 6cbcc995de replaced a few hardcoded numbers with enums/ini setting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 17:03:31 +00:00
Flugente e508e91cff Fix: when accessing a teammember's inventory, circumstances could cause teammembers to attack the merc accessing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 14:58:51 +00:00
Flugente 2455c2c467 changed hardcoded numbers to enums in preparation for total merc number increase 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 21:31:04 +00:00
Wanne 82dec9404c - MP: Moved the FOV (friendly players share same field of view) to a define ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV (currently disabled) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:26:49 +00:00
Wanne 22a18ec262 - MP: Disabled the Enemy numbers count in the turnbar (because it shows different numbers on the clients) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6040 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:14:27 +00:00
Flugente c29d55a1f3 Fix: no stealing on oneself 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6038 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 22:46:15 +00:00
Wanne 4456539663 - MP: Put the interrupt fix code in a define "INTERRUPT_MP_DEADLOCK_FIX 
o It seems the fix does not work 100% and if the fix code is enabled the ALT + E feature does not work correctly (for now, disabled the fix)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 19:45:32 +00:00
Wanne cdc3abc694 - Fixed error in project files when trying to open solution (VS 2005 and VS 2008) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 18:41:11 +00:00
Flugente 3b0d8613af Feature improvement: allow accessing other merc inventories when ACCESS_OTHER_MERC_INVENTORIES is TRUE. Even works with dying mercs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-28 22:59:09 +00:00
Flugente 7f467f4f80 Fix: militia equipment item fitness function still considered ammo even if MILITIA_USE_SECTOR_EQUIPMENT_AMMO was false, thus possibly ignored guns that had no ammo loaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-28 15:58:58 +00:00
Flugente 54ffaa2624 changed a few hardcoded numbers to enums (better, but still ugly) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 22:23:04 +00:00
Flugente 130acec2e8 captured prisoners can now be bandaged even if life >= OKLIFE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 15:57:11 +00:00
Flugente c4aa1da949 Fix: non-green-militia-tabooed objects did not retain their taboo value after inspection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 02:09:24 +00:00