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

• 7c4805d899 Merge pull request #18 from CrystalPointA4/feature/Menu kennyboy55 2016-06-20 20:43:00 +02:00
• e42779f6c7 Fixed project files kennyboy55 2016-06-20 20:42:35 +02:00
• ce2f658b61 Merge branch 'developer' into feature/Menu kennyboy55 2016-06-20 20:39:00 +02:00
• 3701918ac9 Bugfix kennyboy55 2016-06-20 20:38:56 +02:00
• d887328907 Merge pull request #19 from CrystalPointA4/feature/werkendewav kennyboy55 2016-06-20 20:37:14 +02:00
• 8cf1b02cf7 Merge branch 'developer' into feature/werkendewav kennyboy55 2016-06-20 20:34:35 +02:00
• 83557c7ba7 Added controller code kennyboy55 2016-06-20 20:33:28 +02:00
• 779cf5cb91 Merge pull request #20 from CrystalPointA4/linux_refactor Janco Kock 2016-06-20 20:11:10 +02:00
• 030a136e8b Working version for linux jancoow 2016-06-20 20:00:58 +02:00
• da0b1f5588 Johan fix kennyboy55 2016-06-20 17:16:29 +02:00
• f93c09a999 rock heeft muziek Aaldert 2016-06-20 15:48:57 +02:00
• 587b79044b Delete Aaldert 2016-06-20 15:41:39 +02:00
• dba9c581b1 world aangepast Aaldert 2016-06-20 15:33:07 +02:00
• d5406120c6 Enemy speelt cow! Aaldert 2016-06-20 15:30:38 +02:00
• e081373a45 Merge branch 'developer' into feature/Menu Remco 2016-06-20 15:23:55 +02:00
• 98f3645b6b menu pauses game, able to resume the game. exit game by pause menu Remco 2016-06-20 15:20:12 +02:00
• 5c776e3d3a Test Aaldert 2016-06-20 14:53:40 +02:00
• 03c06e0974 delete action pointer Remco 2016-06-20 13:44:02 +02:00
• b7d73c9abe Test 1 Aaldert 2016-06-20 13:43:13 +02:00
• 7758f2c294 able to give button a funtion pointer, who will be called when clicked on the button Remco 2016-06-20 13:42:28 +02:00
• 2e50d11e07 able to click with cursor, button detect clicking event Remco 2016-06-20 13:29:28 +02:00
• 1ec3c8f346 buttons shows when ever the cursor is in the button Remco 2016-06-20 12:50:51 +02:00
• 8dcee70324 button, text is placed in middle of button, plane is placed behind text Remco 2016-06-20 12:38:16 +02:00
• 6cf9437620 button is draw by menu Remco 2016-06-20 12:11:24 +02:00
• f84fcfa4e2 Merge pull request #17 from CrystalPointA4/worlds kennyboy55 2016-06-10 12:10:28 +02:00
• ad30824057 Added Rock world. Updated others kennyboy55 2016-06-10 12:09:16 +02:00
• 04fd3ac0e3 Skybox brightness hotfix kennyboy55 2016-06-10 11:59:43 +02:00
• 31c11f3e1f Merge pull request #16 from CrystalPointA4/feature/portal_logic kennyboy55 2016-06-10 11:56:52 +02:00
• 656a904a4b Merge remote-tracking branch 'origin/feature/portal_logic' into feature/portal_logic kennyboy55 2016-06-10 11:56:17 +02:00
• 348b53c027 Added enemy -> brightness skybox kennyboy55 2016-06-10 11:55:57 +02:00
• 71801a30f2 player crystals refresh Remco 2016-06-10 11:06:39 +02:00
• 0ca94aef4d when collected all crystals it is possible to move to the next level, by stepping in the portal Remco 2016-06-10 10:56:54 +02:00
• ced3ff4462 Attempt implement menu (unresolved symbol error) kennyboy55 2016-06-09 17:56:37 +02:00
• 912a2234a3 crystals will be displayed, when not get with darker icons, when picked up crystals get colors Remco 2016-06-09 17:47:34 +02:00
• 0209c8b4e2 Merge pull request #14 from CrystalPointA4/feature/refactor_crystals 0.1 kennyboy55 2016-06-09 13:05:11 +02:00
• 6bcd9b1426 Merge pull request #15 from CrystalPointA4/feature/Skybox kennyboy55 2016-06-09 13:04:19 +02:00
• 579e02728a Merge branch 'developer' into feature/Skybox kennyboy55 2016-06-09 13:03:28 +02:00
• af681b0223 Fixed color issues kennyboy55 2016-06-09 13:01:03 +02:00
• c3b9e23f3d last stuff heightmapTrees Dofensmirtsz 2016-06-09 12:43:17 +02:00
• 3ed5331437 Merge branch 'developer' into feature/refactor_crystals Remco 2016-06-09 12:41:53 +02:00
• 0aad7262d6 Merge pull request #13 from CrystalPointA4/feature/OpenAL kennyboy55 2016-06-09 12:38:09 +02:00
• 9cfaf07eba optimiasted crystal, entity now has a collide methode, which will be called when an entity collison has with the player. Remco 2016-06-09 12:35:00 +02:00
• 9659caa1d8 Fix filters kennyboy55 2016-06-09 12:32:13 +02:00
• a4373adc25 Fix image direction / load from JSON kennyboy55 2016-06-09 12:22:40 +02:00
• 1f3188376a added new model for crystal, not possible to move through crystals Remco 2016-06-09 12:07:27 +02:00
• 69561794d8 Reimplemented into newer develop version kennyboy55 2016-06-09 12:01:24 +02:00
• 5c24a34202 Merge branch 'developer' into feature/OpenAL Aaldert 2016-06-09 11:44:45 +02:00
• 1164501158 added variables for crystal icons in interface class Remco 2016-06-09 11:12:15 +02:00
• 593b9547cf Merge pull request #12 from CrystalPointA4/crystal_capturing kennyboy55 2016-06-09 10:34:49 +02:00
• 1a4339b49d Merge branch 'developer' into crystal_capturing kennyboy55 2016-06-09 10:34:33 +02:00
• 2c624ac4c7 Merge pull request #11 from CrystalPointA4/enemy kennyboy55 2016-06-09 10:27:24 +02:00
• 881b58138c crystal displayed on interface, with fancy gradient and the most beautifull colors for the crystal :) Remco 2016-06-08 13:08:14 +02:00
• bba0a2e2a0 picking up crystal(sphere) Remco 2016-06-08 12:41:33 +02:00
• 117010b9fe OpenAl Werkt! en Setup enzo Aaldert 2016-06-05 23:49:06 +02:00
• 47b4d9570d Music Handler Aaldert 2016-06-05 17:25:04 +02:00
• 0f8fd67dd3 Merge remote-tracking branch 'refs/remotes/origin/developer' into feature/OpenAL Aaldert 2016-06-05 16:06:48 +02:00
• 0afbca8ffc More Generalized Aaldert 2016-06-05 15:26:14 +02:00
• 293ceb0b9f enemy walking around world Remco 2016-06-03 13:58:07 +02:00
• b827885f40 enemy collide logic in enemy and out of world Remco 2016-06-03 13:51:54 +02:00
• 87e94056cc Merge remote-tracking branch 'origin/heightmapTrees' into heightmapTrees kennyboy55 2016-06-03 11:40:52 +02:00
• c43718f8fa Merge branch 'developer' into heightmapTrees kennyboy55 2016-06-03 11:39:19 +02:00
• 23f1ca4f34 fix Dofensmirtsz 2016-06-03 11:34:19 +02:00
• 527394f635 Merge pull request #10 from CrystalPointA4/enemy kennyboy55 2016-06-03 11:31:33 +02:00
• 95ab1879b4 Merge branch 'developer' into enemy kennyboy55 2016-06-03 11:30:19 +02:00
• 95febc136f Merge pull request #9 from CrystalPointA4/feature/interface kennyboy55 2016-06-03 11:14:46 +02:00
• e2f13cd311 Rocky places Dofensmirtsz 2016-06-03 11:13:01 +02:00
• b4a2da4b88 Merge pull request #8 from CrystalPointA4/worldLoading kennyboy55 2016-06-03 11:12:23 +02:00
• c3fe041eb1 enemy logic added to enemy and out of world Remco 2016-06-03 11:09:48 +02:00
• ba9f15ee5c SJ:Dgbkjzdfxgbdzfjkgbkjfdg Dofensmirtsz 2016-06-02 13:45:45 +02:00
• 644437a5f0 Draak shit Dofensmirtsz 2016-06-01 02:06:22 +02:00
• 353efb38c5 Begin wereld Dofensmirtsz 2016-05-31 13:05:37 +02:00
• ae5a28f273 Spikey path fixed Dofensmirtsz 2016-05-31 08:46:33 +02:00
• 1ade6002c1 Bugfix/performance improvement kennyboy55 2016-05-30 13:12:51 +02:00
• f0a8330819 Werkt, maar loopt vast Daniel 2016-05-30 12:46:49 +02:00
• a80fc69043 .wav file toegevoegt Daniel 2016-05-30 11:59:36 +02:00
• 0c73b5a586 Settings aangepast, als het goed is zit het er nu volledig in Daniel 2016-05-30 11:58:34 +02:00
• b53bcac528 OpenAL Test Daniel 2016-05-30 11:04:09 +02:00
• 6f28527be4 Stoneworld Dofensmirtsz 2016-05-29 15:10:16 +02:00
• f6f6889c63 Jannick is fag Dofensmirtsz 2016-05-29 14:45:04 +02:00
• 638c507276 Maze init Dofensmirtsz 2016-05-28 17:36:04 +02:00
• ae80c7a5bf Add health/xp/level interface kennyboy55 2016-05-28 16:04:44 +02:00
• 34ea491f39 Remove scale kennyboy55 2016-05-28 13:11:11 +02:00
• 88685c6366 Merge branch 'worldLoading' into heightmapTrees Dofensmirtsz 2016-05-27 11:26:47 +02:00
• cc75cb631a fix Dofensmirtsz 2016-05-27 11:23:43 +02:00
• 9fccd71521 maze? Dofensmirtsz 2016-05-27 10:57:44 +02:00
• d83cc6403c Spawn objects from file kennyboy55 2016-05-27 10:56:24 +02:00
• 1c59a3bc6f Fix player height (not working with scale) kennyboy55 2016-05-26 18:53:36 +02:00
• 2b0e22d4c9 Added height at location kennyboy55 2016-05-26 17:06:34 +02:00
• 4c613b606a Implemented getHeight kennyboy55 2016-05-26 13:21:14 +02:00
• 56e174ae2f Lord and Savior Johan kennyboy55 2016-05-26 12:53:22 +02:00
• 908786897f Added world loading and other various improvements kennyboy55 2016-05-25 22:29:18 +02:00
• 33a61ca2ed Merge pull request #7 from CrystalPointA4/enemy kennyboy55 2016-05-25 13:44:26 +02:00
• b2fa0bc028 Merge branch 'developer' into enemy Remco 2016-05-25 13:42:02 +02:00
• cf124b3f38 enemy collison added, no jittering anymore Remco 2016-05-25 13:38:13 +02:00
• 0b6096d3e8 Merge pull request #6 from CrystalPointA4/array-rendering kennyboy55 2016-05-25 12:56:17 +02:00
• 84fcc346a9 Implement optimised array rendering kennyboy55 2016-05-25 12:44:24 +02:00
• fe1aa7220e Merge pull request #5 from CrystalPointA4/heightmap kennyboy55 2016-05-25 11:53:02 +02:00
• d739141b25 enemys always looking at you when you are the target Remco 2016-05-25 11:46:22 +02:00
• 2a6cc0fd87 Fix missing Vertex kennyboy55 2016-05-25 11:44:13 +02:00
• 965b54c901 Added heightmap kennyboy55 2016-05-25 11:31:37 +02:00