mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-21 12:17:46 +00:00
Code Activity
project-meteor-server/Data
History
CuriousJorge 02fe9e070d Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 
# Conflicts:
#	Data/scripts/commands/EmoteStandardCommand.lua
#	Data/scripts/quests/man/man0g0.lua
#	Data/scripts/quests/man/man0g1.lua
#	Data/scripts/quests/man/man0u0.lua

Resolved using Theirs.
2022-03-04 21:04:17 -05:00
..
scripts Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system 2022-03-04 21:04:17 -05:00
sql Removed more dead scripts. Exported missing sql files. 2022-03-03 23:33:55 -05:00
www Updated Map Server namespace. Moved all other data folders (www and sql) to data folder. Renamed boot name to Project Meteor. 2019-06-19 01:10:15 -04:00
lobby_config.ini Updated Map Server namespace. Moved all other data folders (www and sql) to data folder. Renamed boot name to Project Meteor. 2019-06-19 01:10:15 -04:00
map_config.ini Updated Map Server namespace. Moved all other data folders (www and sql) to data folder. Renamed boot name to Project Meteor. 2019-06-19 01:10:15 -04:00
world_config.ini Updated Map Server namespace. Moved all other data folders (www and sql) to data folder. Renamed boot name to Project Meteor. 2019-06-19 01:10:15 -04:00