projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity
2,102 Commits 11 Branches 4 Tags
682e04da5d7fc9c82640370b54fd921b74e2d249
Commit Graph
1315 Commits
Author SHA1 Message Date
Light 682e04da5d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-18 00:42:01 +02:00
Light c990690726 Implemented PvP Zones 2014-05-18 00:40:45 +02:00
Waverunner a92a3675b2 Merge pull request #678 from Ziggeh/master 
Buffs - add() and remove() no longer used
 2014-05-17 18:03:23 -04:00
Treeku 8bca0d625d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-17 22:15:55 +01:00
Treeku 28ccc21d10 Fixed some nulls that can occur locally 2014-05-17 22:01:33 +01:00
Light 499e4aa877 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-17 19:56:17 +02:00
Light f1096094d0 fixed some mobile bugs 2014-05-17 19:56:00 +02:00
Treeku 424cc8fe23 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-17 18:42:12 +01:00
Treeku 94667c1f17 Added a Static Object constructor for convenience 2014-05-17 18:40:47 +01:00
Treeku ce613c638d Fixed minor error 2014-05-17 17:48:25 +01:00
Ziggeh 9d99462dd0 Buffs - add() and remove() no longer used 2014-05-17 15:27:29 +02:00
Treeku 8390234880 Merge pull request #674 from Ziggeh/master 
Minor CombatService enhancement
 2014-05-17 09:49:55 +01:00
Treeku 5da4f05c62 Added GM reporting of buildingId in buildings 2014-05-16 15:16:04 +01:00
Ziggeh c07454533b Minor changes to CombatService 2014-05-16 15:29:40 +02:00
Treeku 84af262129 Fixed syntax err with previous commit 2014-05-16 11:57:27 +01:00
Treeku 721ed17050 Added cellId null check for static obj scripts 2014-05-16 11:56:34 +01:00
Treeku c2806c4ceb Updated java src files to diff prose constructor 2014-05-16 10:21:42 +01:00
Treeku e5d4577a4b Changed option to options to avoid confusion 
To avoid confusion over why setOptionsBitmask produces "no such
attribute" error.
 2014-05-16 09:05:53 +01:00
Treeku cfa25d4f0f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-16 08:28:30 +01:00
Treeku 67f9b2e6e6 Added getCellByCellName to BUIO 
For Levarris
 2014-05-16 08:03:10 +01:00
Treeku e763da8d61 Refactored BUIO 2014-05-16 08:01:27 +01:00
Ziggeh ddd35d5c97 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-15 22:45:48 +02:00
Treeku 212d2cf38c Fixed quadtree insert error with static objects 2014-05-15 13:28:53 +01:00
Treeku c0f2c5dddb Delete Prose constructors that clash with new one 2014-05-15 05:27:35 +01:00
Treeku ea32f86c8a Moved equipment service to equipment folder 2014-05-15 05:14:20 +01:00
Waverunner 8e6ac5213b Player Association Access added to datapad on creation, added guildId delta, changed getGuildList to return SWGSet<Guild> 2014-05-14 17:12:46 -04:00
Treeku 4d5c05aa39 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-14 20:39:32 +01:00
Treeku 737b24d3b9 Changed guildList to a Set, changed STAO 2014-05-14 20:39:03 +01:00
Waverunner 3443856857 Fixed #657: Reset expertise does not remove buffs 2014-05-14 14:55:59 -04:00
Waverunner fab8636fa1 Fixed #655: Groupchat you can post in it only via using "ctrl + g" 2014-05-14 14:45:24 -04:00
Treeku fa4816921e Refactored GUILD object 2014-05-14 17:11:22 +01:00
Treeku 865db149ad Fixed loads of warnings 2014-05-14 15:51:25 +01:00
Treeku ed0811672f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-14 14:59:05 +01:00
Treeku c564a016e4 Refactored TANO 2014-05-14 14:57:49 +01:00
Waverunner d2164ce8b6 Added option to clean odb folders on startup 
Change 0 to 1 to enable this feature in options.cfg
 2014-05-13 20:32:49 -04:00
Waverunner 34a7a58089 Create Guild script for PDA, PDA Added to Frog, moved GuildService 
Note that the PDA is only available on the frog if you have GM access right now.
 2014-05-13 18:59:24 -04:00
Treeku f9c542063a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-13 09:24:06 +01:00
Treeku 7f88fefe2e Fixed force run 2014-05-13 09:22:30 +01:00
Treeku f38a4a8885 Fixed #611 2014-05-13 09:04:05 +01:00
Treeku 58d735b884 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	ngengine_public.jar
 2014-05-13 03:58:21 +01:00
Treeku 35acbd75d4 Changed STF.get() to Stf class 2014-05-13 03:39:41 +01:00
Treeku d6de965242 Fixed object initialisation error 2014-05-13 03:38:52 +01:00
Treeku 0ddd645b7e Fixed bounty hunter null exception 2014-05-13 02:56:34 +01:00
Light2 fea0ddbe75 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-12 19:48:21 +02:00
Light2 4a100d9ae3 fixed loading errors 2014-05-12 19:47:57 +02:00
Treeku 3ac422a8bb Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-12 17:50:59 +01:00
Treeku f3f9da7965 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/intangible/IntangibleObject.java
 2014-05-12 17:50:08 +01:00
Light2 7fc5c44817 Moved loot groups to mobile template scripts, moved respawn time to spawn service as last argument 
Please no longer use loot in object template scripts and move them over
to the mobiles/ folder.
 2014-05-12 18:42:15 +02:00
Treeku 08ba6b0c1b Applied grantLevel reward fix to giveExperience 2014-05-12 17:40:51 +01:00
Light2 46a890ed92 fixed deadlocks caused by stacked synchronized's 2014-05-12 17:49:16 +02:00