swgemu /core3/branches

CombatTest
  •  

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 4
Last Commit: 29 Feb 12
Commits this week: 0
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading

Subversion Details

1 property
  • svn:ignore = autom4te.cache
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 29 Feb 2012
10:17 am

TheAnswer

[deleted] old branch
[deleted] old branch
Options
  1. ./CombatTest
  2. ./bin/scripts/creatures/objects
  3. ./bin/scripts/creatures
  4. ./bin/scripts
  5. ./bin
    • -82
    • +0
    ./src/server/login/packets/LoginClusterStatus.h
  7. ./src/server/login/packets
  8. ./src/server/login
  9. ./src/server
  10. ./src
    • -404
    • +0
    ./src/server/zone/objects/tangible/TangibleObject.h
  12. ./src/server/zone/objects/tangible
  13. ./src/server/zone/objects
  14. ./src/server/zone
    • -66
    • +0
    ./src/server/zone/managers/object/ObjectMap.h
  16. … 5265 more files in changeset.
Thursday 01 Jan 2009
7:46 am

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

Missed a fix

Options
    • -6
    • +5
    ./src/server/zone/objects/player/PlayerImplementation.cpp
7:27 am

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[merged] Merged latest trunk in preparation for merging combat test code back to the trunk.

Options
    • -1
    • +1
    ./bin/scripts/creatures/objects/tatooine/npcs/tusken/tuskenExecutioner.lua
    • -0
    • +0
    ./sql/updates/r558_indexOptimization.sql
    • -0
    • +0
    ./bin/scripts/items/bluefrog/statePackSet.lua
    • -3
    • +3
    ./bin/scripts/items/objects/camokit/tatooineKit.lua
    • -12
    • +13
    ./bin/scripts/creatures/objects/space/corellianCorvette/rebel/corvetteRebelRearAdmiral.lua
    • -0
    • +0
    ./bin/scripts/crafting/objects/draftschematics/artisan/novice/genericCraftingTool.lua
    • -0
    • +0
    ./bin/scripts/items/bluefrog/enhancePackSet.lua
    • -0
    • +0
    ./bin/scripts/sceneobjects/spawns/dantooine/creatureLairSpawns.lua
    • -5
    • +42
    ./src/server/zone/objects/tangible/weapons/ThrowableWeaponImplementation.cpp
    • -0
    • +0
    ./bin/scripts/crafting/objects/draftschematics/artisan/novice/bofaTreat.lua
    • -0
    • +0
    ./bin/scripts/items/objects/clothing/bandolier/ithDoubleBandolier.lua
    • -12
    • +12
    ./src/server/zone/managers/planet/HeightMapPlane.h
    • -0
    • +0
    ./sql/updates/r557_loottable.sql
    • -24
    • +25
    ./bin/scripts/creatures/objects/npcs/rebel/rebelStaffCorporal.lua
    • -26
    • +34
    ./bin/scripts/creatures/objects/naboo/creatures/pekoPekoAlbatross.lua
  16. … 355 more files in changeset.
Wednesday 31 Dec 2008
4:17 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[fixed] More bugs

Options
    • -15
    • +0
    ./src/server/zone/objects/creature/CreatureObject.idl
    • -0
    • +17
    ./src/server/zone/objects/creature/Creature.idl
    • -759
    • +520
    ./src/server/zone/objects/creature/CreatureObject.cpp
    • -75
    • +314
    ./src/server/zone/objects/creature/Creature.cpp
    • -46
    • +4
    ./src/server/zone/objects/creature/CreatureObjectImplementation.cpp
    • -0
    • +46
    ./src/server/zone/objects/creature/CreatureImplementation.cpp
    • -48
    • +0
    ./src/server/zone/objects/creature/CreatureObject.h
    • -0
    • +48
    ./src/server/zone/objects/creature/Creature.h
    • -97
    • +2
    ./src/server/zone/objects/creature/CreatureObjectImplementation.h
    • -0
    • +95
    ./src/server/zone/objects/creature/CreatureImplementation.h
2:01 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Update engine and databases to latest builds

[fixed] Server crashes

[Note] Still some minor bugs but this code should be stable.

