1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-21 20:27:47 +00:00
Commit graph

416 commits

Author SHA1 Message Date
TheManii
de2ec984e4 Revert "Fix merge"
This reverts commit 29228a0c11.
2016-04-08 09:59:56 -07:00
TheManii
29228a0c11 Fix merge 2016-04-08 09:57:40 -07:00
TheManii
5920d93b19 Merged master into ingame_help 2016-04-08 12:51:28 -04:00
TheManii
3790920db3 Typo 2016-04-08 00:51:34 -07:00
TheManii
21745a6aa8 Added relative warps 2016-04-08 00:48:34 -07:00
TheManii
574b2da4f8 Merged Ioncannon/ffxiv-classic-server into master 2016-04-08 01:37:37 -04:00
TheManii
fc07d2e24d Merge ingame_help into master 2016-04-07 22:25:58 -07:00
TheManii
33be97ea9d Make CommandProcessor more robust 2016-04-07 22:22:31 -07:00
Filip Maj
c0cd7555e1 -Fixed up the quest flag functions.
-Renamed the ActorSpecialGraphicPacket to SetActorQuestGraphic as those icons all have to do with questing.
-Got onSpawn to work and implemented the quest graphics.
-Added new QuestDirector class.
2016-04-07 22:34:10 -04:00
Filip Maj
1f5788def8 Redundent zoneid was redundent. 2016-04-07 22:32:04 -04:00
TheManii
cc5d0b139a Added new !warp to help 2016-04-07 12:29:17 -07:00
TheManii
ecc61ea5f9 Surrounded command chain with region boxes
Changed doWarp() to handle in implicit, in-zone only warps

Might have issues with instanced zones, untested
2016-04-07 12:25:28 -07:00
TheManii
b17d193a59 Fix previous commit 2016-04-07 11:41:56 -07:00
TheManii
7c0594b749 Cherrypick *b16ea7b Disable login10/11 2016-04-07 10:37:14 -07:00
Ioncannon
8b55993f25 Merged in TheManii/ffxiv-classic-server (pull request #5)
Disable login10/11
2016-04-07 13:23:44 -04:00
TheManii
b16ea7bc44 Disable login10/11 2016-04-07 10:21:04 -07:00
TheManii
4cf005467a Moved most of the strings to external resource file 2016-04-06 19:55:12 -07:00
TheManii
cd8cb1acb3 Made give/removecurrency consistant with help description 2016-04-06 16:28:24 -07:00
TheManii
26f5e1be28 Fix spelling 2016-04-06 15:34:04 -07:00
TheManii
ea1e16aea7 Make Getters more case consistant 2016-04-06 15:29:24 -07:00
TheManii
cdcdd6a584 Split off ingame commands from server 2016-04-06 15:22:26 -07:00
TheManii
c74e40f7d0 Merge 23aef8c Removed need for the login2.bin packet file.
Merge 49a4bf1 Fixed the SQL schema to work with the map server as well as updated the server id in the config file to match that in the database
2016-04-06 10:51:12 -07:00
TheManii
cb86bcb3af Merged Ioncannon/ffxiv-classic-server into master 2016-04-06 13:47:59 -04:00
Ioncannon
dabbff1fda Merged in TheManii/ffxiv-classic-server (pull request #3)
Simplify post build steps
2016-04-06 13:40:45 -04:00
Ioncannon
77c12c489c Merged in VeryCrushed/ffxiv-classic-server (pull request #4)
Fixed the SQL schema to work with the map server as well as updated the server id in the config file to match that in the database
2016-04-06 13:39:52 -04:00
Andrew Babbitt
49a4bf1ab0 Fixed the SQL schema to work with the map server as well as updated the server id in the config file to match that in the database 2016-04-05 23:52:16 -06:00
TheManii
1ef3e350c0 Fix line endings 2016-04-05 16:13:16 -07:00
TheManii
7a8e53a8ac Add in ingame help system 2016-04-05 16:06:38 -07:00
TheManii
5892887e4c Merged Ioncannon/ffxiv-classic-server into master 2016-04-05 18:33:46 -04:00
Filip Maj
23aef8cc46 Removed need for the login2.bin packet file. 2016-04-05 17:34:34 -04:00
TheManii
9a2977a094 Merge branch 'master' of https://TheManii@bitbucket.org/TheManii/ffxiv-classic-server.git 2016-04-05 13:03:47 -07:00
TheManii
1a43f15800 Fix partial copies post compile 2016-04-05 13:03:46 -07:00
TheManii
aa4fc09a32 Revert "Remove unused files/docs that belong on wiki"
This reverts commit 64155dc752.
2016-04-05 11:43:12 -07:00
TheManii
64155dc752 Remove unused files/docs that belong on wiki 2016-04-05 11:42:17 -07:00
TheManii
8cb1ae99e8 README.md edited online with Bitbucket 2016-04-05 18:22:32 +00:00
TheManii
f8a2b7efc7 Update .gitignore for user provided data 2016-04-05 11:19:23 -07:00
TheManii
5d3f25f1a8 Don't Clobber existing files 2016-04-05 11:08:02 -07:00
TheManii
ddf4d0d202 Consolidated server data and automatically place them in approporate directories post build 2016-04-05 10:42:42 -07:00
Filip Maj
b68d13ea7f Cleaned up the lua calls and renamed "onInstantiation" to "init". Added a "onSpawn" callback but still working on it. Added the "ActorSpecialGraphicPacket" and functions to use it. 2016-04-02 17:56:01 -04:00
Filip Maj
e501d5b796 Merge branch 'develop' 2016-04-01 23:50:29 -04:00
Filip Maj
4c391f64bc Removed old inn code and realigned all the cutscene flags. Offsets will need to be figured out again though. 2016-04-01 23:50:17 -04:00
Filip Maj
ae9a712477 Added scripts for all the npcs (minus the door) in the Limsa Opening zone (boat). The beginning tutorial stuff is also scripted. 2016-04-01 23:32:52 -04:00
Filip Maj
91842ab08a Merge branch 'develop'
# Conflicts:
#	FFXIVClassic Map Server/FFXIVClassic Map Server.csproj
2016-04-01 23:27:34 -04:00
Filip Maj
1dd04e2174 Merge branch 'director_and_questing' into develop 2016-04-01 23:24:28 -04:00
Filip Maj
6c3918ac2f Got the kick event packet working and implemented the director parameter in the player instantiation. The first argument of the set event status packet is an "isEnabled" flag; switched to bool rather than int. 2016-04-01 23:24:14 -04:00
Filip Maj
cf73522291 Reversed change to output folder that was done in previous pull request merge. 2016-03-30 20:49:37 -04:00
Filip Maj
8da3a6ff9c Merge branch 'develop'
# Conflicts:
#	FFXIVClassic Map Server/packets/send/Actor/events/SetEmoteEventCondition.cs
2016-03-30 20:18:28 -04:00
Filip Maj
60b4035ec5 Receive routine in the lobby server now checks if bytes read is > (not >=) than 0. This was causing connections to stay active and cause the CPU to get bogged down. 2016-03-30 20:16:59 -04:00
Filip Maj
597a800599 More work trying to get the opening cutscene to fire right away. 2016-03-30 20:15:21 -04:00
Ioncannon
48b9fa39b5 Merged in VeryCrushed/ffxiv-classic-server (pull request #1)
Small Fixes
2016-03-30 11:06:17 -04:00