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,046 Commits 9 Branches 6 Tags
d9437117bb17c29912c55be32bd330c8cdbb4358
Commit Graph
1046 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisL d9437117bb BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-14 14:43:30 +00:00
ChrisL 11889ee846 BUGFIX 527 - Corrected weapon placement when 2handed weapon is held in off hand during a successful steal attempt. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:47:21 +00:00
ChrisL 2bd354af32 BUGFIX 522 - Coded some popup box position adjustments so that popup boxes can't be drawn off the screen. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:33:38 +00:00
Wanne 3e5ab3767b - Deleted old and unused VFS folder (project) 
o I forget to delete that, when merging the complete development trunk back into the official trunk

- Deleted old an unused Multiplayer/test_space.* files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-12 07:42:16 +00:00
Wanne 48a9816f6d - Fixed crash (could not load existing file) in Release version when initializing portrait icons 
o  "VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE" was not set!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-12 07:35:08 +00:00
ChrisL ba81d0de5a BUGFIX 526 - Bullet graphic rendering was causing an internal display error when attaching/removing Ammo attachments from the tactical panel. We don't need to actually redisplay the bullet graphic, however, in order to change the text that's on the bullet graphic. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 17:36:58 +00:00
ChrisL a9a88e4642 BUGFIX 525 - Corrected UDB display issue where ammo and RangeBonus are concerned. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 16:43:02 +00:00
ChrisL 7ddd54134f removed unnecessary weapons.xml write procedure from the ReadInWeaponStats function. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 15:34:57 +00:00
ChrisL b8e5ebcf6c BUGFIX 514 - A vector error in the size of the world inventory was causing a mouse button to be deleted twice resulting in an assertion error. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 18:16:56 +00:00
ChrisL 61fac0c0f8 BUGFIX 501 - portraits weren't being re-initialized when changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 16:30:51 +00:00
ChrisL 1652167097 BUGFIX 500 - Corrected "equiped" spelling error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:56:35 +00:00
ChrisL 3f9cb6b833 BUGFIX 497 - Aim Level function was not allowing negative aim levels which might initially make sense, but if any modifiers would result in a negative value, we'd end up with an high value which would then get reset by the built in limits. I've recast the variable to an INT8 which will allow negative results, at least prior to the built in limits being applied. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:09:16 +00:00
ChrisL 7376ffbb68 BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 22:28:19 +00:00
ChrisL 42a2130043 BUGFIX 484 - Appears that some of the SM Panel pockets were out of alignment by 1 pixel to the right. I'm not sure if this is because of a recent sti alteration or if this has always been the case but the code has been updated to account for the current STI coords. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 21:06:06 +00:00
ChrisL ab7ecb51e6 BUGFIX 482 - Corrected several variable definitions so that large mag capacity is better supported. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 20:37:23 +00:00
ChrisL 25133e0afe BUGFIX 480 - When disarming a bomb when your inventory is full, the merc actually disarming the bomb will now be the active "ItemPointerSoldier". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:44:37 +00:00
Wanne 75b4d43964 - Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are 
o When loading such a buggy savegame, we will fix it automatically

- Simplified (reworked) IF-conditions with crepitus