Options
    • -0
    • +17
    ./src/server/zone/objects/creature/CreatureObject.idl
    • -16
    • +0
    ./src/server/zone/objects/creature/Creature.idl
    • -9
    • +6
    ./src/server/zone/objects/player/Player.idl
    • -4
    • +5
    ./src/server/zone/managers/skills/ScriptAttacksManager.h
    • -21
    • +73
    ./src/server/zone/objects/creature/CreatureObjectImplementation.cpp
    • -47
    • +3
    ./src/server/zone/objects/creature/CreatureImplementation.cpp
    • -98
    • +376
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -3
    • +1
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -0
    • +95
    ./src/server/zone/objects/creature/CreatureObjectImplementation.h
    • -9
    • +0
    ./src/server/zone/objects/player/professions/SkillBox.h
    • -95
    • +0
    ./src/server/zone/objects/creature/CreatureImplementation.h
    • -17
    • +13
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -6
    • +0
    ./src/server/zone/managers/skills/SkillManager.cpp
    • -1
    • +1
    ./src/server/zone/packets/object/ObjectControllerMessage.cpp
    • -74
    • +37
    ./src/server/zone/packets/ui/SuiCreatePageMessage.h
  16. … 16 more files in changeset.
Monday 29 Dec 2008
9:46 am

panchjr

NOTE: This is a Combat test server update…
NOTE: This is a Combat test server update

*** Do not use this revision, it is unstable ***

[added] Full merge up to trunk version 1077

[NOTE] This is the result of the merge and compile fixes. As merge can do strange things it is not fully stable. Please wait for the stable release.

Options
    • -9
    • +9
    ./src/server/zone/objects/draftschematic/DraftSchematicExpPropGroup.idl
    • -79
    • +77
    ./bin/scripts/creatures/objects/dathomir/creatures/purboleYouth.lua
    • -0
    • +13
    ./bin/scripts/skills/playerSkills/combat/combatMedic.lua
    • -0
    • +144
    ./bin/scripts/creatures/objects/rori/npcs/cobral/cobralThug.lua
    • -0
    • +144
    ./bin/scripts/creatures/objects/naboo/npcs/gungan/gunganGeneral.lua
    • -79
    • +76
    ./bin/scripts/creatures/objects/tatooine/creatures/minorWorrt.lua
    • -79
    • +77
    ./bin/scripts/creatures/objects/rori/creatures/feralForestMiteKing.lua
    • -74
    • +0
    ./bin/scripts/skills/creatureSkills/tatooine/creatures/jundlandEopieAttacks.lua
    • -1
    • +1
    ./src/server/zone/packets/player/FriendStatusChangeMessage.h
    • -3
    • +3
    ./src/server/zone/objects/tangible/pharmaceutical/StatePackImplementation.h
    • -1
    • +10
    ./src/server/zone/packets/object/ObjectControllerMessage.h
    • -79
    • +77
    ./bin/scripts/creatures/objects/naboo/creatures/gualamaPatriarch.lua
    • -0
    • +143
    ./bin/scripts/creatures/objects/dathomir/npcs/fsShadow/shadowOutlawNonaggro.lua
    • -0
    • +144
    ./bin/scripts/creatures/objects/naboo/npcs/gungan/gunganKaaduRider.lua
    • -0
    • +143
    ./bin/scripts/creatures/objects/corellia/npcs/corsec/corsecChiefAggro.lua
  16. … 3326 more files in changeset.
Tuesday 23 Dec 2008
3:53 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Do not use this build.

Stage 1 in updating Combat Test to match trunk.

