Commit Graph
1689 Commits
Author SHA1 Message Date
Obique PSWG f2f9cba0c0 Fixed log timestamps (how did I not notice this before?!) 2016-02-04 09:41:21 -06:00
Obique PSWG b413dd7a56 Created function to populate building with cells -- groundwork for housing 2016-02-04 09:26:36 -06:00
Obique PSWG 273290d98c Fixed error from previous commit 2016-02-04 09:26:10 -06:00
Obique PSWG 8fa650cb55 Fixed concurrency issues in StaticService 2016-02-04 09:25:17 -06:00
Obique PSWG 543a26af20 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-02-03 17:06:51 -06:00
Obique PSWG 4e3666f1d3 Created new dev area based on the tatooine terrain 2016-02-03 17:06:37 -06:00
Obique PSWG d4989a1fd5 Removed old static sdb file 2016-02-03 16:41:02 -06:00
Obique PSWG fc584c4429 Merged in Undercova/holocore (pull request #143)
NPC updates
2016-02-03 15:54:55 -06:00
Undercova PSWG 0a112a1f1b Updated corellia.sdb 2016-02-03 21:52:11 +00:00
Undercova PSWG 6d6a3bf7ab Updated kashyyyk.sdb 2016-02-03 21:50:07 +00:00
Undercova PSWG 6f6314365a Updated lok.sdb 2016-02-03 21:49:22 +00:00
Undercova PSWG 1afeef80fc Updated yavin4.sdb 2016-02-03 21:48:51 +00:00
Undercova PSWG b0f1fcb772 Updated tatooine.sdb 2016-02-03 21:48:15 +00:00
Undercova PSWG aec9a872f5 Updated buildings.sdb 2016-02-03 21:47:23 +00:00
Obique PSWG bb2e479c94 Fixed additional cross platform issues 2016-02-03 15:44:56 -06:00
Obique PSWG 2fffe4b79f Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-02-03 15:31:47 -06:00
Obique PSWG 7def7ec49d Fixed some cross platform issues in RelationalServerFactory 2016-02-03 15:31:15 -06:00
Obique PSWG 12c1698a12 Re-created the packet debug functionality 2016-02-03 13:43:17 -06:00
Obique PSWG f66c725811 Merged in Undercova/holocore (pull request #142)
Fixed values for Corellia Cantinas in buildings.sdb
2016-02-03 13:16:25 -06:00
Undercova PSWG 1688ebc72f Fixed values for Corellia Cantinas in buildings.sdb 2016-02-03 18:42:27 +00:00
Obique PSWG f7d546a54d Merged in Undercova/holocore (pull request #141)
Fixed a few spawn problems
2016-02-03 12:19:27 -06:00
Undercova PSWG 4de7a12d6a Removed bugged NPC in tatooine.sdb 2016-02-03 18:18:01 +00:00
Undercova PSWG ab7c92e1a6 Fixed typo in corellia.sdb 2016-02-03 18:14:22 +00:00
Undercova PSWG 42460d135d Fixed typo in talus.sdb 2016-02-03 18:12:49 +00:00
Obique PSWG cb4854b26a Merged in Undercova/holocore (pull request #140)
Removed wrong npc entry in corellia.sdb
2016-02-03 12:05:28 -06:00
Obique PSWG 1c740e0cf5 Fixed spawn bugs in spawner service as well as fixed multi-slave sdb loading 2016-02-03 12:04:49 -06:00
Undercova PSWG 0b7e192fb4 Removed wrong npc entry in corellia.sdb 2016-02-03 18:04:29 +00:00
Obique PSWG b2a8e2aa22 Merged in Undercova/holocore (pull request #139)
Disabled loading of area_51.sdb for now
2016-02-03 11:57:30 -06:00
Undercova PSWG 763402026a Disabled loading of area_51.sdb for now 2016-02-03 17:56:57 +00:00
Obique PSWG b032266f2c Merge branch 'CORE-272-npc-rotation' of bitbucket.org:projectswg/holocore into quality_assurance 2016-02-03 11:55:45 -06:00
Obique PSWG 7105bd20b3 Merged in Undercova/holocore (pull request #138)
Changed spawns to new msdb system
2016-02-03 11:53:29 -06:00
Undercova PSWG 96f1940f56 Added static.msdb (master sdb) 2016-02-03 17:48:26 +00:00
Undercova PSWG 66c920c438 Added yavin4.sdb 2016-02-03 17:45:51 +00:00
Undercova PSWG 5c43dfbe33 Added talus.sdb 2016-02-03 17:45:16 +00:00
Undercova PSWG bbad66cd25 Added tatooine.sdb 2016-02-03 17:44:38 +00:00
Undercova PSWG 26b4775feb Added rori.sdb 2016-02-03 17:44:08 +00:00
Undercova PSWG db7d200e9a Added naboo.sdb 2016-02-03 17:42:36 +00:00
Undercova PSWG 1387e1b83b Added lok.sdb 2016-02-03 17:41:26 +00:00
Undercova PSWG f2313296c7 Added kashyyyk.sdb 2016-02-03 17:40:15 +00:00
Undercova PSWG b0bd407943 Added endor.sdb 2016-02-03 17:39:36 +00:00
Undercova PSWG 553bd1648e Added dungeon1.sdb 2016-02-03 17:39:06 +00:00
Undercova PSWG 99ab22142f Added dathomir.sdb 2016-02-03 17:38:34 +00:00
Undercova PSWG 5a396e7333 Added dantooine.sdb 2016-02-03 17:38:05 +00:00
Undercova PSWG 2cfac9184b Added corellia.sdb 2016-02-03 17:37:35 +00:00
Undercova PSWG 5defd7d2c0 Updated area_51.sdb 2016-02-03 17:36:51 +00:00
Undercova PSWG 6b80901ca1 Updated creatures.sdb 2016-02-03 17:35:52 +00:00
Undercova PSWG de035cf4b0 Updated buildings.sdb 2016-02-03 17:34:01 +00:00
Obique PSWG 6ef74a4dd3 Added file exists check before loading slave sdb 2016-02-03 11:33:59 -06:00
Obique PSWG 1b261ee843 Merged in cdmpse/holocore/radial_fix (pull request #93)
Add client radial options to server radial options
2016-02-03 11:24:06 -06:00
Obique PSWG 3f53c83612 Merged in M4SS/holocore/skillmods (pull request #106)
Conflicts:
	src/resources/objects/creature/CreatureObject.java
2016-02-03 11:22:15 -06:00