Wanne
df9d9e6c00
PROJECT CHANGES (already done for VS 2003):
...
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2"
Project should now compile in VS 2003 without any errors.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 18:48:46 +00:00
Wanne
74cd6a21f3
Reverted 2 lines in Tactical/ShopKeeper Interface.cpp, because it did not compile in VS 2003
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:44:36 +00:00
SpaceViking
1c1f843449
Fixed error in copying soldier profiles
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 18:03:00 +00:00
Overhaul
7a27e7105d
New attack busy system
...
Added missing #includes
Added LUA scripting and console
Changed the way tracers are visualized, so they work more like real tracers instead of a light fountain
Fixed signedness of many grid variables used in GetMouseMapPos calls
Fixed enemy weapon choosing: Sometimes a mortar is chosen but later rejected, but the grenade class was not reset. Caused assertion failure
Added checks so enemies don't try to chuck RPG grenades with their hands
Now possible to shoot a someone in the head if he's in water
Fixed InitSightArrays to also clear soldier interrupt duel points. This was causing an assertion failure elsewhere in the code because the interrupt list still had soldiers on it sometimes when this function was called.
Soldiers are much less willing to forfeit their turn over an attempt to use more APs than they have
Removed early setting of muzzle flash. This would allow enemies to get an interrupt before you even fired.
Fixed item dropping by AI. If AI tried to drop something while standing it would cause deadlock
Change to greatly speed up closing the sector inventory window in an unloaded sector
Added conditional compile flag to always give robot weapon ready advantage, even for 360 degree sighting
Check builddefines.h for the conditional flags. Of greatest interest might be LUA_CONSOLE. This will cause the game to bring up a command console when run. However this console is severely lacking in many areas. If anybody knows of an open-source terminal/console that could be used instead, it would be appreciated. The existing console does bad things when you try to close it, and since it counts as a separate app, it pauses the game while it has focus.
LUA scripting is very limited, basically just proof of concept. There is one global variable, the Soldiers array. An array index gives you the soldier in that slot in the currently loaded sector. The soldier has a few things that can be accessed: name (short name); fullname (long name); grid (current grid #, can be changed); walkto(grid) (function to walk to another grid); runto(grid) (function to run to another grid)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-09 09:01:04 +00:00
lalien
e5308f27b3
- externalized game starting time
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-04 18:01:51 +00:00
lalien
76d67f37e9
- removed beta version build define
...
- allowed helicopter to land in enemy controlled sector
- SHIFT+N now can use goggles attached to the helmet
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-29 11:57:10 +00:00
Sergeant_Kolja
09a26e3155
in ReadInAttachmentComboMergeStats() added a missing fclose plus a missing XML_free
...
in Items.cpp added unfriendly code to trace + stop the game when pObj is corrupted.
(the corruption comes from somewhere outside the destructed foo!)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-27 12:34:43 +00:00
Wanne
bd22863e45
- bugfix: If merc is in crouched stance and he passes an item to another merc, he did not change his direction
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-23 18:41:42 +00:00
Wanne
4effa1c3ea
- new: Merged source code of item throwing animation in crouched stance, AI was not changed (look for comments marked <SB>)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 18:09:15 +00:00
Wanne
76cf1684f1
- new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (INI-Switch: USE_EXTERNALIZED_LOADSCREENS)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:29:52 +00:00
Wanne
2ee08ea1c0
- bugfix: Automated scrolling if you talk to someone in small maps (e.g: Rebel Basement) in high resolution (1024x768)
...
- bugfix: Scrolling problem in radar map in small maps (e.g: Rebel Basement) in high resolution (1024x768)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-14 16:07:06 +00:00
lalien
0530b53b9c
bug fixes from Overhaul:
...
- Data type changes
- Templates removed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 13:16:37 +00:00
lalien
61d6152ce5
bug fixes from Overhaul:
...
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
- Fixed improper printf field in a debug message
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 22:44:08 +00:00
AcyForsythe
d8ed7117f0
- Adding XML_Roaming.cpp to project
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@860 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 20:52:43 +00:00
AcyForsythe
f9fe75d5e7
- Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@857 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:45:10 +00:00
lalien
a17a3f7cc8
- New feature: Remove attachments and unload all weapons in sector (Shift+F)
...
- Fix for grenade launchers (allow reloading with valid ammunition only)
- Fix for stacking items in sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 09:28:28 +00:00
SpaceViking
198d1fe9d3
Code for "new way to progress" (visiting sectors)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@843 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-09 01:02:46 +00:00
MaddMugsy
682d33da8c
-minor fix to allow different types of GL grenades to be attached to the grenade panel and the ALICE pack
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-04 02:38:33 +00:00
Wanne
abee009cf7
- bugfix: the roof CtH bug also affected the numerical CtH display on pressing "F" (fixed by AndroidXP)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 09:14:17 +00:00
lalien
6d117f5c06
- Added rooftop CtH fix from AndroidXP
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@812 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-30 18:08:32 +00:00
lalien
9467b5b6a7
- Added CtH fix from AndroidXP
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-29 11:00:22 +00:00
Wanne
344eb9498c
- Separated the ammo types from the interface from the file infobox.sti.
...
This is needed, because different interfaces should not depend on the ammo types. Ammo types should ship with the MOD and not with the interfacec!
The ammo types are still in the infobox.sti. The interface is in the new file infobox_interface.sti
The file infobox.sti still contains the interface graphic, but does not use it anymore. Older builds will use the interface graphic. But we should never delete the interface graphic from infobox.sti, otherwise the ammo graphics offset are wrong!
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@800 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-27 17:29:49 +00:00
lalien
6664b92b25
- Added AndroidXP fixes for Sniper Deadlock and Grenade AP loss
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@797 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-25 15:20:25 +00:00
lalien
3f37673034
- added VS2005 compability fix from Space Viking
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-10 18:46:57 +00:00
lalien
9971b56b0e
- externalized game progress weights
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-10 17:13:23 +00:00
lalien
1d00e73866
- fixed "end move & LOS bug" ('END' button has two different actions)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-04 18:04:07 +00:00
Wanne
8e5f803fc4
- updated credits screen to the 1.13 Credits
...
- translated "low cpu usage" option text for german version
- improved existing "escorting kulbas" bugfix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@741 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-25 13:41:15 +00:00
lalien
b0ef70dbb8
- Tactical militia command: stopped merc from moving to militia in combat if he doesn't have a headset (radio)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-24 10:13:46 +00:00
MaddMugsy
c8b4cbe8d9
-skip the CompatibleFaceItem check if either item is Nothing. This will let us trim some lines from compatiblefaceitems.xml that are screwing up the xml-editor.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-09 23:54:20 +00:00
Wanne
793bde64ee
- bugfix: CTD when Skyrider is escorted to his heli in drassen (before Skyrider talks to the mercs)
...
- changed: Location of the Heli information box in Strategy Screen in High Resolution
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-06 16:25:08 +00:00
lalien
21c2464a43
- AP costs for reloading a GL or RL by attaching an item are taken now from weapons.xml (still buggy, allows cheating)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-26 17:01:03 +00:00
lalien
b46f47cb04
- bug fix: no explosion if the rocket launcher was reloaded manually (with attaching a rocket/grenade)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-24 12:07:39 +00:00
Wanne
fd849275b2
- bugfix: CTD when tooltip should be displayed on militia and no merc is in that sector
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 19:31:48 +00:00
Lesh
bf199071d7
- exploit bugfix: invalid APs deduction when shooting - player could win 1 AP, if he raises weapon first and then shoots
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 16:59:33 +00:00
Lesh
c239e693b5
- fix: militia always has equipment one level lower than enemy when slow progress is on (slight re-balance of militia involved battles)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-18 18:41:58 +00:00
Wanne
4477006e57
- bugfix: Turning APs were not deducted (wrong bugfix in version 653)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@664 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-18 18:11:41 +00:00
lalien
e4d8bfa058
- bug fix: when merging an item to a stack of items all of them were converted to a new item
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-17 19:42:32 +00:00
Lesh
a6a2307c56
- fix: militia, came as reinforcements, tend to stop at a halfway, if main battle is at the opposite side of map, they are coming from.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@662 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-17 15:26:01 +00:00
Lesh
5fa61e8f11
- feature: enemies and militia can have ambidexterous skill and a second gun (elites and regular troops/milita only)
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-08 15:13:35 +00:00
Lesh
3188c0ef8e
- slow progress for enemy items choice added
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-08 13:45:34 +00:00
Wanne
238993745e
- bugfix: Wrong AP deduction if a merc punches the enemy
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-01 21:25:48 +00:00
Wanne
7a1987665d
- bugfix: Ira invisible bug in rebel basement
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-31 12:06:35 +00:00
Wanne
8ffc401690
- bugfix: Gabby did not show up in Sci-Fi mode. Now Gabby is randomly located in sector H11 or I4
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-16 23:36:59 +00:00
Wanne
189196eb79
- bugfix: Tracer bullets animation starts some tiles away of where the shooter is
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-16 20:38:37 +00:00
Lesh
f8b3f82cfc
- memory leaking killer pack
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-10 12:25:17 +00:00
Wanne
af63c20214
- bugfix: Mary & John cannot be escorted if you have 16 mercs in your team
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-03 21:09:49 +00:00
Lesh
cb12aacadc
- added ability to use ogg-files in speech sound files.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@642 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-12-02 12:10:47 +00:00
Lesh
49c33bfdfb
- bug fix: reinforcements
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-19 14:04:11 +00:00
Lesh
0f2aad2850
- army externalization
...
- bugfix: proper sam site marking for Strategic AI
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-14 14:32:32 +00:00
Wanne
c351c27e37
- bugfix: Endless clock after stealing
...
- changed: APs for stealing from 10 to 14 (because stealing is more than simple picking enemies gun)
- changed: You cannot steal items from head, body, leg or face until the enemy is collapsed (lying on the ground)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-13 08:36:36 +00:00