Options
    • -2
    • +2
    ./bin/scripts/creatures/objects/naboo/creatures/rogueFambaa.lua
    • -1
    • +1
    ./bin/scripts/creatures/objects/naboo/creatures/diseasedNuna.lua
    • -3
    • +3
    ./bin/scripts/creatures/objects/tatooine/creatures/kreetleSwarming.lua
    • -2
    • +2
    ./bin/scripts/creatures/objects/dathomir/creatures/purboleYouth.lua
    • -0
    • +0
    ./bin/scripts/items/bluefrog/enhancePackSet.lua
    • -2
    • +2
    ./bin/scripts/creatures/objects/tatooine/creatures/minorWorrt.lua
    • -8
    • +9
    ./bin/scripts/creatures/objects/endor/creatures/blurrgHunter.lua
    • -2
    • +2
    ./bin/scripts/creatures/objects/yavin4/creatures/frenziedChoku.lua
    • -4
    • +4
    ./bin/scripts/creatures/objects/rori/creatures/feralForestMiteKing.lua
    • -86
    • +0
    ./bin/scripts/crafting/objects/draftschematics/artisan/chemicalSurveyDevice.lua
    • -2
    • +2
    ./bin/scripts/creatures/objects/npcs/rebel/rebelScout.lua
    • -2
    • +2
    ./bin/scripts/creatures/objects/naboo/creatures/gualamaPatriarch.lua
    • -2
    • +2
    ./bin/scripts/creatures/objects/corellia/npcs/meatlump/meatlumpClod.lua
    • -8
    • +9
    ./bin/scripts/creatures/objects/endor/creatures/blurrgSandCrawler.lua
    • -3
    • +3
    ./bin/scripts/creatures/objects/dantooine/creatures/mammothThune.lua
  16. … 1632 more files in changeset.
Monday 22 Dec 2008
3:21 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Build using MMOEngine version 902

[fixed] Server crash

[added] Lightsaber toughness

Options
    • -10
    • +15
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -33
    • +37
    ./src/server/zone/objects/scene/SceneObjectImplementation.cpp
Monday 15 Dec 2008
11:16 am

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Build using MMOEngine version 902

[added] Toughness for melee professions

Options
    • -1
    • +21
    ./src/server/zone/managers/combat/CombatManager.cpp
Sunday 14 Dec 2008
5:17 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Build using MMOEngine version 902

[fixed] Unarmed damage

[fixed] Armour piercing code

Thanks to Nalgol for clarifying how these worked pre-cu

Options
    • -37
    • +34
    ./src/server/zone/managers/combat/CombatManager.cpp
3:21 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Build using MMOEngine version 902

[added] The basic structure for amour calculations.

[added] Player and creature armour.

[fixed] Rationalised creature and player objects code

Options
    • -17
    • +0
    ./src/server/zone/objects/creature/CreatureObject.idl
    • -0
    • +16
    ./src/server/zone/objects/creature/Creature.idl
    • -1
    • +1
    ./src/server/zone/objects/player/Player.idl
    • -62
    • +0
    ./src/server/zone/objects/creature/CreatureObjectImplementation.cpp
    • -0
    • +46
    ./src/server/zone/objects/creature/CreatureImplementation.cpp
    • -64
    • +160
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -0
    • +2
    ./src/server/zone/objects/tangible/wearables/Armor.idl
    • -95
    • +0
    ./src/server/zone/objects/creature/CreatureObjectImplementation.h
    • -0
    • +95
    ./src/server/zone/objects/creature/CreatureImplementation.h
    • -2
    • +5
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -0
    • +1
    ./src/server/zone/managers/combat/CombatManager.h
    • -17
    • +18
    ./src/server/zone/packets/object/ObjectControllerMessage.cpp
    • -1
    • +5
    ./src/server/zone/objects/tangible/wearables/ArmorImplementation.h
    • -1002
    • +743
    ./src/server/zone/objects/creature/CreatureObject.cpp
    • -29
    • +268
    ./src/server/zone/objects/creature/Creature.cpp
  16. … 7 more files in changeset.
Tuesday 02 Dec 2008
2:30 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

*IMPORTANT* Build using MMOEngine version 902

[added] Complete rewrite of the Player equip/unequip code. Items should now correctly occupy more than one body location for equip/unequip purposes. Wookie armour now provides correct coverage and the structure is in place to implement min-suits.

Options
    • -0
    • +4
    ./src/server/zone/objects/tangible/wearables/ArmorImplementation.h
    • -15
    • +0
    ./src/server/zone/objects/tangible/wearables/WearableImplementation.h
    • -3
    • +11
    ./src/server/zone/objects/player/Player.idl
    • -340
    • +422
    ./src/server/zone/objects/player/Player.cpp
    • -464
    • +119
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -2
    • +15
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -0
    • +2
    ./src/server/zone/objects/tangible/wearables/Armor.idl
    • -8
    • +25
    ./src/server/zone/objects/player/Player.h
    • -17
    • +17
    ./src/server/zone/managers/item/ItemManagerImplementation.cpp
    • -45
    • +64
    ./src/server/zone/objects/tangible/wearables/Armor.cpp
    • -19
    • +30
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -0
    • +556
    ./src/server/zone/objects/player/EquippedItems.h
    • -0
    • +4
    ./src/server/zone/objects/tangible/wearables/Armor.h
    • -50
    • +0
    ./src/server/zone/objects/player/Clothing.h