- new define in luaglobal.h: LUA_GAME_INIT_NEW_GAME, LUA_GAME_INIT_NPCS.
o So we can select if we want to use lua script (GameInit.lua) or the hardcoded JA2 stuff

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:04:56 +00:00
Wanne bfbe6b0311 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4472 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2011-06-05 07:44:32 +00:00
Wanne da8d90a1b6 - Updated a text from the option screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-03 13:18:24 +00:00
Wanne 7ff31b59b0 BUGZILLA #492: Fixed CTD when switching from IMP page to another web page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-02 20:52:24 +00:00
Wanne 6b72751538 - Bugfix: Fixed CTD that could occur on enemy soldier pathing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4466 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-31 19:03:21 +00:00
Wanne 68757bfda0 - Changed output name to match language selection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 02:39:13 +00:00
Wanne 38bd7da7bb *** Hotfix: Build 4462 *** 
- This fixes the problem with the merc portraits (game freeze, portraits not showing up when talking, ...)
- It also fixes the problem with the wrong opponent counters on the merc portraits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 02:31:51 +00:00
Wanne ef59f6e415 - Reverted the fix to set the correct camo face in the save load method, cause I am not exactly sure if that also leads to the merc faces bugs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 01:42:12 +00:00
Wanne 1b60a67678 - Fixed game hang when merc tries to exermine a door with explosives 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 21:46:00 +00:00
Wanne 2b7f79db94 - Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396 
o Fixes endless loop when clicking on items with explosives and merc starts to talk
o Fixes hidden merc faces
o Fixes wrong merc faces (merc face instead of skull) when merc is dead

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 16:08:27 +00:00
Wanne 993f3a204c - Reverted BUGZILLA #338 fix, because the fix lead to problems with enemy soldier opponent count 
o Now it should work again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 10:14:10 +00:00
Wanne 508ef18db9 - Official Spring 2011 Release Build: 4452 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4452 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-27 10:26:04 +00:00
Wanne e4dd5e7fc7 - Fixed type in _EnglishText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 14:09:00 +00:00
Wanne d95d831ba3 - Added files to "ignore list" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 12:49:35 +00:00
Wanne be95a2a7b1 - Added missing projects "VFS" & "export" to SVN 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 11:25:04 +00:00
Wanne 6e2bdd557c **************************************************************************** 
** Merged Source Code from Development trunk, for the Spring 2011 Release **
****************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
o This trunk (the official 1.13 source trunk) will only be used for fixing bugs. No new features will be added here.
  New Features are only included in the Development trunk
o !!! After we have fixed a bug here in this trunk, we should MANUALLY merge the bugfix in the development trunk !!!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-26 11:04:47 +00:00
Wanne c999420bb7 - Increased GameVersion to 4071, which will be the Beta 2011 Build 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 17:23:38 +00:00
Wanne 50916acbdb ************************************************************************** 
* Merged Language specific GameDir from Development Trunk: Revision 4067 *
**************************************************************************
- This will be the official Beta 2011 build version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 14:12:49 +00:00
Wanne d8d0af38e8 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Deleted unused files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:18:46 +00:00
Wanne 91087ca8c0 ************************************************************ 
* Merged Source Code from Development Trunk: Revision 4063 *
************************************************************
- Source Code is merged from: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- This will be the Source for the Beta 2011 Test

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-01-18 09:11:09 +00:00
Wanne 44e1646410 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3753 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2010-10-08 17:21:14 +00:00
inshy 3d34c587df Update Russian text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-09-15 05:50:29 +00:00
inshy 6c98e683c1 Updated Russian text. Fixed few mistakes in translation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-07-10 19:46:30 +00:00
Wanne e4a9cb5785 - Improved Bugfix for grenade throwing range on Big Maps 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3525 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-06-07 09:24:27 +00:00
inshy b4a906728b Translated new lines for _Ja25ItalianText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-06-07 06:04:39 +00:00
Wanne ef24311ac6 - Fixed a bug with grenade and item throwing range that was introduced in revision 3488 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-06-03 22:11:49 +00:00
bugmonster 1ba80f3436 - Big Maps: fixed road placing in map editor 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-05-17 17:25:54 +00:00
inshy a7b0a1510e Fixed text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-04-27 12:57:36 +00:00
bugmonster 65602e9738 - credits screen fixed: developers' eyeblinking returned, fixed vanilla bug with memory corruption which can led to crash or incorrect color of credits text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-04-23 13:34:12 +00:00
bugmonster cd855255d2 - fixed grenade and glauncher physics on big maps 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-04-21 20:44:20 +00:00
inshy 2ea6628a77 Russian text updated. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3437 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-04-01 09:30:11 +00:00
SpaceViking 76186058af Flexible merchant updates 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-17 02:42:30 +00:00
SpaceViking fb609a9cf1 Allow for tactical numbers of people (mercs, militia, civs, creatures, and soldiers) to be increased via the .ini settings for a game already under way. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-14 05:33:22 +00:00
Wanne 025c3742b4 - Bugfix: Chinese Version crashed on start (problem with font initialization) 
- Bugfix: Assertion erro if "ja2_settings.ini" was not present
 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2010-03-13 18:11:35 +00:00