Commit Graph

  • 6130feec32
    Merge remote-tracking branch 'upstream/master' Ru Chern 2016-08-25 07:02:17 +1000
  • 18c4e5937c Fix tables Felix 2016-08-24 22:57:09 +0200
  • 706828c171 Merge 659bcaa045 into 3dc5e303ad Ru Chern 2016-08-24 20:57:02 +0000
  • 659bcaa045
    Added cp to table. Ru Chern 2016-08-25 06:56:08 +1000
  • 3dc5e303ad Mega update, 0.4.7 Felix 2016-08-24 19:23:17 +0200
  • 63f65a95df Update package.json Felix 2016-08-24 19:18:02 +0200
  • db26ffe8e8 Update cfg Felix 2016-08-24 19:16:35 +0200
  • 6f89cd13ab Merge pull request #68 from Cronick/patch-3 Felix Maier 2016-08-24 01:43:29 +0200
  • b539e870ec Merge pull request #69 from Cronick/patch-4 Felix Maier 2016-08-24 01:33:21 +0200
  • b9eab27417 Ignore all npm-debug files, and not just npm-debug.log Cronick 2016-08-24 01:26:37 +0200
  • 3c272e144d Added spawn command to help Cronick 2016-08-23 23:05:39 +0200
  • 639e9f09d2 Merge f77d830fad into ed932ae481 Ru Chern 2016-08-23 19:18:58 +0000
  • ed932ae481 Merge pull request #64 from ruchern/master Felix Maier 2016-08-23 20:55:30 +0200
  • f77d830fad Revert "Updated version details in cfg.js.example" Ru Chern 2016-08-24 04:49:37 +1000
  • b52a058b88 Merge e8244599b9 into fe0566a2d8 Ru Chern 2016-08-23 18:46:46 +0000
  • e8244599b9
    Reverted client version number. People will be asked to update no matter how. Ru Chern 2016-08-24 04:46:16 +1000
  • fe0566a2d8 Merge pull request #61 from ruchern/master Felix Maier 2016-08-23 20:09:10 +0200
  • 3a48e19108
    Updated version to 0.35.0 Ru Chern 2016-08-24 04:02:06 +1000
  • 1ff5d088e5
    Added npm-debug.log to .gitignore. We do not need to push logs to the repo. Ru Chern 2016-08-24 03:55:45 +1000
  • 6b2b2ee10a Beautify README.md Felix Maier 2016-08-23 16:43:07 +0200
  • 83ca772e53 Update Felix 2016-08-23 16:25:41 +0200
  • 81f3ea845c Update cfg Felix 2016-08-23 14:21:42 +0200
  • 1cc01c2b3c Mega update Felix 2016-08-23 14:20:01 +0200
  • 08bca57a90 Update README.md Felix Maier 2016-08-23 14:08:47 +0200
  • 4d19747edf Merge pull request #59 from Cronick/patch-2 Felix Maier 2016-08-23 13:43:32 +0200
  • 23a7498a92 Updated README.md to the latest cfg.js format. Cronick 2016-08-22 23:30:29 +0200
  • 4d64502503 Merge aa4bc754ed into 71aa765539 welshman 2016-08-22 04:53:30 +0000
  • aa4bc754ed Update README.md welshman 2016-08-22 05:44:15 +0100
  • a3410ad552 Update run-windows.bat welshman 2016-08-22 05:41:29 +0100
  • 71aa765539 Update package.json Felix 2016-08-21 22:52:35 +0200
  • 20a736fa48 Merge pull request #52 from Cronick/patch-1 Felix Maier 2016-08-21 21:22:15 +0200
  • 540301df9e Added logs and data to .gitignore Cronick 2016-08-21 21:21:07 +0200
  • 9905d60441 Mega Update Felix 2016-08-21 21:13:26 +0200
  • d8bf726f3c Merge pull request #49 from ruchern/master Felix Maier 2016-08-21 01:12:01 +0200
  • 6b84d36a47
    git pushMerge branch 'master' of https://github.com/ruchern/POGOServer Ru Chern 2016-08-21 09:09:57 +1000
  • 09ea4ab9ef
    Removed cfg.js from repo as it may contain user's specific sensitive information. Ru Chern 2016-08-21 09:09:16 +1000
  • ee65e1232a
    Removed cfg.js from repo. Ru Chern 2016-08-21 09:09:16 +1000
  • 336796e7bf
    Added a cfg.js.example file so as not to accidentally overwrite user's cfg.js settings that is already on localhost. Updated README.md to reflect the necessary changes. (To start, rename cfg.js.example to cfg.js). Ru Chern 2016-08-21 09:06:20 +1000
  • 3562af2a4e Update package.json Felix 2016-08-20 19:07:43 +0200
  • 2b0ef8281c Bug fix Felix 2016-08-20 14:18:59 +0200
  • 8b61647a6d Dump models and asset digest on first start Felix 2016-08-19 16:53:09 +0200
  • 31a230caf7 Update Felix 2016-08-19 12:19:48 +0200
  • 34e17e7193 Delete 14030640_10207258536085439_2064622200_n.png Marco Federici 2016-08-19 11:50:02 +0200
  • 1482fe9e5c Add files via upload Marco Federici 2016-08-19 11:48:32 +0200
  • eafc38f879 Create How to add pokèmons to your team Marco Federici 2016-08-19 11:46:19 +0200
  • 0df066ff3c Dump traffic option Felix 2016-08-19 00:37:41 +0200
  • 7885c90b3c Database bug fix Felix 2016-08-17 21:44:18 +0200
  • e53e815104 Merge e03acf6b77 into c6e52d8207 Shyim 2016-08-17 18:24:03 +0000
  • c6e52d8207 Update asset downloader Felix 2016-08-17 19:42:47 +0200
  • 8bec04c8d4 Merge pull request #32 from Cronick/patch-1 Felix 2016-08-17 18:41:12 +0200
  • 245563d662 Updated to make it on 1 line instead. Cronick 2016-08-17 18:39:22 +0200
  • dce9ecbc37 Update Felix 2016-08-17 18:24:19 +0200
  • d63d576ca3 Added server version at startup. Cronick 2016-08-17 17:21:26 +0200
  • 35e4b93974 Fix run-windows Felix 2016-08-17 15:58:24 +0200
  • 88d4b85860 Update Felix 2016-08-17 15:56:16 +0200
  • eba199a240 Update Felix 2016-08-17 12:40:41 +0200
  • e03acf6b77
    Fixed duplicate user entries on mysql mode Soner Sayakci 2016-08-17 00:06:55 +0200
  • 43b10ebdf8 Merge pull request #25 from shyim/master Felix 2016-08-17 00:03:23 +0200
  • aa357c8c4c
    strict equality and double quotes Soner Sayakci 2016-08-16 23:51:52 +0200
  • ca23f3524e
    Removed Debug Soner Sayakci 2016-08-16 23:46:06 +0200
  • 28805445c9
    Fixed MySQL User loading Soner Sayakci 2016-08-16 23:45:25 +0200
  • 759c0ae4f3 Merge pull request #23 from shyim/master Felix 2016-08-16 23:20:43 +0200
  • fdc2318023 Typo Shyim 2016-08-16 23:17:09 +0200
  • 30e542e930 Merge pull request #21 from shyim/master Felix 2016-08-16 23:09:35 +0200
  • 3dc72083a6
    Added Primarykey and AI to id field Shyim 2016-08-16 22:53:54 +0200
  • f4558676a6 Update Felix 2016-08-16 22:46:33 +0200
  • 70f9e179f4 Merge 696672f636 into 9e18c1e808 Cronick 2016-08-16 17:16:15 +0000
  • 9e18c1e808 Retry failed mysql connection as well Felix 2016-08-16 18:57:05 +0200
  • 0d8c39d37f Update Felix 2016-08-16 18:56:35 +0200
  • 696672f636 Minor mistake Cronick 2016-08-16 16:08:08 +0200
  • 597c667669 Merge remote-tracking branch 'refs/remotes/maierfelix/master' Cronick 2016-08-16 16:03:43 +0200
  • 9736183ddd Update README.md Felix 2016-08-16 14:49:52 +0200
  • 7169d9b020 Spawn example map objects in front of player Felix 2016-08-16 14:42:55 +0200
  • 82792fc858 Update .gitignore & rename cfg.js Cronick 2016-08-16 14:16:13 +0200
  • b5cce7e127 Isomorphic mysql db, updates Felix 2016-08-16 13:40:47 +0200
  • 5cd04c0018 Update README.md Felix 2016-08-16 11:49:29 +0200
  • dcd61f937d Bug fix Felix 2016-08-16 11:49:10 +0200
  • f6a066ce09 Update package.json Felix 2016-08-16 09:07:11 +0200
  • 3aebd57af5 Update README.md Felix 2016-08-16 08:34:15 +0200
  • b92bd36ce0 Client provider configurable Felix 2016-08-16 07:42:07 +0200
  • 5479c0a737 Update packages, update version Felix 2016-08-16 01:31:01 +0200
  • c93eaf1900 Update Felix 2016-08-15 22:54:51 +0200
  • 54473ef8d7 Update Felix 2016-08-15 20:50:25 +0200
  • 9f9e54b7c5 Lowercase asset digest Felix 2016-08-15 16:53:57 +0200
  • da362f3011 Update Felix 2016-08-15 16:51:17 +0200
  • bf4e26e338 Big update Felix 2016-08-15 13:09:42 +0200
  • 1db70b4d96 Update README.md Felix 2016-08-11 08:49:20 +0200
  • 58fd8fb227 Updates Felix 2016-08-10 21:48:41 +0200
  • 5728d47098 Update package.json Felix 2016-08-10 00:34:30 +0200
  • 9ff6d6e83c Update README.md Felix 2016-08-10 00:29:07 +0200
  • f776496bd2 Big update Felix 2016-08-09 19:45:36 +0200
  • 6ef63b02f4 Clean up Felix 2016-08-08 22:27:44 +0200
  • e9ccb672dc Added mongodb, many updates & bug fixes Felix 2016-08-08 22:25:28 +0200
  • dbddba2eee Update Felix 2016-08-08 00:57:36 +0200
  • 83fa228615 Update Felix 2016-08-08 00:57:16 +0200
  • 42d62a6b31 Update README.md Felix 2016-08-06 14:18:03 +0200
  • 9cdbe5686c Update Felix 2016-08-06 13:56:54 +0200
  • 2899d78469 Update README.md Felix 2016-08-06 11:31:00 +0200
  • ee9b879511 Update .gitattributes Felix 2016-08-05 20:46:52 +0200
  • bc853908e1 Update Felix 2016-08-05 20:43:56 +0200