Saturday 22 Nov 2008
4:14 pm

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[fixed] proper experience in a group (divided by number in group)

[added] consider levels (including group con levels)

Options
    • -0
    • +4
    ./src/server/zone/objects/group/GroupObject.idl
    • -2
    • +2
    ./src/server/zone/objects/player/Player.idl
    • -1
    • +22
    ./src/server/zone/objects/group/GroupObjectImplementation.cpp
    • -4
    • +48
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -0
    • +8
    ./src/server/zone/objects/group/GroupObjectImplementation.h
    • -2
    • +2
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -1
    • +1
    ./src/server/zone/packets/object/ObjectControllerMessage.cpp
    • -0
    • +5
    ./src/server/zone/packets/creature/CreatureObjectDeltaMessage6.h
    • -0
    • +5
    ./src/server/zone/packets/group/GroupObjectDeltaMessage6.h
    • -0
    • +38
    ./src/server/zone/objects/group/GroupObject.cpp
    • -10
    • +12
    ./src/server/zone/objects/player/Player.cpp
    • -0
    • +8
    ./src/server/zone/objects/group/GroupObject.h
    • -4
    • +4
    ./src/server/zone/objects/player/Player.h
    • -2
    • +0
    ./src/server/zone/managers/player/PlayerManagerImplementation.cpp
    • -1
    • +1
    ./src/server/zone/managers/item/ItemManagerImplementation.cpp
  16. … 3 more files in changeset.
Thursday 20 Nov 2008
1:45 pm

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[fixed] Some teaching skill text bugs

[updated] changed the way apprentice xp awards

Options
    • -6
    • +10
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -2
    • +13
    ./src/server/zone/managers/sui/SuiManager.cpp
    • -1
    • +0
    ./src/server/zone/objects/player/professions/profession/FourByFourProfession.h
    • -1
    • +0
    ./src/server/zone/objects/player/professions/profession/PyramidProfession.h
    • -10
    • +0
    ./src/server/zone/objects/player/professions/SkillBox.h
    • -1
    • +0
    ./src/server/zone/objects/player/professions/profession/OneByFourProfession.h
Wednesday 19 Nov 2008
1:40 pm

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[fixed] crashes on killing creatures

[added] player teaching

[fixed] scout and medic xp rewards correctly now

Options
    • -0
    • +12
    ./src/server/zone/objects/player/Player.idl
    • -7
    • +0
    ./src/server/zone/objects/creature/skills/target/HealStateTargetSkill.h
    • -9
    • +50
    ./src/server/zone/objects/creature/trainer/TrainerCreatureImplementation.cpp
    • -7
    • +0
    ./src/server/zone/objects/creature/skills/target/HealEnhanceTargetSkill.h
    • -7
    • +0
    ./src/server/zone/objects/creature/skills/target/CureTargetSkill.h
    • -0
    • +106
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -1
    • +0
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -0
    • +43
    ./src/server/zone/managers/radial/RadialManager.cpp
    • -0
    • +1
    ./src/server/zone/objects/player/professions/profession/PyramidProfession.h
    • -0
    • +14
    ./src/server/zone/objects/player/professions/SkillBox.h
    • -0
    • +42
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -0
    • +61
    ./src/server/zone/packets/object/ObjectControllerMessage.cpp
    • -0
    • +3
    ./src/server/zone/managers/radial/RadialManager.h
    • -1
    • +1
    ./src/server/zone/objects/player/sui/messagebox/SuiMessageBoxImplementation.cpp
    • -0
    • +39
    ./src/server/zone/packets/ui/SuiCreatePageMessage.h
  16. … 13 more files in changeset.
Sunday 16 Nov 2008
6:02 am

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[fixed] last patch

[fixed] damage caused by creatures

