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
1,705 Commits 9 Branches 6 Tags
7033074a019ffd4f8973252fa3cd7e02f5667c9f
Commit Graph
1705 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 bd5233db0f Fix: use xml vehicle names 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6085 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 23:20:13 +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
Wanne e365ac9f1b - Bugfix: Fixed missing "," in _GermanText.cpp which resulted in wrong text (on the M.E.R.C website) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-13 21:18:08 +00:00
Wanne f7989a1fca - Fixed MERC hiring bug when reached max allowed mercs due to optional gear feature (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6075 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-13 20:24:21 +00:00
Wanne 71ca610b45 - Fixed RandomStats default values in GameSettings.cpp (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-11 16:57:31 +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
Wanne ccc6bea3be - Added page numbers in MERC files (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-06 20:40:49 +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
Wanne 0078b01d9b - Sorted Training Attribute strings to be same order as stats display (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6062 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-04 15:08:25 +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 a0a0490771 - Added ini property to control how long (in seconds) the load screen should be visible before disposal: Default: 2 seconds 
o This is needed, so we can read the new loadscreen hints text
o Property name: ADDITIONAL_DELAY_UNTIL_LOADSCREEN_DISPOSAL

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 21:05:31 +00:00
Wanne 3083ac66b3 - Bugfix: LoadScreenHints 
o Added support for language specific (German, Russian, ...) LoadScreenHints (*.LoadScreenHints.xml)
o Added support for long (multi line) load screen hints (there will be an automatic line break in long load screen hints text)
o Reset load screen hint text to 0 (no display), because otherwise the old load screen will also be shown underneath the correct new one which resulted in an unreadable text mess

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 19:50:21 +00:00
Wanne 15696994a0 - Bugfix: LoadScreenHints 
o Loadscreen hints were not shown in a Release Build
o Centered Loadscreen hints text in all resolutions
o TODO: If loadscreen hints are ON (in the ini), the loadscreen should not close automatically, but should stay on screen until the user presses a key(e.g: Space). So the user has time to read the hint -> @Flugente: Do you have any other idea?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6052 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 18:23:02 +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