 Gene Pressinger
|
2ebd878aa1
|
Merged in Iosnowore/holocore (pull request #436)
Fixed JIRA bug NGE-563
|
2017-04-07 00:36:49 +00:00 |
|
|
Iosnowore
|
8751f6f8e5
|
Autoindent fix
|
2017-04-06 17:28:07 -07:00 |
|
|
Iosnowore
|
da999be330
|
Minor cleanup
|
2017-04-06 17:27:27 -07:00 |
|
|
Iosnowore
|
479099b8df
|
Merge branch 'quality_assurance' of https://bitbucket.org/Iosnowore/holocore into quality_assurance
|
2017-04-06 17:23:15 -07:00 |
|
|
Iosnowore
|
52dda3b2c6
|
Reverted Eclipse auto indent
|
2017-04-06 17:22:41 -07:00 |
|
|
Gene Pressinger
|
971dc7eef0
|
Merged projectswg/holocore into quality_assurance
|
2017-04-06 20:16:07 -04:00 |
|
|
Iosnowore
|
dc91fdcac9
|
Fixed JIRA bug NGE-563
https://projectswg.atlassian.net/browse/NGE-563
|
2017-04-06 17:15:08 -07:00 |
|
|
Gene Pressinger
|
f51ed2119a
|
Merged in Iosnowore/holocore (pull request #419)
Added duel and endduel commands
|
2017-04-07 00:13:59 +00:00 |
|
|
Iosnowore
|
e6bf6cbf9f
|
Removed indentation
|
2017-04-06 17:13:14 -07:00 |
|
|
Iosnowore
|
19165a78c7
|
More changes
|
2017-04-06 17:12:11 -07:00 |
|
|
Iosnowore
|
a427e81cd5
|
Changed some things that Obique commented on
|
2017-04-06 17:04:50 -07:00 |
|
|
Iosnowore
|
69d5bcb3cd
|
DeveloperService update
|
2017-04-06 15:35:40 -07:00 |
|
|
Iosnowore
|
0561178bb2
|
Forgot to change these
|
2017-04-05 13:38:53 -07:00 |
|
|
Gene Pressinger
|
311a3c3414
|
Removed identical function
|
2017-04-05 15:53:07 +00:00 |
|
|
Iosnowore
|
bc1112650c
|
Dueling implementation now only requires one list of CreatureObjects (instead of two)
|
2017-04-04 19:17:16 -07:00 |
|
|
Gene Pressinger
|
c6fbabf0e1
|
Merged projectswg/holocore into quality_assurance
|
2017-04-04 19:23:06 -04:00 |
|
|
Obique PSWG
|
b7109309fc
|
Removed AUTOINCREMENT attribute of players.id
|
2017-04-04 18:06:42 -05:00 |
|
|
Obique PSWG
|
adee72e309
|
Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance
|
2017-04-04 18:05:20 -05:00 |
|
|
Gene Pressinger
|
658dd938d5
|
Merged projectswg/holocore into quality_assurance
|
2017-04-04 17:47:20 -04:00 |
|
|
Iosnowore
|
77231fa85c
|
Changed PR based on Oblique's comments.
Also Added .db-journal to git ignore (file created by a 3d party SQLite GUI program)
|
2017-04-04 14:01:55 -07:00 |
|
|
Undercova PSWG
|
ebc1360d44
|
Merged in Undercova/holocore (pull request #435)
Content update
|
2017-04-04 16:21:47 +00:00 |
|
|
Undercova
|
969d3eac04
|
Added remaining files to last commit
|
2017-04-04 07:30:41 +02:00 |
|
|
Undercova
|
6cfe61a3c7
|
Renamed creature database and all related files/entries to npc
Removed old loot files
Renamed several database sdbs
|
2017-04-04 07:29:53 +02:00 |
|
|
Iosnowore
|
d872ac4c87
|
Removed unused imports
|
2017-04-02 17:55:47 -07:00 |
|
|
Iosnowore
|
a376093ddc
|
Changed List to ArrayList
|
2017-04-02 17:51:20 -07:00 |
|
|
Iosnowore
|
00d14d2b9e
|
Really isn't a reason to just not use an ArrayList
|
2017-04-02 17:49:31 -07:00 |
|
|
Iosnowore
|
2fea3a2f18
|
Players are no longer in combat when duel is ended
|
2017-04-02 17:03:28 -07:00 |
|
|
Iosnowore
|
86517381c5
|
Players are now attackable when dueling
|
2017-04-02 16:47:59 -07:00 |
|
|
Iosnowore
|
6683912383
|
Fixed a bug when player who sent a duel tried to end when the duel was active.
|
2017-04-02 16:15:29 -07:00 |
|
|
Iosnowore
|
8b37165ec9
|
Removed unused import
|
2017-04-02 14:37:41 -07:00 |
|
|
Iosnowore
|
6909cf0d59
|
Removed extra indent
|
2017-04-02 14:12:10 -07:00 |
|
|
Iosnowore
|
42f24d8ee4
|
Moved duel checks from DuelPlayerService to their script.
|
2017-04-02 14:10:02 -07:00 |
|
|
Iosnowore
|
38634ab65f
|
Removed useless function
|
2017-04-02 13:38:58 -07:00 |
|
|
Gene Pressinger
|
d6ee9f2534
|
Merged projectswg/holocore into quality_assurance
|
2017-04-02 16:35:56 -04:00 |
|
|
Iosnowore
|
cfc6398956
|
Players are now enemies if they're in a duel.
|
2017-04-02 13:33:54 -07:00 |
|
|
Iosnowore
|
615d81f9fd
|
Redid dueling..
- Dueling now handles multiple duels between multiple players
- Fixed some other minor bugs involving duel requesting/recieving
|
2017-04-02 13:20:58 -07:00 |
|
|
Undercova PSWG
|
f4a61cf610
|
Merged in Undercova/holocore (pull request #433)
Added more Dark and Light Jedi robes to the frog
|
2017-04-02 18:17:54 +00:00 |
|
|
Undercova PSWG
|
d413e575a8
|
Added more Dark and Light Jedi robes to the frog
|
2017-04-02 18:13:17 +00:00 |
|
|
Iosnowore
|
e742886133
|
Removed this from last commit because of merge conflict
|
2017-04-02 08:14:28 -07:00 |
|
|
Iosnowore
|
f437832891
|
Fork update
|
2017-04-02 08:08:54 -07:00 |
|
|
Eric Frechette
|
ccb2625edb
|
Merged in Frechetta/holocore (pull request #432)
Added line to login.sql to create default user
Approved-by: Undercova PSWG <[email protected]>
|
2017-03-31 16:21:35 +00:00 |
|
|
Eric Frechette
|
5b7d723e69
|
Realized the error of my ways - reverted table schemas.
|
2017-03-30 22:24:01 -07:00 |
|
|
Eric Frechette
|
8ba2dde953
|
Adjusted login.sql script: made 'username' the primary key for 'users' table (there should be no two accounts with the same username); added line to create default user.
|
2017-03-30 22:07:03 -07:00 |
|
|
Eric Frechette
|
d2bc2a0cdc
|
Merged projectswg/holocore into quality_assurance
|
2017-03-30 19:51:37 -07:00 |
|
|
Obique PSWG
|
3fb956b33b
|
Basic intro to a refactor in ChatRoomService
|
2017-03-29 01:20:54 -05:00 |
|
|
Obique PSWG
|
ab5b3c334d
|
Changed table characters to players in EngineManager
|
2017-03-28 14:50:35 -05:00 |
|
|
Obique PSWG
|
a7e8fd3ee3
|
Added login.sql
|
2017-03-28 08:50:09 -05:00 |
|
|
Obique PSWG
|
5d419a80a1
|
Fixed exception when requesting the row count of players
|
2017-03-27 07:32:30 -05:00 |
|
|
Obique PSWG
|
1c4dbf0614
|
Removed postgres library
|
2017-03-26 23:00:36 -05:00 |
|
|
Obique PSWG
|
8432ecd5b1
|
Removed all dependencies on postgres
|
2017-03-26 22:58:58 -05:00 |
|