 jancoow
|
a1a0028f5a
|
Merge branch 'developer' into feature/weaponCollision
|
2016-06-22 03:30:47 +02:00 |
|
|
Janco Kock
|
c06298f78f
|
Merge pull request #32 from CrystalPointA4/revertLoadingscreenShit
Revert loadingscreen shit
|
2016-06-22 03:30:21 +02:00 |
|
|
jancoow
|
858ffc8fde
|
Merge branch 'developer' into revertLoadingscreenShit
|
2016-06-22 03:29:37 +02:00 |
|
|
jancoow
|
1da4dedcea
|
Fixed wrong weapon drawing and removed old hit code
|
2016-06-22 03:28:18 +02:00 |
|
 Dofensmirtsz
|
297f8a456c
|
world volgorde
|
2016-06-22 03:28:14 +02:00 |
|
 kennyboy55
|
3b131e949d
|
Merge branch 'developer' into revertLoadingscreenShit
# Conflicts:
# Weapon.cpp
# World.cpp
|
2016-06-22 03:22:38 +02:00 |
|
|
Dofensmirtsz
|
2c6132ca17
|
Object files
|
2016-06-22 03:21:32 +02:00 |
|
|
kennyboy55
|
83240e2c57
|
More fixes
|
2016-06-22 03:18:13 +02:00 |
|
|
jancoow
|
2bab7e05f8
|
More fixing...
|
2016-06-22 03:09:43 +02:00 |
|
|
jancoow
|
92460b8ca4
|
Merge pull request #31 from CrystalPointA4/feature/loadingscreen
Feature/loadingscreen (reverted from commit 316d6c9e14)
|
2016-06-22 03:09:28 +02:00 |
|
|
Dofensmirtsz
|
2ebff1b3dc
|
dubbel kristal
|
2016-06-22 03:08:33 +02:00 |
|
|
kennyboy55
|
b6b42b3afc
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# worlds/worlds.json
|
2016-06-22 03:03:20 +02:00 |
|
|
kennyboy55
|
e7c7dbaf39
|
bugfixes
|
2016-06-22 03:02:51 +02:00 |
|
 Jannick van Ballegooijen
|
9a31e09bff
|
added trees
|
2016-06-22 03:00:39 +02:00 |
|
|
jancoow
|
2230682a85
|
Added rumble on enemy hit, added try for teleport
|
2016-06-22 02:58:45 +02:00 |
|
|
Dofensmirtsz
|
c5e7117bac
|
Merge branch 'FireWorld' into developer
|
2016-06-22 02:57:38 +02:00 |
|
|
Dofensmirtsz
|
ec76b4e754
|
Merge branch 'developer' into FireWorld
# Conflicts:
# worlds/worlds.json
|
2016-06-22 02:57:01 +02:00 |
|
|
kennyboy55
|
cfb8a7ada8
|
Merge remote-tracking branch 'origin/developer' into developer
|
2016-06-22 02:55:46 +02:00 |
|
|
kennyboy55
|
42cffd796d
|
bugfix
|
2016-06-22 02:55:22 +02:00 |
|
|
Jannick van Ballegooijen
|
82acf0d9fc
|
ice world
|
2016-06-22 02:54:12 +02:00 |
|
|
Dofensmirtsz
|
f6d7695405
|
Fire en Earth werkend
|
2016-06-22 02:52:35 +02:00 |
|
|
kennyboy55
|
5de58e6f74
|
Remove circle
|
2016-06-22 02:35:34 +02:00 |
|
|
kennyboy55
|
316d6c9e14
|
Merge pull request #31 from CrystalPointA4/feature/loadingscreen
Feature/loadingscreen
|
2016-06-22 02:20:48 +02:00 |
|
 Remco
