 jancoow
|
a1a0028f5a
Merge branch 'developer' into feature/weaponCollision
|
10 年之前 |
|
Janco Kock
|
c06298f78f
Merge pull request #32 from CrystalPointA4/revertLoadingscreenShit
|
10 年之前 |
|
jancoow
|
858ffc8fde
Merge branch 'developer' into revertLoadingscreenShit
|
10 年之前 |
|
jancoow
|
1da4dedcea
Fixed wrong weapon drawing and removed old hit code
|
10 年之前 |
 Dofensmirtsz
|
297f8a456c
world volgorde
|
10 年之前 |
 Kenneth van Ewijk
|
3b131e949d
Merge branch 'developer' into revertLoadingscreenShit
|
10 年之前 |
|
Dofensmirtsz
|
2c6132ca17
Object files
|
10 年之前 |
|
Kenneth van Ewijk
|
83240e2c57
More fixes
|
10 年之前 |
|
jancoow
|
2bab7e05f8
More fixing...
|
10 年之前 |
|
jancoow
|
92460b8ca4
Merge pull request #31 from CrystalPointA4/feature/loadingscreen
|
10 年之前 |
|
Dofensmirtsz
|
2ebff1b3dc
dubbel kristal
|
10 年之前 |
|
Kenneth van Ewijk
|
b6b42b3afc
Merge remote-tracking branch 'origin/developer' into developer
|
10 年之前 |
|
Kenneth van Ewijk
|
e7c7dbaf39
bugfixes
|
10 年之前 |
 Jannick van Ballegooijen
|
9a31e09bff
added trees
|
10 年之前 |
|
jancoow
|
2230682a85
Added rumble on enemy hit, added try for teleport
|
10 年之前 |
|
Dofensmirtsz
|
c5e7117bac
Merge branch 'FireWorld' into developer
|
10 年之前 |
|
Dofensmirtsz
|
ec76b4e754
Merge branch 'developer' into FireWorld
|
10 年之前 |
|
Kenneth van Ewijk
|
cfb8a7ada8
Merge remote-tracking branch 'origin/developer' into developer
|
10 年之前 |
|
Kenneth van Ewijk
|
42cffd796d
bugfix
|
10 年之前 |
|
Jannick van Ballegooijen
|
82acf0d9fc
ice world
|
10 年之前 |
|
Dofensmirtsz
|
f6d7695405
Fire en Earth werkend
|
10 年之前 |
|
Kenneth van Ewijk
|
5de58e6f74
Remove circle
|
10 年之前 |
|
Kenneth van Ewijk
|
316d6c9e14
Merge pull request #31 from CrystalPointA4/feature/loadingscreen
|
10 年之前 |
 Remco
|
80f0c33b91
Merge branch 'developer' into feature/loadingscreen
|
10 年之前 |
|
Remco
|
9f455be8d6
revert commit
|
10 年之前 |
|
Kenneth van Ewijk
|
5ad61e525f
Merge pull request #30 from CrystalPointA4/world/Building
|
10 年之前 |
|
Kenneth van Ewijk
|
df611e8e51
Bugfix
|
10 年之前 |
|
Kenneth van Ewijk
|
5fc92d3f2a
Merge branch 'developer' into world/Building
|
10 年之前 |
|
Remco
|
d1abc20f64
placed loadingscreen picture in json file of a world
|
10 年之前 |
|
Kenneth van Ewijk
|
97d43a1249
Merge pull request #29 from CrystalPointA4/feature/weaponCollision
|
10 年之前 |