[fixed] creatures no longer regenerate HAM in combat

[fixed] creatures slightly easier to hit

Options
    • -7
    • +12
    ./src/server/zone/objects/creature/CreatureObjectImplementation.cpp
    • -8
    • +9
    ./src/server/zone/managers/combat/CombatManager.cpp
Saturday 15 Nov 2008
1:18 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[fixed] many small combat code fixes

[fixed] code tidy

Options
    • -7
    • +7
    ./src/server/zone/objects/tangible/generic/DiceImplementation.h
    • -1
    • +5
    ./src/server/zone/objects/creature/skills/target/AttackTargetSkill.h
    • -396
    • +429
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -123
    • +2
    ./src/server/zone/objects/creature/skills/target/attack/DirectPoolAttackTargetSkill.h
    • -0
    • +1
    ./src/server/zone/managers/combat/CombatManager.h
    • -2
    • +2
    ./bin/scripts/items/objects/weapons/survivalKnife.lua
    • -99
    • +2
    ./src/server/zone/objects/creature/skills/target/attack/RandomPoolAttackTargetSkill.h
Thursday 13 Nov 2008
1:18 pm

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[fixed] fixed the one-hit kill no-xp bug

[added] attack skill types initially for xp tracking

[fixed] jedi xp should now award for powers properly

Options
    • -1
    • +4
    ./src/server/zone/objects/tangible/weapons/WeaponImplementation.cpp
    • -2
    • +18
    ./src/server/zone/objects/creature/skills/target/AttackTargetSkill.h
    • -1
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/DotPoolAttackTargetSkill.h
    • -1
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/ForcePowersPoolAttackTargetSkill.h
    • -2
    • +3
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -2
    • +2
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -1
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/DirectPoolAttackTargetSkill.h
    • -0
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/WoundsDirectPoolAttackTargetSkill.h
    • -1
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/DeBuffAttackTargetSkill.h
    • -1
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/WeaponlessDotPoolAttackSkill.h
    • -1
    • +1
    ./src/server/zone/managers/combat/CombatManager.h
    • -2
    • +2
    ./src/server/zone/objects/tangible/weapons/jedi/OneHandedJediWeaponImplementation.h
    • -1
    • +1
    ./src/server/zone/objects/creature/skills/target/attack/RandomPoolAttackTargetSkill.h
    • -5
    • +26
    ./src/server/zone/objects/scene/SceneObjectImplementation.cpp
Wednesday 12 Nov 2008
12:00 am

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[fixed] Fixed the erroneous large xp rewards

[fixed] xp messages when approaching/at the xp cap

Options
    • -0
    • +1
    ./src/server/zone/objects/player/PlayerObjectImplementation.cpp
    • -2
    • +9
    ./src/server/zone/objects/scene/DamageDone.h
Sunday 09 Nov 2008
9:57 pm

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[added] entertainer xp types

[fixed] proper xp client updates

Options
    • -0
    • +5
    ./src/server/zone/objects/player/Player.idl
    • -61
    • +140
    ./src/server/zone/objects/player/Player.cpp
    • -2
    • +26
    ./src/server/zone/objects/creature/CreatureObjectImplementation.cpp
    • -1
    • +1
    ./src/server/zone/objects/player/PlayerObjectImplementation.cpp
    • -0
    • +14
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -0
    • +40
    ./src/server/zone/objects/player/events/EntertainerEvent.h
    • -0
    • +16
    ./src/server/zone/objects/player/Player.h
    • -0
    • +12
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -1
    • +30
    ./src/server/zone/packets/object/ObjectControllerMessage.cpp
Saturday 08 Nov 2008
9:51 pm

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[added] proper trainers (require xp to train non-BF skills)

