 jancoow
|
9031873721
|
fixed ice
|
2016-06-22 03:41:52 +02:00 |
|
|
Janco Kock
|
4dd6aef904
|
Merge pull request #33 from CrystalPointA4/feature/weaponCollision
Feature/weapon collision
|
2016-06-22 03:31:16 +02:00 |
|
|
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 |
|
|
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 |
|
|
jancoow
|
2230682a85
|
Added rumble on enemy hit, added try for teleport
|
2016-06-22 02:58:45 +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 |
|
|
jancoow
|
27dfaf74c4
|
Better weapon alignment
|
2016-06-22 00:32:19 +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 |
|
|
jancoow
|
e7163fc07c
|
Added controller cursor in menu
|
2016-06-21 22:12:08 +02:00 |
|
|
jancoow
|
0431e9c230
|
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
2016-06-21 17:07:59 +02:00 |
|
|
jancoow
|
d14f045708
|
Added dead check
|
2016-06-21 17:07:19 +02:00 |
|
|
jancoow
|
02a537dc60
|
Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision
|
2016-06-21 17:01:08 +02:00 |
|
|
jancoow
|
4249e35653
|
Check if weapon collision point is inside enemy and do weapon damage
|
2016-06-21 17:00:36 +02:00 |
|
|
jancoow
|
36dc74a39e
|
Fixed crash at startup, improved walking speed
|
2016-06-21 14:00:04 +02:00 |
|
|
jancoow
|
06a768a3a1
|
Fixed right weapon
|
2016-06-21 11:32:37 +02:00 |
|
|
jancoow
|
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
|
2016-06-21 11:24:55 +02:00 |
|
|
Janco Kock
|
779cf5cb91
|
Merge pull request #20 from CrystalPointA4/linux_refactor
Working version for linux
|
2016-06-20 20:11:10 +02:00 |
|
|
jancoow
|
030a136e8b
|
Working version for linux
|
2016-06-20 20:00:58 +02:00 |
|
|
jancoow
|
e7a7cc5588
|
Fixed capital letters and string return error..
|
2016-05-23 12:34:55 +02:00 |
|
|
Janco Kock
|
47c228205a
|
Merge pull request #3 from CrystalPointA4/johan_linuxrefactor
Johan linuxrefactor
|
2016-05-23 10:00:59 +02:00 |
|
|
jancoow
|
5ca5ca194b
|
Fixed capital letters...
|
2016-05-23 09:46:36 +02:00 |
|
|
jancoow
|
e75f624935
|
Fixed cmath problem
|
2016-05-23 08:53:03 +02:00 |
|
|
jancoow
|
7d13269480
|
Refactor johan branch for compiling with g++
|
2016-05-22 23:19:05 +02:00 |
|