Code

Итоговый PR: mouseartiom#6

Code

Open

eadium wants to merge 92 commits intomasterRasseki-Studios/rasseki.game:masterfrom mouseartiomRasseki-Studios/rasseki.game:mouseartiomCopy head branch name to clipboard

+20,131-2

Commits

Commits on Apr 7, 2018

• added readme

  stanf0rd

  committed
  8d368e7

  Copy full SHA for 8d368e7

• Создана базовая версия библиотеки для абстрактных классов.

  Moleque

  committed
  45851b5

  Copy full SHA for 45851b5

• Исправлены ошибки компиляции

  stanf0rd

  committed
  3eec2bf

  Copy full SHA for 3eec2bf

Commits on Apr 8, 2018

• Добавлены новые классы предметов (subjects .h/.cpp).

  Moleque

  committed
  ae6d278

  Copy full SHA for ae6d278

• Конфликты разрешены.

  Moleque

  committed
  b03829f

  Copy full SHA for b03829f

Commits on Apr 9, 2018

• Merge branch 'salman' into test

  stanf0rd

  committed
  1c9a669

  Copy full SHA for 1c9a669

• base .gitignore added

  stanf0rd

  committed
  b4ee6c1

  Copy full SHA for b4ee6c1

• Переименованны MovAble. Изменены конструкторы классов в subjects. Удален using ns std. В GetArtifact() возвращается указатель на артефакт. Добавлены Get/Set.

  Moleque

  committed
  c0b02ee

  Copy full SHA for c0b02ee

Commits on Apr 10, 2018

• abstract class Action added

  stanf0rd

  committed
  3d35bbf

  Copy full SHA for 3d35bbf

• short chenged to int_fast8_t

  stanf0rd

  committed
  47528ac

  Copy full SHA for 47528ac

• Обновленный base.h

  Moleque

  committed
  77e8c10

  Copy full SHA for 77e8c10

• merge test and salman branches

  stanf0rd

  committed
  e598b20

  Copy full SHA for e598b20

• Initial commit

  eadium

  committed
  1150164

  Copy full SHA for 1150164

• Merge branch 'mouseartiom' of github.com:Rasseki-Studios/rasseki.game into mouseartiom

  eadium

  committed
  14ab8f6

  Copy full SHA for 14ab8f6

• Updated .gitignore

  eadium

  committed
  75405c8

  Copy full SHA for 75405c8

• added constructor/destructor

  eadium

  committed
  094d958

  Copy full SHA for 094d958

Commits on Apr 11, 2018

• Добавлены методы рассчета маршрута Move() и перемещения Step(). Id добавлен в конструктор Item для генерации из вне.

  Moleque

  committed
  fab1a91

  Copy full SHA for fab1a91

• delete readme.md from test

  

  Julian Voronetsky

  committed
  866f45c

  Copy full SHA for 866f45c

• delete readme.md from test

  

  Julian Voronetsky

  committed
  f0c9cff

  Copy full SHA for f0c9cff

• delete readme.md from branch

  

  Julian Voronetsky

  committed
  2aedb01

  Copy full SHA for 2aedb01

• delete readme.md from branch

  

  Julian Voronetsky

  committed
  13cc973

  Copy full SHA for 13cc973

• Merge remote-tracking branch 'origin/salman' into salman

  

  Julian Voronetsky

  committed
  11a3566

  Copy full SHA for 11a3566

• delete readme.md from branch

  

  Julian Voronetsky

  committed
  359a41d

  Copy full SHA for 359a41d

• added getter and one color

  eadium

  committed
  4c61732

  Copy full SHA for 4c61732

• Merge branch 'mouseartiom' of github.com:Rasseki-Studios/rasseki.game into mouseartiom

  eadium

  committed
  ec1c69e

  Copy full SHA for ec1c69e

• updated .gitignore

  eadium

  committed
  7a99dcc

  Copy full SHA for 7a99dcc

• delete readme.md from branch

  

  Julian Voronetsky

  committed
  728bab5

  Copy full SHA for 728bab5

• Updated .gitignore

  eadium

  authored
  f6b95a0

  Copy full SHA for f6b95a0

• Updated .gitignore

  eadium

  committed
  291b5a7

  Copy full SHA for 291b5a7