Options
    • -0
    • +1
    ./src/server/zone/objects/player/PlayerObject.idl
    • -0
    • +6
    ./src/server/zone/objects/player/Player.idl
    • -5
    • +1
    ./src/server/zone/objects/tangible/weapons/WeaponImplementation.cpp
    • -18
    • +200
    ./src/server/zone/objects/creature/trainer/TrainerCreatureImplementation.cpp
    • -11
    • +10
    ./src/server/zone/objects/player/PlayerObjectImplementation.cpp
    • -2
    • +2
    ./src/server/zone/objects/creature/skills/target/CureTargetSkill.h
    • -1
    • +5
    ./src/server/zone/objects/creature/trainer/TrainerCreatureImplementation.h
    • -0
    • +4
    ./src/server/zone/objects/player/PlayerObjectImplementation.h
    • -0
    • +20
    ./src/server/zone/objects/player/PlayerImplementation.h
    • -9
    • +91
    ./src/server/zone/objects/creature/trainer/TrainerCreature.cpp
    • -115
    • +135
    ./src/server/zone/objects/player/PlayerObject.cpp
    • -415
    • +514
    ./src/server/zone/objects/player/Player.cpp
    • -2
    • +18
    ./src/server/zone/objects/creature/trainer/TrainerCreature.h
    • -0
    • +5
    ./src/server/zone/objects/player/PlayerObject.h
    • -4
    • +5
    ./src/server/zone/managers/creature/CreatureManagerImplementation.cpp
  16. … 3 more files in changeset.
Wednesday 05 Nov 2008
1:05 am

dannuic

*This is a CombatTest update*…
*This is a CombatTest update*

[reworked] reworked combat experience to account for non-weapon damage

[fixed] lua names (case-sensitive)

Options
    • -0
    • +66
    ./bin/scripts/items/objects/armor/tantel/tantelSkreejChestPlate.lua
    • -53
    • +0
    ./bin/scripts/items/objects/food/durindfire.LUA
    • -1
    • +4
    ./src/server/zone/objects/scene/SceneObjectImplementation.h
    • -53
    • +0
    ./bin/scripts/items/objects/food/garrmorl.LUA
    • -0
    • +53
    ./bin/scripts/items/objects/food/charde.lua
    • -1
    • +1
    ./src/server/zone/managers/combat/CombatManager.cpp
  7. ./bin/scripts/items/objects/pharmaceutical/woundPacks
    • -0
    • +62
    ./bin/scripts/items/objects/pharmaceutical/woundPacks/woundPackStaminaA.lua
    • -0
    • +62
    ./bin/scripts/items/objects/pharmaceutical/woundPacks/woundPackQuicknessA.lua
    • -0
    • +62
    ./bin/scripts/items/objects/pharmaceutical/woundPacks/woundPackActionA.lua
    • -0
    • +62
    ./bin/scripts/items/objects/pharmaceutical/woundPacks/woundPackStrengthA.lua
    • -0
    • +62
    ./bin/scripts/items/objects/pharmaceutical/woundPacks/woundPackHealthA.lua
    • -0
    • +62
    ./bin/scripts/items/objects/pharmaceutical/woundPacks/woundPackConstitutionA.lua
    • -53
    • +0
    ./bin/scripts/items/objects/food/vegeparsine.LUA
    • -53
    • +0
    ./bin/scripts/items/objects/food/aitha.LUA
  16. … 133 more files in changeset.
Tuesday 28 Oct 2008
7:09 am

panchjr

NOTE: This is a Combat test server update…
NOTE: This is a Combat test server update

[added] Tolbat's modified combat lua files

Options
    • -3
    • +3
    ./bin/scripts/skills/playerSkills/combat/fencer.lua
    • -1
    • +1
    ./bin/scripts/skills/playerSkills/combat/rifleman.lua
    • -2
    • +2
    ./bin/scripts/skills/playerSkills/combat/swordsman.lua
    • -3
    • +3
    ./bin/scripts/skills/playerSkills/combat/marksman.lua
    • -1
    • +1
    ./bin/scripts/skills/playerSkills/combat/teraskasiartist.lua
    • binary
    ./StatusOfCombatTestCode.doc
    • -4
    • +4
    ./bin/scripts/skills/playerSkills/combat/pistoleer.lua
Monday 27 Oct 2008
12:54 am

dannuic

*This is a CombatTest commit*…
*This is a CombatTest commit*

[modified] tweaked combat xp formula a lot (thanks Smoki)

[modified] changed jedi xp a little (some temp stuff)

[fixed] calculates player level correctly, and in the right place

Options
    • -6
    • +40
    ./src/server/zone/objects/player/PlayerImplementation.cpp
    • -12
    • +29
    ./src/server/zone/objects/scene/SceneObjectImplementation.cpp
