Commit Graph

Select branches

Hide Pull Requests

FireWorld

RockFixPlis

developer

feature/iceworld

heightmapTrees

master

rewrite

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#4

#4

#5

#6

#7

#8

#9

0.1

1.0

Mono Color

• 9941b03fdc Windows fix developer kennyboy55 2016-06-22 08:34:48 +02:00
• 9031873721 fixed ice 1.0 jancoow 2016-06-22 03:41:52 +02:00
• fd2aadfdf7 Damage bugfix kennyboy55 2016-06-22 03:34:49 +02:00
• 4dd6aef904 Merge pull request #33 from CrystalPointA4/feature/weaponCollision Janco Kock 2016-06-22 03:31:16 +02:00
• a1a0028f5a Merge branch 'developer' into feature/weaponCollision jancoow 2016-06-22 03:30:47 +02:00
• c06298f78f Merge pull request #32 from CrystalPointA4/revertLoadingscreenShit Janco Kock 2016-06-22 03:30:21 +02:00
• 858ffc8fde Merge branch 'developer' into revertLoadingscreenShit jancoow 2016-06-22 03:29:37 +02:00
• 1da4dedcea Fixed wrong weapon drawing and removed old hit code jancoow 2016-06-22 03:28:18 +02:00
• 297f8a456c world volgorde Dofensmirtsz 2016-06-22 03:28:14 +02:00
• 3b131e949d Merge branch 'developer' into revertLoadingscreenShit kennyboy55 2016-06-22 03:22:38 +02:00
• 2c6132ca17 Object files Dofensmirtsz 2016-06-22 03:21:32 +02:00
• 83240e2c57 More fixes kennyboy55 2016-06-22 03:18:13 +02:00
• f370b5b467 double crystal FireWorld Dofensmirtsz 2016-06-22 03:14:33 +02:00
• 2bab7e05f8 More fixing... jancoow 2016-06-22 03:09:43 +02:00
• 92460b8ca4 Merge pull request #31 from CrystalPointA4/feature/loadingscreen jancoow 2016-06-22 03:09:28 +02:00
• 2ebff1b3dc dubbel kristal Dofensmirtsz 2016-06-22 03:08:33 +02:00
• b6b42b3afc Merge remote-tracking branch 'origin/developer' into developer kennyboy55 2016-06-22 03:03:20 +02:00
• e7c7dbaf39 bugfixes kennyboy55 2016-06-22 03:02:51 +02:00
• 9a31e09bff added trees Jannick van Ballegooijen 2016-06-22 03:00:39 +02:00
• 2230682a85 Added rumble on enemy hit, added try for teleport jancoow 2016-06-22 02:58:45 +02:00
• c5e7117bac Merge branch 'FireWorld' into developer Dofensmirtsz 2016-06-22 02:57:38 +02:00
• ec76b4e754 Merge branch 'developer' into FireWorld Dofensmirtsz 2016-06-22 02:57:01 +02:00
• cfb8a7ada8 Merge remote-tracking branch 'origin/developer' into developer kennyboy55 2016-06-22 02:55:46 +02:00
• 42cffd796d bugfix kennyboy55 2016-06-22 02:55:22 +02:00
• 82acf0d9fc ice world Jannick van Ballegooijen 2016-06-22 02:54:12 +02:00
• f6d7695405 Fire en Earth werkend Dofensmirtsz 2016-06-22 02:52:35 +02:00
• 5de58e6f74 Remove circle kennyboy55 2016-06-22 02:35:34 +02:00
• 6732a55097 dafuq feature/iceworld Jannick van Ballegooijen 2016-06-22 02:27:09 +02:00
• 316d6c9e14 Merge pull request #31 from CrystalPointA4/feature/loadingscreen kennyboy55 2016-06-22 02:20:48 +02:00
• 80f0c33b91 Merge branch 'developer' into feature/loadingscreen Remco 2016-06-22 02:17:44 +02:00
• 9f455be8d6 revert commit Remco 2016-06-22 02:00:30 +02:00
• 5ad61e525f Merge pull request #30 from CrystalPointA4/world/Building kennyboy55 2016-06-22 01:54:21 +02:00
• df611e8e51 Bugfix kennyboy55 2016-06-22 01:51:58 +02:00
• 6f8c2955eb added all static objects to world TODO enemies Jannick van Ballegooijen 2016-06-22 01:51:25 +02:00
• 5fc92d3f2a Merge branch 'developer' into world/Building kennyboy55 2016-06-22 01:49:27 +02:00
• d1abc20f64 placed loadingscreen picture in json file of a world Remco 2016-06-22 01:48:00 +02:00
• 97d43a1249 Merge pull request #29 from CrystalPointA4/feature/weaponCollision kennyboy55 2016-06-22 01:45:14 +02:00
• cdd3b962eb texture in loadings screen Remco 2016-06-22 01:40:53 +02:00
• c9e5be2573 Merge branch 'developer' into feature/weaponCollision jancoow 2016-06-22 01:38:46 +02:00
• 5b6e7b54c7 Added enemy damage jancoow 2016-06-22 01:37:23 +02:00
• ec83d31065 optimized grass Jannick van Ballegooijen 2016-06-22 01:10:29 +02:00
• e69008b083 added models : note to myself : am genius Jannick van Ballegooijen 2016-06-22 01:05:49 +02:00
• 9143204610 Merge pull request #28 from CrystalPointA4/feature/weaponCollision kennyboy55 2016-06-22 00:50:22 +02:00
• 5f31b2e602 Merge branch 'developer' into feature/weaponCollision kennyboy55 2016-06-22 00:49:05 +02:00
• 342a56fa5a Added audio kennyboy55 2016-06-22 00:47:02 +02:00
• 27dfaf74c4 Better weapon alignment jancoow 2016-06-22 00:32:19 +02:00
• fea7728139 enemy hits player Remco 2016-06-22 00:26:43 +02:00
• ddadafecff added ice world base Jannick van Ballegooijen 2016-06-22 00:23:35 +02:00
• 50e2b1c7ea enemy weird xp gift fixed Remco 2016-06-21 23:44:32 +02:00
• 5bff991b77 Merge branch 'developer' into feature/loadingscreen Remco 2016-06-21 23:39:09 +02:00
• 9192eb7371 see couting points of loading things Remco 2016-06-21 23:38:33 +02:00
• eaa6f9cd57 Hotfix rock world kennyboy55 2016-06-21 23:35:36 +02:00
• 6306e8abd4 Heightmap fix, texture fix, rotating crystals and enemy height to 0 Dofensmirtsz 2016-06-21 23:31:43 +02:00
• 7edbcd4d4d loadingscreen has been draw when loading a world Remco 2016-06-21 23:28:44 +02:00
• d3bde622f0 menu placing right Remco 2016-06-21 23:19:20 +02:00
• a407be072d Revert "Revert "Revert "added loadingscreen clas""" Remco 2016-06-21 23:12:22 +02:00
• 97448bfabf Revert "Revert "added loadingscreen clas"" Remco 2016-06-21 23:12:02 +02:00
• 7e6514581e Revert "added loadingscreen clas" Remco 2016-06-21 23:11:42 +02:00
• ba0482ee0a Merge remote-tracking branch 'origin/developer' into feature/weaponCollision Added waeponswitch to backbutton of controller jancoow 2016-06-21 23:10:58 +02:00
• 0e99b9f719 Attempt fix rock world kennyboy55 2016-06-21 22:57:18 +02:00
• e7163fc07c Added controller cursor in menu jancoow 2016-06-21 22:12:08 +02:00
• 52ef1b4494 added loadingscreen clas Remco 2016-06-21 22:10:58 +02:00
• bce21f64d1 Helemaal af, alleen nog maybe bugfix RockFixPlis Dofensmirtsz 2016-06-21 21:11:27 +02:00
• 57833ce3ba Alleen nog Vincent Dofensmirtsz 2016-06-21 20:23:14 +02:00
• 96e1cb6a41 Alleen nog enemy locations doen Dofensmirtsz 2016-06-21 20:03:59 +02:00
• 3cf6bf5857 Merge pull request #27 from CrystalPointA4/musicInclude kennyboy55 2016-06-21 20:03:56 +02:00
• 579a04a9b4 Merge branch 'developer' into musicInclude Aaldert 2016-06-21 19:16:12 +02:00
• b09311d810 Merge branch 'developer' into musicInclude Aaldert 2016-06-21 19:06:50 +02:00
• d42ae6ccd3 Merge pull request #26 from CrystalPointA4/feature/weaponJSON kennyboy55 2016-06-21 19:05:53 +02:00
• f80b513d90 Add weapon switching kennyboy55 2016-06-21 19:05:06 +02:00
• 3025fecf94 Load weapons from JSON kennyboy55 2016-06-21 18:25:16 +02:00
• 41a81d104e Enemy stops geluid als gedood Aaldert 2016-06-21 18:23:57 +02:00
• 9543dd8324 Muziek toegvoegt aan world en enemy Aaldert 2016-06-21 18:15:49 +02:00
• d56625e19a MusicIncluded, crystals Aaldert 2016-06-21 17:10:34 +02:00
• 0431e9c230 Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision jancoow 2016-06-21 17:07:59 +02:00
• d14f045708 Added dead check jancoow 2016-06-21 17:07:19 +02:00
• 4437acb9f2 Added missing json kennyboy55 2016-06-21 17:06:57 +02:00
• 02a537dc60 Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision jancoow 2016-06-21 17:01:08 +02:00
• 4249e35653 Check if weapon collision point is inside enemy and do weapon damage jancoow 2016-06-21 17:00:36 +02:00
• ec900f7410 Added health+damage to enemy kennyboy55 2016-06-21 16:58:39 +02:00
• 0a0fdfc8b1 Merge pull request #25 from CrystalPointA4/feature/Controller kennyboy55 2016-06-21 15:44:43 +02:00
• 4effce6fea Merge branch 'developer' into feature/Controller kennyboy55 2016-06-21 15:43:54 +02:00
• e48b43faea sodinskjdgnasdgkasdg Dofensmirtsz 2016-06-21 15:42:57 +02:00
• 81cf7f43c0 Merge pull request #24 from CrystalPointA4/feature/normalsmoothing kennyboy55 2016-06-21 15:42:39 +02:00
• 58ac7d13cf Merge pull request #23 from CrystalPointA4/feature/soundsystemfix kennyboy55 2016-06-21 15:42:09 +02:00
• c91bb5c656 attempt fix kennyboy55 2016-06-21 15:41:42 +02:00
• ed3e537a3c Fix visual studio project files kennyboy55 2016-06-21 15:31:12 +02:00
• eaeff6ed7d normal smoothing Jannick van Ballegooijen 2016-06-21 15:28:15 +02:00
• 942b068851 Merge branch 'developer' into feature/Controller kennyboy55 2016-06-21 15:14:08 +02:00
• eadfea9d63 Sound pointers worden gedelete Aaldert 2016-06-21 14:45:41 +02:00
• d795e8465c Stones en textures af Dofensmirtsz 2016-06-21 14:41:14 +02:00
• e848780535 Merge pull request #22 from CrystalPointA4/feature/gameplay kennyboy55 2016-06-21 14:17:13 +02:00
• ea22712a45 Merge branch 'developer' into feature/gameplay Aaldert 2016-06-21 14:06:41 +02:00
• 36dc74a39e Fixed crash at startup, improved walking speed jancoow 2016-06-21 14:00:04 +02:00
• 6096e53d94 Merge pull request #21 from CrystalPointA4/feature/Sounds kennyboy55 2016-06-21 13:53:30 +02:00
• 8700aa90af Bugfixes, added sound to portal and enemy in JSON kennyboy55 2016-06-21 13:51:16 +02:00
• 35c21260e4 Hp, Lvl en Xp gameplay toegevoegt Aaldert 2016-06-21 12:25:38 +02:00
• 06a768a3a1 Fixed right weapon jancoow 2016-06-21 11:32:37 +02:00
• 3f8623d0bf Merge remote-tracking branch 'origin/developer' into feature/Controller Added support for second controller # Conflicts: # CrystalPoint.cpp # CrystalPoint.h # CrystalPoint.vcxproj # CrystalPoint.vcxproj.filters jancoow 2016-06-21 11:24:55 +02:00
• eaa185c90a begin fix van de map Dofensmirtsz 2016-06-20 21:47:39 +02:00