projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-15 00:07:39 -04:00
Code Issues Projects Releases Wiki Activity
3,312 Commits 11 Branches 4 Tags
e4cacd26ecfab0a51abb206bdca8a682547f7461
Commit Graph
212 Commits
Author SHA1 Message Date
Treeku 60eee0d4dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-11 15:56:36 +01:00
Treeku 7fd08bc7ad Baseline changes, cleaned some things 2014-05-11 09:54:50 +01:00
Treeku 837e07d822 Respawn functionality 
(might want to be moved to spawnService)
 2014-05-11 09:29:38 +01:00
Waverunner d38bc9eb29 Changed CmdStartScene to use galacticTime 
This should fix the time of day's being incorrect when using multiple
clients
 2014-05-10 17:13:06 -04:00
Waverunner f8c26e9658 Fixed customization delta, changed bounty list to bounty map, added SurveyMissionObjective 2014-05-06 19:08:00 -04:00
Light2 ce15656ff3 begin work on vendors, fixed highestid sql query(might fix crash bug) 2014-05-06 00:55:02 +02:00
Light2 3f7e3d50f8 fixed load in bug 2014-05-04 23:01:38 +02:00
Light2 ae33de15c5 fixed tons of null pointers after loading objects from db 2014-05-04 22:47:05 +02:00
Treeku 541bffa942 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-04 18:56:34 +01:00
Treeku 94c2f19ed4 Removed reuse_item condition from timer items 2014-05-04 18:41:14 +01:00
Waverunner 44678d8c18 Merge 2014-05-03 18:10:55 -04:00
Waverunner 7860a8b668 Added Tracking Droids, refined Bounty Missions 
A few things need to be done like the stacks for the droids. Right now
they won't be destroyed from inventory until this is implemented.
 2014-05-03 18:03:00 -04:00
Light2 815521c2fe Implemented agressive AI and assist behaviour, added health regen task to ai 
Use the prima guide to get assist range of mobs
 2014-05-03 19:57:02 +02:00
Light2 ba6d2652b9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 18:12:47 +02:00
Light2 f05da881ab Fixed odb bugs, fixed some null pointers 2014-05-03 18:12:27 +02:00
Treeku ff827a2902 Fixed null error 2014-05-02 22:08:13 +01:00
Treeku 57dcb72718 Additional null checks 2014-05-02 21:24:37 +01:00
Treeku 78569244b8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-02 21:15:57 +01:00
Treeku 5e522cf03b Added getObjectByFirstName null checks 2014-05-02 21:12:45 +01:00
Light2 5d4bf6a0a2 odb fix 2014-05-02 20:51:44 +02:00
Waverunner 3f049e615b Merge 2014-05-01 16:29:05 -04:00
Waverunner 7a6360e235 Comm message when accepting bounties, basework for probe droids 2014-05-01 16:14:20 -04:00
Light2 536b51d953 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
 2014-05-01 21:08:20 +02:00
Light2 7d457101f3 Refactored odb system (read extended), added implementation of Dynamic World Spawns 
ODB no longer uses DPL layer of Berkeley DB, persistent classes have to
implement the Serializable interface, annotations are no longer used,
use transient modifier for variables that should not be persistent.
Entity reference errors will no longer occur, however it is better to
use ids if the entity that is being referenced is stored in the db too!
(or you will have two different objects). DB is cached for 5 minutes
then it will write its log/cache to disk, transactions are no longer
used.
 2014-05-01 20:33:38 +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 2de5cbe362 Static object and doid fixes 2014-04-29 19:41:05 +01:00
Treeku 29e78e1d0d Made doids more precise 2014-04-29 08:35:18 +01: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 73f8ad85bc useObject adds the UseTarget 2014-04-29 04:49:42 +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
Light2 97743da840 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-28 16:17:40 +02:00
Light2 a740e0c6ca bazaar retrieve item fix 2014-04-28 16:17:31 +02:00
CharonInferar 25de95b310 Merge pull request #533 from tacef/master 
Continued Work on Playerhouse deed
 2014-04-26 15:42:45 +02:00
tacef caf9bf2f4b Updated Objectservice 
to just load playerdeed out of TCG and Saga_system
 2014-04-26 15:40:12 +02:00
tacef 3e5e748d6b Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-26 15:19:44 +02:00
Treeku c1505e5974 Moved resource functions to resourceService 2014-04-26 00:36:13 +01:00
Treeku 61748a3545 Some more skillMod improvements 2014-04-26 00:25:25 +01:00
Treeku 632d157074 Merge pull request #524 from tacef/master 
Continued work on Playerhouse deeds
 2014-04-25 21:18:00 +01:00
tacef 061adee910 Continued work on Playerhouse deeds 
Added some more houses(need more testing when elevators work)
Also altered objectservice to work with tcg houses
 2014-04-25 17:42:05 +02:00
CharonInferar e877a44713 Jedi Loot templates inserted 
Buried treasure loot realized
 2014-04-25 01:49:50 +02:00
tacef 2355215567 Added more Houses, reed description 
Added Guildhalls
Started preliminary City hall for testing
Altered Objectservice to work with guild and city deeds
Altered SUI Service to support the new folderstructure for structures
and harvesters
Fixed Structureterminal Radial
 2014-04-21 22:45:58 +02:00
Treeku 50e88d2300 Cut down a few warnings 2014-04-18 22:38:07 +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
Light2 0ec275cf7b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/bazaar/BazaarService.java
 2014-04-15 01:12:44 +02:00
Light2 bd0a30aa96 Added basic bazaar functionality - see extended 
Categories are not working right now, Auctions and Vendors are not yet
implemented
 2014-04-15 01:11:33 +02:00
Treeku db3f0368a0 Items now have cooldowns and play anims 
Grenades, heal stims, heavy weapons.

Heavy weapons seem to be considered usable items and it calls the heavy
weapon command dependent on the template in template_command_mapping.

You can't fire it from the toolbar due to a checkbox.
 2014-04-14 11:55:40 +01:00
CharonInferar a99edcc2bc restored file 2014-04-13 23:08:29 +02:00