Sunday 26 Oct 2008
5:25 pm

dannuic

*This is a CombatTest commit*…
*This is a CombatTest commit*

[added] Gaining experience from combat

Options
    • -2
    • +2
    ./src/server/zone/objects/tangible/weapons/melee/OneHandedMeleeWeaponImplementation.h
    • -0
    • +13
    ./src/server/zone/objects/scene/SceneObjectImplementation.h
    • -1
    • +19
    ./src/server/zone/objects/player/PlayerObjectImplementation.cpp
    • -0
    • +1
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -2
    • +2
    ./src/server/zone/objects/tangible/weapons/ranged/SpecialHeavyRangedWeaponImplementation.h
    • -0
    • +13
    ./src/server/zone/objects/player/professions/SkillBox.h
    • -4
    • +4
    ./src/server/zone/managers/skills/SkillManager.cpp
    • -79
    • +118
    ./src/server/zone/objects/tangible/weapons/Weapon.cpp
    • -2
    • +2
    ./src/server/zone/objects/tangible/weapons/melee/UnarmedMeleeWeaponImplementation.h
    • -399
    • +497
    ./src/server/zone/objects/player/Player.cpp
    • -0
    • +9
    ./src/server/zone/objects/tangible/weapons/Weapon.h
    • -0
    • +23
    ./src/server/zone/objects/player/Player.h
    • -2
    • +2
    ./src/server/zone/objects/tangible/weapons/melee/TwoHandedMeleeWeaponImplementation.h
    • -0
    • +3
    ./src/server/zone/objects/tangible/weapons/Weapon.idl
    • -0
    • +5
    ./src/server/zone/objects/player/Player.idl
  16. … 18 more files in changeset.
11:35 am

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[fixed] DOTs should now be able to incapacitate

Options
    • -9
    • +9
    ./src/server/zone/objects/creature/CreatureObjectImplementation.cpp
7:50 am

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[update] to core version 887

[fixed] combat code for new system

Options
    • -1
    • +2
    ./bin/scripts/creatures/objects/npcs/imperial/imperialJediKnight.lua
    • -0
    • +4
    ./src/server/zone/objects/player/sui/SuiBox.h
    • -0
    • +186
    ./src/server/zone/objects/player/sui/listbox/SuiListBoxVector.cpp
    • -168
    • +142
    ./src/server/zone/objects/creature/skills/target/CureTargetSkill.h
    • -1
    • +2
    ./bin/scripts/creatures/objects/npcs/imperial/imperialSurfaceMarshal.lua
    • -0
    • +92
    ./src/server/zone/objects/tangible/generic/GenericItem.h
    • -0
    • +67
    ./src/server/zone/managers/resource/ResourceManager.cpp
    • -16
    • +16
    ./src/server/zone/managers/combat/CombatManager.cpp
    • -1
    • +2
    ./bin/scripts/creatures/objects/npcs/imperial/imperialGeneral.lua
    • -1
    • +2
    ./bin/scripts/creatures/objects/npcs/imperial/imperialAtSt.lua
    • -2
    • +2
    ./src/server/zone/objects/tangible/pharmaceutical/WoundPack.idl
    • -1
    • +2
    ./bin/scripts/creatures/objects/npcs/rebel/rebelStaffCorporal.lua
    • -1
    • +95
    ./src/server/zone/objects/creature/recruiter/imperial/ImperialRecruiterCreatureImplementation.h
    • -0
    • +4
    ./src/server/zone/managers/planet/PlanetManager.h
    • -1
    • +2
    ./bin/scripts/creatures/objects/npcs/rebel/rebelSergeant.lua
  16. … 199 more files in changeset.
Saturday 25 Oct 2008
2:23 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[fixed] updated PvP and PvE damage equation

