 jancoow
|
92460b8ca4
|
Merge pull request #31 from CrystalPointA4/feature/loadingscreen
Feature/loadingscreen (reverted from commit 316d6c9e14)
|
2016-06-22 03:09:28 +02:00 |
|
 Remco
|
9f455be8d6
|
revert commit
|
2016-06-22 02:00:30 +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 |
|
 kennyboy55
|
eaa6f9cd57
|
Hotfix rock world
|
2016-06-21 23:35:36 +02:00 |
|
|
jancoow
|
e7163fc07c
|
Added controller cursor in menu
|
2016-06-21 22:12:08 +02:00 |
|
|
kennyboy55
|
8700aa90af
|
Bugfixes, added sound to portal and enemy in JSON
|
2016-06-21 13:51:16 +02:00 |
|
|
Remco
|
e081373a45
|
Merge branch 'developer' into feature/Menu
# Conflicts:
# CrystalPoint.vcxproj.filters
# Main.cpp
# Skybox.cpp
# Skybox.h
|
2016-06-20 15:23:55 +02:00 |
|
|
Remco
|
2e50d11e07
|
able to click with cursor, button detect clicking event
|
2016-06-20 13:29:28 +02:00 |
|
|
kennyboy55
|
ad30824057
|
Added Rock world. Updated others
|
2016-06-10 12:09:16 +02:00 |
|
|
Remco
|
0ca94aef4d
|
when collected all crystals it is possible to move to the next level, by stepping in the portal
|
2016-06-10 10:56:54 +02:00 |
|
|
kennyboy55
|
ced3ff4462
|
Attempt implement menu (unresolved symbol error)
|
2016-06-09 17:56:37 +02:00 |
|
|
kennyboy55
|
579e02728a
|
Merge branch 'developer' into feature/Skybox
# Conflicts:
# CrystalPoint.vcxproj.filters
# World.h
|
2016-06-09 13:03:28 +02:00 |
|
|
kennyboy55
|
69561794d8
|
Reimplemented into newer develop version
|
2016-06-09 12:01:24 +02:00 |
|
 Aaldert
|
117010b9fe
|
OpenAl Werkt! en Setup enzo
|
2016-06-05 23:49:06 +02:00 |
|
|
kennyboy55
|
ae80c7a5bf
|
Add health/xp/level interface
|
2016-05-28 16:04:44 +02:00 |
|
|
kennyboy55
|
908786897f
|
Added world loading and other various improvements
|
2016-05-25 22:29:18 +02:00 |
|
|
jancoow
|
7d13269480
|
Refactor johan branch for compiling with g++
|
2016-05-22 23:19:05 +02:00 |
|
|
kennyboy55
|
a8415db4ac
|
Added new Johan Code
|
2016-05-20 13:00:04 +02:00 |
|
|
kennyboy55
|
7c4ee37867
|
Johan is love, Johan is life
|
2016-05-19 14:25:03 +02:00 |
|
|
Remco
|
a38a6d3c5f
|
get player out of main. player is now a singelton?(not sure of singleton is good inplemented). Added player singleton in worldstate
|
2016-05-19 11:27:32 +02:00 |
|
|
kennyboy55
|
876ec56780
|
Started rewriting
|
2016-05-17 15:31:49 +02:00 |
|
|
kennyboy55
|
5df4a1d8d0
|
Hotfix Main.cpp and Weapon.cpp
|
2016-05-17 10:42:06 +02:00 |
|
|
kennyboy55
|
d7f74212f0
|
Merge pull request #2 from CrystalPointA4/weapons_by_player
Weapons by player
|
2016-05-17 10:37:12 +02:00 |
|
|
Remco
|
e5664e207d
|
weapons are facing next to the camera
|
2016-05-17 10:34:11 +02:00 |
|
|
kennyboy55
|
3d97ade42e
|
Parse all lighting
|
2016-05-12 13:17:03 +02:00 |
|
|
Remco
|
1693c74a6a
|
update movement
|
2016-05-12 12:18:52 +02:00 |
|
 Jannick van Ballegooijen
|
11f07b154b
|
added diffuse / ambient obj parsing
|
2016-05-12 12:17:56 +02:00 |
|
|
kennyboy55
|
049fb28ffc
|
Added more structure, added abstraction to existing parts
|
2016-05-11 12:37:18 +02:00 |
|
|
kennyboy55
|
77ac841b8b
|
Project init
|
2016-05-10 14:03:58 +02:00 |
|