Treeku
dba74a6ebc
Fixed calculatePvpStatus
2014-05-03 15:32:07 +01:00
Waverunner
66002081ea
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/resources/common/BountyListItem.java
2014-04-30 15:57:30 -04:00
Waverunner
6e9be7e610
Setting bounties now accounts for all of your available funds
2014-04-30 15:54:44 -04:00
CharonInferar
4f2b50fa97
merge conflict
2014-04-30 19:58:18 +02:00
Waverunner
ea9a1fdd82
Added setting of player bounties
...
Mission for bounties still needs to be ironed out so you won't see them
in the bounty mission terminal, however you can now set bounties for
players.
2014-04-29 17:49:03 -04:00
Treeku
af64aae9f1
Fixed merge clashes
2014-04-29 05:33:16 +01:00
Treeku
02ff93312e
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
scripts/houses/player_house_corellia_large_style_01.py
scripts/houses/player_house_corellia_large_style_02.py
src/resources/objects/tangible/Deed.java
src/resources/objects/tangible/Harvester_Deed.java
src/resources/objects/tangible/Player_House_Deed.java
src/services/PlayerService.java
src/services/object/ObjectService.java
2014-04-29 05:04:23 +01:00
Treeku
de296b4db2
More removed DeedObject stuff
...
Also changed attachments to use ids instead of objects. Best to use Ids
otherwise issues such as objects not deleting successfully occur, if not
outright causing persistence errors during saving.
2014-04-29 03:48:32 +01:00
Waverunner
b0e2a490f6
Changes to MissionObjective, started working on player bounties
2014-04-28 17:37:23 -04:00
Treeku
9fc30d10c4
Removed DeedObject, made buildings simpler
2014-04-28 22:07:32 +01:00
CharonInferar
76f9ff6be8
Merge remote-tracking branch 'origin/master' into PlayerCityUpdate
2014-04-26 01:30:41 +02:00
CharonInferar
0c2f4b29a0
Grant zoning added
...
test with 2 player chars to increase population to 2 citizens after
zoning and declare residence.
2014-04-26 01:18:18 +02:00
CharonInferar
e877a44713
Jedi Loot templates inserted
...
Buried treasure loot realized
2014-04-25 01:49:50 +02:00
CharonInferar
db8365cea3
Merge remote-tracking branch 'origin/master' into TreasureMaps
2014-04-20 17:07:58 +02:00
CharonInferar
ea947869eb
Added foraged items and worms
...
worms spawn
Enzymes and maps can be foraged
2014-04-19 23:56:15 +02:00
Treeku
b4a6ac5334
Fixed a chat crash bug
2014-04-19 08:30:12 +01:00
CharonInferar
f8909fbda1
Command and animation done
2014-04-19 05:08:37 +02:00
Treeku
b050065649
Languages implemented, added OOB to spatialchat
2014-04-19 03:27:08 +01:00
Treeku
e8a1959f9d
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
scripts/radial/vehicle.py
src/main/NGECore.java
src/resources/objects/creature/CreatureObject.java
src/resources/objects/player/PlayerObject.java
src/resources/objects/tangible/TangibleObject.java
src/services/SimulationService.java
src/services/combat/CombatService.java
src/services/object/ObjectService.java
2014-04-18 21:10:53 +01:00
Treeku
f58b7b6a5b
Overhauled Mounts (still buggy)
2014-04-18 19:09:45 +01:00
Waverunner
9252ebaaea
Added Enter & Leave Messages for ChatRooms as well as info stats for the
...
room
2014-04-17 16:01:12 -04:00
Waverunner
da20b779cf
Temporarily Fixes #442 : Position secured cant be removed
...
The problem related to doSelfBuff always calling and thinking that the
position secured buff wanted to be added all the time, which isn't the
case. Right now I added a hasBuff check to doSelfBuff for the position
secured buff which will remove the buff. I didn't want to flat out just
remove a buff no matter what command was called because that would
affect any buffs that wanted to be refreshed and not removed.
2014-04-16 18:51:32 -04:00
Waverunner
2127ff1f6f
Removed import in GroupChat and PlanetChat scripts
2014-04-16 17:57:15 -04:00
Waverunner
ff6c2d7d4c
Added GroupChat, PlanetChat, and basic chat channels
2014-04-16 16:52:11 -04:00
Seefo
77bea7604e
Fixed an error in the setgodmode command
2014-04-16 13:35:00 -04:00
Treeku
fcba41a40e
Merge pull request #445 from Ziggeh/master
...
Added some setbonus scripts and other misc stuff
2014-04-16 16:41:41 +01:00
CharonInferar
b36081e630
Improvements on loot system
...
Loot icon
Loot system messages
2014-04-16 17:18:59 +02:00
Ziggeh
af2f1d6dc4
Merge remote-tracking branch 'upstream/master'
2014-04-16 16:46:46 +02:00
Ziggeh and CharonInferar
f12ad61a9f
Refactored WeaponObject
...
The scripting of weapons should be much, much easier now. See the
included examples in DevService.
Attributes such as attack speed and range are now being read/written to
the actual items attributes.
2014-04-14 19:58:43 +02:00
Treeku
9f75c370ab
Merge pull request #424 from Ziggeh/master
...
Refactored WeaponObject
2014-04-14 16:34:55 +01:00
Ziggeh
7472def68a
Items - Added Heroism items
...
Also added a Flamethrower to the frog since we didn't have one.
2014-04-14 00:41:41 +02:00
Seefo
90fb528d5f
Fixed #423
2014-04-13 14:38:42 -04:00
Seefo
1b1294136a
Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates
2014-04-13 13:37:54 -04:00
Ziggeh
1fa24af10f
Merge remote-tracking branch 'upstream/master'
2014-04-13 19:17:23 +02:00
Ziggeh
cbefc25121
Refactored WeaponObject
...
The scripting of weapons should be much, much easier now. See the
included examples in DevService.
Attributes such as attack speed and range are now being read/written to
the actual items attributes.
2014-04-13 19:15:17 +02:00
Treeku
b436353904
godLevel is now set and used
2014-04-13 13:17:23 +01:00
Treeku
187acaf2dc
Fixed error in getfriendlist.py
2014-04-13 11:05:39 +01:00
Light2
4ae9f292be
Fixed issue where non combat commands would be created as a combat command
2014-04-12 21:20:05 +02:00
Light2
c5520abff8
Cleanup + persistence fix
2014-04-12 17:19:52 +02:00
CharonInferar
7cd8d8d742
All structure terminal menus and functionalities implemented
...
Dropped items add nowto the buildings itemlist
Some databse work for permissions
2014-04-12 02:30:17 +02:00
CharonInferar
1ab23231f6
Structure terminal work
...
Creation of player_house_deed class
terminal menus made
py scripts arranged
2014-04-11 04:14:29 +02:00
CharonInferar
a1370a9b60
Harvesters introduced
...
Working harvesters and generators
Big update
2014-04-11 02:25:07 +02:00
Treeku
351910c04a
Various command bugfixes
2014-04-10 10:18:20 +01:00
Seefo
70b7507bb0
Added /movefurniture & /rotatefurniture, see ext.
...
The permission system thing I'm doing needs to be adjusted to the
Container permission system in the Engine.
To Light: Please contact me in regards to this
2014-04-09 19:53:11 -04:00
Seefo
46c2c1bf2c
Preliminary housing
2014-04-08 23:47:59 -04:00
Treeku
b6045f85dc
Added alias "afk" for "toggleawayfromkeyboard"
2014-04-07 09:29:19 +01:00
Waverunner
494bd4a8ad
GMs can now get the accountId of the target (getplayerid)
2014-04-06 17:42:08 -04:00
Waverunner
730b446f02
Change holoemote cooldown to seconds
2014-04-06 14:42:02 -04:00
CharonInferar
348b6b7f55
Cleanup of options.cfg
...
Used kneel py for spawning tools, replaced it with original
2014-04-06 04:44:40 +02:00
CharonInferar
e448a41bb0
Merge remote-tracking branch 'origin/master' into ResourceSpawn
...
Conflicts:
src/main/NGECore.java
src/services/DevService.java
src/services/command/CommandService.java
2014-04-06 03:59:55 +02:00
Treeku