• Merge branch 'mouseartiom' of github.com:Rasseki-Studios/rasseki.game into test

  eadium

  committed
  4beb074

  Copy full SHA for 4beb074

• const and inline added, pedantic lines swaps made

  stanf0rd

  committed
  9bca0ee

  Copy full SHA for 9bca0ee

• Merge branch 'stanford' of github.com:Rasseki-Studios/rasseki.game into stanford

  stanf0rd

  committed
  806dc48

  Copy full SHA for 806dc48

• Merge branch 'stanford' of github.com:Rasseki-Studios/rasseki.game into test

  stanf0rd

  committed
  4a47cb9

  Copy full SHA for 4a47cb9

Commits on Apr 12, 2018

• ID are strings now, std::string can be used as str

  stanf0rd

  committed
  117a12a

  Copy full SHA for 117a12a

• basic event.h and event.cpp added, class IFactory added

  stanf0rd

  committed
  b35eb9f

  Copy full SHA for b35eb9f

• IDs are now strings

  stanf0rd

  committed
  a5ddf66

  Copy full SHA for a5ddf66

• id -> ID

  stanf0rd

  committed
  dac9c26

  Copy full SHA for dac9c26

• added namespace

  eadium

  committed
  949ca60

  Copy full SHA for 949ca60

• Merge branch 'test' of github.com:Rasseki-Studios/rasseki.game into mouseartiom

  eadium

  committed
  b91667f

  Copy full SHA for b91667f

• Добавлены const к Get ф-циям.

  Moleque

  committed
  ce5db1e

  Copy full SHA for ce5db1e

• slightly code refactored, removed namespace and added statics

  eadium

  committed
  24de712

  Copy full SHA for 24de712

• basic event reading added, base improved

  stanf0rd

  committed
  7d8b3e3

  Copy full SHA for 7d8b3e3

• JV: add Qt project to Develop branch

  

  Julian Voronetsky

  committed
  8c18fe4

  Copy full SHA for 8c18fe4

• save before move

  

  Julian Voronetsky

  committed
  a4d3713

  Copy full SHA for a4d3713

• Separate Qt project from Base, Map and Subjects

  

  Julian Voronetsky

  committed
  3719cc5

  Copy full SHA for 3719cc5

• Remove .DS_Store from main folder

  

  Julian Voronetsky

  committed
  725f248

  Copy full SHA for 725f248

• EventFabric can now read and use all event jsons

  stanf0rd

  committed
  01ce70e

  Copy full SHA for 01ce70e

• libs were taken to libs folder

  stanf0rd

  committed
  ccda882

  Copy full SHA for ccda882

• Merge branch 'stanford' into develop

  stanf0rd

  committed
  dc6ee0d

  Copy full SHA for dc6ee0d

Commits on Apr 13, 2018

• salman and develop branches merged

  stanf0rd

  committed
  c2a28d5

  Copy full SHA for c2a28d5

• definition of class Movable was taken to individual file

  stanf0rd

  committed
  68ee06b

  Copy full SHA for 68ee06b

• fixed a small spelling error

  stanf0rd

  committed
  a92b10d

  Copy full SHA for a92b10d

• method getFromJson getting filename replaced method create

  stanf0rd

  committed
  e45f7b8

  Copy full SHA for e45f7b8

Commits on Apr 14, 2018

• catching exceptions in jsons, invalid events are skipping now

  stanf0rd

  committed
  408afe4

  Copy full SHA for 408afe4

• Merge branch 'test' of github.com:Rasseki-Studios/rasseki.game into stanford

  stanf0rd

  committed
  22b296a

  Copy full SHA for 22b296a

• fixed small spelling error

  stanf0rd

  committed
  c18fe16

  Copy full SHA for c18fe16

• EasyBMP library added

  stanf0rd

  committed
  5c25f1a

  Copy full SHA for 5c25f1a

• base transformed to item, movable and location parts

  stanf0rd

  committed
  8def7a7

  Copy full SHA for 8def7a7

• events support new base headers now

  stanf0rd

  committed
  cd596b0

  Copy full SHA for cd596b0

• map renamed to mapdata

  stanf0rd

  committed
  0d40f96

  Copy full SHA for 0d40f96

• mapdata updated for work with new base

  stanf0rd

  committed
  9246da3

  Copy full SHA for 9246da3