Options
    • -3
    • +3
    ./src/server/zone/objects/creature/skills/target/attack/DotPoolAttackTargetSkill.h
    • -3
    • +3
    ./src/server/zone/objects/creature/skills/target/attack/ForcePowersPoolAttackTargetSkill.h
    • -3
    • +3
    ./src/server/zone/objects/creature/skills/target/attack/DirectPoolAttackTargetSkill.h
    • -3
    • +3
    ./src/server/zone/objects/creature/skills/target/attack/WoundsDirectPoolAttackTargetSkill.h
    • -3
    • +3
    ./src/server/zone/objects/creature/skills/target/attack/WeaponlessDotPoolAttackSkill.h
    • -1
    • +2
    ./src/server/zone/managers/combat/CombatManager.h
    • -4
    • +3
    ./src/server/zone/objects/creature/skills/target/attack/RandomPoolAttackTargetSkill.h
1:59 pm

panchjr

NOTE: This is an update for the CombatTest code.…
NOTE: This is an update for the CombatTest code.

[updates] updated to core 873

[fixed] intimidate code

[fixed] moved more code from skills to CombatManager

Options
    • -0
    • +147
    ./bin/scripts/creatures/objects/tatooine/npcs/tusken/tuskenExecutioner.lua
    • -0
    • +148
    ./bin/scripts/creatures/objects/dantooine/npcs/janta/jantaScout.lua
    • -0
    • +147
    ./bin/scripts/creatures/objects/dantooine/npcs/warren/warrenAgroDroidS023.lua
    • -148
    • +0
    ./bin/scripts/creatures/objects/dantooine/npcs/kungaShaman.lua
    • -147
    • +0
    ./bin/scripts/creatures/objects/dantooine/npcs/warrenTeraudLoyalistCommander.lua
    • -0
    • +658
    ./bin/scripts/creatures/objects/dantooine/citys/imperialOutpost.lua
    • -147
    • +0
    ./bin/scripts/creatures/objects/dantooine/npcs/warrenAgroDroidBoss.lua
    • -0
    • +900
    ./bin/scripts/creatures/objects/endor/citys/researchOutpost.lua
    • -147
    • +0
    ./bin/scripts/creatures/objects/endor/npcs/bedraggledKorgaLaborer.lua
    • -147
    • +0
    ./bin/scripts/creatures/objects/corellia/npcs/lordNyaxFiend.lua
    • -147
    • +0
    ./bin/scripts/creatures/objects/tatooine/npcs/tuskenWitchDoctor.lua
    • -0
    • +544
    ./bin/scripts/skills/creatureSkills/npcs/imperial/bobaFettAttacks.lua
    • -0
    • +147
    ./bin/scripts/creatures/objects/corellia/npcs/lordNyax/lordNyaxDisciple.lua
    • -147
    • +0
    ./bin/scripts/creatures/objects/dathomir/npcs/nightsisterRancorTamer.lua
    • -658
    • +0
    ./bin/scripts/creatures/objects/dathomir/npcs/tradeOutpost.lua
  16. … 843 more files in changeset.
Wednesday 22 Oct 2008
6:21 am

panchjr

NOTE: This is a Combat test server update…
NOTE: This is a Combat test server update

[added] trunk updates to r 860

Options
    • -1
    • +4
    ./bin/scripts/creatures/objects/naboo/creatures/rogueFambaa.lua
    • -1
    • +3
    ./src/server/zone/objects/draftschematic/DraftSchematicExpPropGroup.idl
    • -1
    • +4
    ./bin/scripts/creatures/objects/naboo/creatures/diseasedNuna.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/tatooine/creatures/kreetleSwarming.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/dathomir/creatures/purboleYouth.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/tatooine/creatures/minorWorrt.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/endor/creatures/blurrgHunter.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/yavin4/creatures/frenziedChoku.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/rori/creatures/feralForestMiteKing.lua
    • -1
    • +4
    ./bin/scripts/creatures/objects/endor/npcs/bedraggledKorgaLaborer.lua
    • -0
    • +1
    ./bin/scripts/crafting/objects/draftschematics/artisan/chemicalSurveyDevice.lua
    • -0
    • +147
    ./bin/scripts/creatures/objects/npcs/rebel/rebelScout.lua
    • -0
    • +10
    ./src/server/zone/packets/object/ObjectControllerMessage.h
    • -1
    • +4
    ./bin/scripts/creatures/objects/naboo/creatures/gualamaPatriarch.lua
    • -0
    • +658
    ./bin/scripts/creatures/objects/dathomir/npcs/tradeOutpost.lua
  16. … 1475 more files in changeset.