|
80f0c33b91
|
Merge branch 'developer' into feature/loadingscreen
# Conflicts:
# worlds/rock.json
|
2016-06-22 02:17:44 +02:00 |
|
|
Remco
|
9f455be8d6
|
revert commit
|
2016-06-22 02:00:30 +02:00 |
|
|
kennyboy55
|
5ad61e525f
|
Merge pull request #30 from CrystalPointA4/world/Building
World/building
|
2016-06-22 01:54:21 +02:00 |
|
|
kennyboy55
|
df611e8e51
|
Bugfix
|
2016-06-22 01:51:58 +02:00 |
|
|
kennyboy55
|
5fc92d3f2a
|
Merge branch 'developer' into world/Building
# Conflicts:
# World.cpp
# worlds/rock.json
|
2016-06-22 01:49:27 +02:00 |
|
|
Remco
|
d1abc20f64
|
placed loadingscreen picture in json file of a world
|
2016-06-22 01:48:00 +02:00 |
|
|
kennyboy55
|
97d43a1249
|
Merge pull request #29 from CrystalPointA4/feature/weaponCollision
Feature/weapon collision
|
2016-06-22 01:45:14 +02:00 |
|
|
Remco
|
cdd3b962eb
|
texture in loadings screen
|
2016-06-22 01:40:53 +02:00 |
|
|
jancoow
|
c9e5be2573
|
Merge branch 'developer' into feature/weaponCollision
|
2016-06-22 01:38:46 +02:00 |
|
|
jancoow
|
5b6e7b54c7
|
Added enemy damage
|
2016-06-22 01:37:47 +02:00 |
|
|
kennyboy55
|
9143204610
|
Merge pull request #28 from CrystalPointA4/feature/weaponCollision
Feature/weapon collision
|
2016-06-22 00:50:22 +02:00 |
|
|
kennyboy55
|
5f31b2e602
|
Merge branch 'developer' into feature/weaponCollision
|
2016-06-22 00:49:05 +02:00 |
|
|
kennyboy55
|
342a56fa5a
|
Added audio
|
2016-06-22 00:47:02 +02:00 |
|
|
jancoow
|
27dfaf74c4
|
Better weapon alignment
|
2016-06-22 00:32:19 +02:00 |
|
|
Remco
|
fea7728139
|
enemy hits player
|
2016-06-22 00:26:43 +02:00 |
|
|
Remco
|
50e2b1c7ea
|
enemy weird xp gift fixed
|
2016-06-21 23:44:32 +02:00 |
|
|
Remco
|
5bff991b77
|
Merge branch 'developer' into feature/loadingscreen
|
2016-06-21 23:39:09 +02:00 |
|
|
Remco
|
9192eb7371
|
see couting points of loading things
|
2016-06-21 23:38:33 +02:00 |
|
|
kennyboy55
|
eaa6f9cd57
|
Hotfix rock world
|
2016-06-21 23:35:36 +02:00 |
|
|
Dofensmirtsz
|
6306e8abd4
|
Heightmap fix, texture fix, rotating crystals and enemy height to 0
|
2016-06-21 23:31:43 +02:00 |
|
|
Remco
|
7edbcd4d4d
|
loadingscreen has been draw when loading a world
|
2016-06-21 23:28:44 +02:00 |
|
|
Remco
|
d3bde622f0
|
menu placing right
|
2016-06-21 23:19:20 +02:00 |
|
|
Remco
|
a407be072d
|
Revert "Revert "Revert "added loadingscreen clas"""
This reverts commit 97448bfabf.
|
2016-06-21 23:12:22 +02:00 |
|
|
Remco
|
97448bfabf
|
Revert "Revert "added loadingscreen clas""
This reverts commit 7e6514581e.
|
2016-06-21 23:12:02 +02:00 |
|
|
Remco
|
7e6514581e
|
Revert "added loadingscreen clas"
This reverts commit 52ef1b4494.
|
2016-06-21 23:11:42 +02:00 |
|
|
jancoow
|
ba0482ee0a
|
Merge remote-tracking branch 'origin/developer' into feature/weaponCollision
Added waeponswitch to backbutton of controller
# Conflicts:
# Enemy.cpp
# Player.cpp
# Weapon.cpp
# Weapon.h
|
2016-06-21 23:10:58 +02:00 |
|
|
kennyboy55
|
0e99b9f719
|
Attempt fix rock world
|
2016-06-21 22:57:18 +02:00 |
|