 kennyboy55
|
3025fecf94
|
Load weapons from JSON
|
2016-06-21 18:25:16 +02:00 |
|
|
kennyboy55
|
942b068851
|
Merge branch 'developer' into feature/Controller
# Conflicts:
# CrystalPoint.cpp
# Player.cpp
|
2016-06-21 15:14:08 +02:00 |
|
 Aaldert
|
ea22712a45
|
Merge branch 'developer' into feature/gameplay
# Conflicts:
# CrystalPoint.cpp
|
2016-06-21 14:06:41 +02:00 |
|
 jancoow
|
36dc74a39e
|
Fixed crash at startup, improved walking speed
|
2016-06-21 14:00:04 +02:00 |
|
|
kennyboy55
|
8700aa90af
|
Bugfixes, added sound to portal and enemy in JSON
|
2016-06-21 13:51:16 +02:00 |
|
|
Aaldert
|
35c21260e4
|
Hp, Lvl en Xp gameplay toegevoegt
|
2016-06-21 12:25:38 +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 |
|
|
kennyboy55
|
83557c7ba7
|
Added controller code
|
2016-06-20 20:33:28 +02:00 |
|
 Remco
|
98f3645b6b
|
menu pauses game, able to resume the game. exit game by pause menu
|
2016-06-20 15:20:12 +02:00 |
|
|
Remco
|
7758f2c294
|
able to give button a funtion pointer, who will be called when clicked on the button
|
2016-06-20 13:42:28 +02:00 |
|
|
Remco
|
2e50d11e07
|
able to click with cursor, button detect clicking event
|
2016-06-20 13:29:28 +02:00 |
|
|
Remco
|
1ec3c8f346
|
buttons shows when ever the cursor is in the button
|
2016-06-20 12:50:51 +02:00 |
|
|
Remco
|
8dcee70324
|
button, text is placed in middle of button, plane is placed behind text
|
2016-06-20 12:38:16 +02:00 |
|
|
Remco
|
6cf9437620
|
button is draw by menu
|
2016-06-20 12:11:24 +02:00 |
|
|
kennyboy55
|
ced3ff4462
|
Attempt implement menu (unresolved symbol error)
|
2016-06-09 17:56:37 +02:00 |
|
|
Aaldert
|
117010b9fe
|
OpenAl Werkt! en Setup enzo
|
2016-06-05 23:49:06 +02:00 |
|
|
kennyboy55
|
95ab1879b4
|
Merge branch 'developer' into enemy
# Conflicts:
# CrystalPoint.cpp
# Entity.cpp
# Player.cpp
# Player.h
# World.cpp
# World.h
|
2016-06-03 11:30:19 +02:00 |
|
|
Remco
|
c3fe041eb1
|
enemy logic added to enemy and out of world
|
2016-06-03 11:09:48 +02:00 |
|
|
kennyboy55
|
ae80c7a5bf
|
Add health/xp/level interface
|
2016-05-28 16:04:44 +02:00 |
|
|
kennyboy55
|
34ea491f39
|
Remove scale
|
2016-05-28 13:11:11 +02:00 |
|
|
kennyboy55
|
1c59a3bc6f
|
Fix player height (not working with scale)
|
2016-05-26 18:53:36 +02:00 |
|
|
kennyboy55
|
2b0e22d4c9
|
Added height at location
|
2016-05-26 17:06:34 +02:00 |
|
|
kennyboy55
|
908786897f
|
Added world loading and other various improvements
|
2016-05-25 22:29:18 +02:00 |
|