• stanford, test and mouseartiom branches are synchronized

  stanf0rd

  committed
  3a70dea

  Copy full SHA for 3a70dea

Commits on Apr 15, 2018

• updated .gitignore

  eadium

  committed
  68ddc13

  Copy full SHA for 68ddc13

Commits on Apr 17, 2018

• added eventsList but compilation fails

  eadium

  committed
  cb07a42

  Copy full SHA for cb07a42

Commits on Apr 19, 2018

• modified mapdata structure and added EventData class

  eadium

  committed
  b883c88

  Copy full SHA for b883c88

Commits on Apr 20, 2018

• EventData -> EventsMapData and appropriate changes are made but this class can be run only in test mode, discrepancy with stanford files at the moment

  eadium

  committed
  b4fa607

  Copy full SHA for b4fa607

Commits on Apr 21, 2018

• added class EntityData but compilation fails though

  eadium

  committed
  e3e8bfb

  Copy full SHA for e3e8bfb

• class EntityData made up to an end, small refactoring also

  eadium

  committed
  867879d

  Copy full SHA for 867879d

• removed files not corresponding to me

  eadium

  committed
  38e25b1

  Copy full SHA for 38e25b1

Commits on May 1, 2018

• removed Qt

  eadium

  committed
  116a39e

  Copy full SHA for 116a39e

Commits on May 3, 2018

• started work at sessions

  eadium

  committed
  47238a3

  Copy full SHA for 47238a3

Commits on May 5, 2018

• code edited according to Google Style

  eadium

  committed
  2854e54

  Copy full SHA for 2854e54

Commits on May 7, 2018

• small style improvements, new includes

  stanf0rd

  committed
  cbc78ac

  Copy full SHA for cbc78ac

• added GameData interfaces

  eadium

  committed
  02074f6

  Copy full SHA for 02074f6

Commits on May 8, 2018

• mapdata work comments for Artem

  stanf0rd

  committed
  09bd86b

  Copy full SHA for 09bd86b

• added MapScanner class

  eadium

  committed
  dfdf850

  Copy full SHA for dfdf850

Commits on May 9, 2018

• magic numbers were replaced ny enums

  eadium

  committed
  f91d0e8

  Copy full SHA for f91d0e8

Commits on May 13, 2018

• released alpha ver. of SessionData

  eadium

  committed
  11c583c

  Copy full SHA for 11c583c

• Delete entitydata.cpp

  eadium

  authored
  39d7b1c

  Copy full SHA for 39d7b1c

• Delete entitydata.h

  eadium

  authored
  47bec5a

  Copy full SHA for 47bec5a

Commits on May 14, 2018

• added validators for point and radius, removed unnecessary comments

  eadium

  committed
  b666d90

  Copy full SHA for b666d90

• Merge branch 'mouseartiom' of github.com:Rasseki-Studios/rasseki.game into mouseartiom

  eadium

  committed
  53c17c6

  Copy full SHA for 53c17c6

Commits on May 15, 2018

• SurfaceData is now in surface.h. Namespace SessionData added.

  eadium

  committed
  891f9fb

  Copy full SHA for 891f9fb

• SurfaceData moved back to session_data.h

  eadium

  committed
  ea9832c

  Copy full SHA for ea9832c

• added IsWalkable & GameData::Init(). Small fixes.

  eadium

  committed
  1f5d458

  Copy full SHA for 1f5d458

Commits on May 16, 2018

• Revert "added IsWalkable & GameData::Init(). Small fixes."

  Show description for 3ffbe3b
  eadium

  committed
  3ffbe3b

  Copy full SHA for 3ffbe3b

• session_data revived

  eadium

  committed
  615791c

  Copy full SHA for 615791c

• renamed validators

  eadium

  committed
  c346a49

  Copy full SHA for c346a49

• refactored code to be compilable

  eadium

  committed
  3985fb4

  Copy full SHA for 3985fb4

Commits on May 31, 2018

• changed project sructure for easier navigation

  eadium

  committed
  ca6425c

  Copy full SHA for ca6425c

Commits on Jun 13, 2018

• synchronized with test

  eadium

  committed
  3e7fa1d

  Copy full SHA for 3e7fa1d

Commits on Jun 20, 2018

• synched with test

  eadium

  committed
  7a508ea

  Copy full SHA for 7a508ea