 kennyboy55
|
87e94056cc
|
Merge remote-tracking branch 'origin/heightmapTrees' into heightmapTrees
# Conflicts:
# HeightMap.cpp
|
2016-06-03 11:40:52 +02:00 |
|
|
kennyboy55
|
c43718f8fa
|
Merge branch 'developer' into heightmapTrees
# Conflicts:
# CrystalPoint.cpp
# HeightMap.cpp
|
2016-06-03 11:39:19 +02:00 |
|
 Dofensmirtsz
|
23f1ca4f34
|
fix
|
2016-06-03 11:34:19 +02:00 |
|
|
kennyboy55
|
95febc136f
|
Merge pull request #9 from CrystalPointA4/feature/interface
Feature/interface
|
2016-06-03 11:14:46 +02:00 |
|
|
Dofensmirtsz
|
e2f13cd311
|
Rocky places
|
2016-06-03 11:13:01 +02:00 |
|
|
kennyboy55
|
b4a2da4b88
|
Merge pull request #8 from CrystalPointA4/worldLoading
Added world loading and other various improvements
|
2016-06-03 11:12:23 +02:00 |
|
|
Dofensmirtsz
|
ba9f15ee5c
|
SJ:Dgbkjzdfxgbdzfjkgbkjfdg
|
2016-06-02 13:45:45 +02:00 |
|
|
Dofensmirtsz
|
644437a5f0
|
Draak shit
|
2016-06-01 02:06:22 +02:00 |
|
|
Dofensmirtsz
|
353efb38c5
|
Begin wereld
|
2016-05-31 13:05:37 +02:00 |
|
|
Dofensmirtsz
|
ae5a28f273
|
Spikey path fixed
|
2016-05-31 08:46:33 +02:00 |
|
|
kennyboy55
|
1ade6002c1
|
Bugfix/performance improvement
|
2016-05-30 13:12:51 +02:00 |
|
|
Dofensmirtsz
|
6f28527be4
|
Stoneworld
|
2016-05-29 15:10:16 +02:00 |
|
|
Dofensmirtsz
|
f6f6889c63
|
Jannick is fag
|
2016-05-29 14:45:04 +02:00 |
|
|
Dofensmirtsz
|
638c507276
|
Maze init
|
2016-05-28 17:36:04 +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 |
|
|
Dofensmirtsz
|
88685c6366
|
Merge branch 'worldLoading' into heightmapTrees
# Conflicts:
# CrystalPoint.vcxproj
# CrystalPoint.vcxproj.filters
|
2016-05-27 11:26:47 +02:00 |
|
|
Dofensmirtsz
|
cc75cb631a
|
fix
|
2016-05-27 11:23:43 +02:00 |
|
|
Dofensmirtsz
|
9fccd71521
|
maze?
|
2016-05-27 10:57:44 +02:00 |
|
|
kennyboy55
|
d83cc6403c
|
Spawn objects from file
|
2016-05-27 10:56:24 +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
|
4c613b606a
|
Implemented getHeight
|
2016-05-26 13:21:14 +02:00 |
|
|
kennyboy55
|
56e174ae2f
|
Lord and Savior Johan
|
2016-05-26 12:53:22 +02:00 |
|
|
kennyboy55
|
908786897f
|
Added world loading and other various improvements
|
2016-05-25 22:29:18 +02:00 |
|
|
kennyboy55
|
33a61ca2ed
|
Merge pull request #7 from CrystalPointA4/enemy
Enemy collision and tracking
|
2016-05-25 13:44:26 +02:00 |
|
 Remco
|
b2fa0bc028
|
Merge branch 'developer' into enemy
# Conflicts:
# World.h
# worlds/world1.json
|
2016-05-25 13:42:02 +02:00 |
|
|
Remco
|
cf124b3f38
|
enemy collison added, no jittering anymore
|
2016-05-25 13:38:13 +02:00 |
|
|
kennyboy55
|
0b6096d3e8
|
Merge pull request #6 from CrystalPointA4/array-rendering
Implement optimised array rendering
|
2016-05-25 12:56:17 +02:00 |
|
|
kennyboy55
|
84fcc346a9
|
Implement optimised array rendering
|
2016-05-25 12:44:24 +02:00 |
|
|
kennyboy55
|
fe1aa7220e
|
Merge pull request #5 from CrystalPointA4/heightmap
Heightmap implemented
|
2016-05-25 11:53:02 +02:00 |
|
|
Remco
|
d739141b25
|
enemys always looking at you when you are the target
|
2016-05-25 11:46:22 +02:00 |
|
|
kennyboy55
|
2a6cc0fd87
|
Fix missing Vertex
|
2016-05-25 11:44:13 +02:00 |
|
|
kennyboy55
|
965b54c901
|
Added heightmap
|
2016-05-25 11:31:37 +02:00 |
|
 jancoow
|
e7a7cc5588
|
Fixed capital letters and string return error..
|
2016-05-23 12:34:55 +02:00 |
|
|
Remco
|
9d3cfa7e2a
|
Merge branch 'developer' into johan
# Conflicts:
# World.cpp
# worlds/world1.json
|
2016-05-23 10:34:21 +02:00 |
|
|
Janco Kock
|
47c228205a
|
Merge pull request #3 from CrystalPointA4/johan_linuxrefactor
Johan linuxrefactor
|
2016-05-23 10:00:59 +02:00 |
|
|
kennyboy55
|
b1aa61d5f0
|
Fix cmath issue
|
2016-05-23 10:00:31 +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 |
|
|
Remco
|
d01efecb0e
|
enemy comes to you when in his radius
|
2016-05-23 08:48:23 +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
|
1120a3e144
|
Removed gitignore files
|
2016-05-20 12:40:54 +02:00 |
|
|
kennyboy55
|
f2af3a7324
|
Added gitignore
|
2016-05-20 10:51:23 +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 |
|