Wirus
|
c98d8870a8
|
add some images and venv to gitignore
|
2020-04-05 15:44:03 +02:00 |
|
Wirus
|
6a1fe72cab
|
Game: correct declarative order
Map: collidableTerrain list
|
2020-04-05 15:41:42 +02:00 |
|
Wirus
|
c338d6caa1
|
Merge remote-tracking branch 'origin/Player' into MapNew
|
2020-04-05 14:54:59 +02:00 |
|
Wirus
|
9d9cd159a0
|
addEntity method in Map
|
2020-04-05 14:53:54 +02:00 |
|
|
|
a264ac7cb1
|
Refactor to fixed Entity class
|
2020-04-05 14:52:30 +02:00 |
|
|
|
d88670f456
|
Fixed retarded Entity implementation
|
2020-04-05 14:52:19 +02:00 |
|
|
|
6efd5652dd
|
Implemented proper player movement
|
2020-04-05 14:49:37 +02:00 |
|
|
|
e184e6417b
|
Entity now inherits from pygame.sprite.Sprite
|
2020-04-05 14:06:56 +02:00 |
|
Michał Czekański
|
8b126f636b
|
Fix adding functions to invoke in UiButton
|
2020-04-04 21:37:42 +02:00 |
|
Michał Czekański
|
65c9171428
|
Fix writing console lines when line ind is too small or too big
|
2020-04-04 21:37:25 +02:00 |
|
|
|
277a84b72e
|
Added player movement
|
2020-04-04 21:33:39 +02:00 |
|
|
|
8c1dad0101
|
Added move and rotate function
|
2020-04-04 21:33:24 +02:00 |
|
|
|
d16711068a
|
Initial player implementation
|
2020-04-04 20:54:11 +02:00 |
|
|
|
cad65b8ed7
|
Added temporary player texture
|
2020-04-04 20:53:54 +02:00 |
|
|
|
5e021ca087
|
Added constructor params
|
2020-04-04 20:53:33 +02:00 |
|
|
|
c454d8d328
|
Updated entity class
|
2020-04-04 20:53:13 +02:00 |
|
Michał Czekański
|
bf166232f3
|
Add method addingLines to UiConsole and fix writing on console
|
2020-04-04 20:49:02 +02:00 |
|
jonspacz
|
9b7011a010
|
Fixed Collidable and made pickupable
TODO - make object disappear after pickup
|
2020-04-04 20:21:37 +02:00 |
|
|
|
3d5c8690ff
|
Merge remote-tracking branch 'origin/entities_branch' into Player
|
2020-04-04 20:06:29 +02:00 |
|
Michał Czekański
|
41b7cd2a3f
|
Fix font assignment in UiButton and UiText init()
|
2020-04-04 19:24:47 +02:00 |
|
Michał Czekański
|
3ff1b1b7bc
|
Add method writing lines on UiConsole
|
2020-04-04 19:24:04 +02:00 |
|
Michał Czekański
|
e8a961cddd
|
Fix generating UiConsole image
|
2020-04-04 18:40:56 +02:00 |
|
Michał Czekański
|
c9e6fac345
|
Add UiConsole class with __init__
|
2020-04-04 18:37:18 +02:00 |
|
Michał Czekański
|
b01eaafdc4
|
Add invoking functions when UiButton click
|
2020-04-04 18:26:19 +02:00 |
|
Michał Czekański
|
6fc3a3155d
|
Add button colors parameter, make code clearer in UiButton
|
2020-04-04 15:48:51 +02:00 |
|
Michał Czekański
|
74a08be69f
|
Add UiButton class
|
2020-04-04 02:29:33 +02:00 |
|
Michał Czekański
|
429248c4b5
|
Add method updating UiBar fill
|
2020-04-04 01:52:01 +02:00 |
|
Michał Czekański
|
8dd2522b16
|
Add UiText class
|
2020-04-04 00:35:40 +02:00 |
|
Michał Czekański
|
5e76932a55
|
Add UiBar class
|
2020-04-04 00:35:22 +02:00 |
|
Michał Czekański
|
ed1d057be2
|
Add UiImage class
|
2020-04-04 00:35:07 +02:00 |
|
|
|
46441b94c9
|
Removed redundant argument
|
2020-04-03 23:09:00 +02:00 |
|
|
|
6c702dca51
|
Merge branch 'MapNew' of https://git.wmi.amu.edu.pl/s444409/DSZI_Survival into MapNew
Conflicts:
src/game/Map.py
src/game/TerrainTile.py
|
2020-04-03 23:07:45 +02:00 |
|
|
|
9ef8d99c61
|
Fixed map rendering
|
2020-04-03 23:07:12 +02:00 |
|
Michał Czekański
|
bb29d0cd1f
|
Make UiElement inherit from pygame.sprite.Sprite
|
2020-04-03 22:55:22 +02:00 |
|
|
|
9e9fb7c4b2
|
Merge remote-tracking branch 'origin/drawTesting'
|
2020-04-03 22:12:38 +02:00 |
|
|
|
e78099deb1
|
Moved sprite group initialization higher in order
|
2020-04-03 22:08:27 +02:00 |
|
|
|
fcac23a878
|
Implemented timer functionality
|
2020-04-03 22:08:12 +02:00 |
|
Mateusz Tylka
|
815eb79452
|
refactor TerrainTile
|
2020-04-03 20:23:36 +02:00 |
|
Mateusz Tylka
|
9f95091ff6
|
gitignore
|
2020-04-03 19:57:44 +02:00 |
|
Mateusz Tylka
|
6719525d1b
|
gitignore
|
2020-04-03 19:56:03 +02:00 |
|
Mateusz Tylka
|
5b60ddb8da
|
add all folders
|
2020-04-03 19:49:53 +02:00 |
|
Mateusz Tylka
|
1e179598f6
|
drawTerrain in Map class, examle map draw
|
2020-04-03 19:36:13 +02:00 |
|
|
|
46712749b6
|
Added alpha draw method
|
2020-04-02 18:31:21 +02:00 |
|
|
|
f535da1594
|
Added basic events
|
2020-04-02 17:30:25 +02:00 |
|
|
|
e8a8739c9d
|
Paths are now relative to runnable script
|
2020-04-02 16:55:19 +02:00 |
|
|
|
db2f12846d
|
Added runnable script
|
2020-04-02 16:54:55 +02:00 |
|
|
|
14fac73279
|
Implemented screen initialization
|
2020-04-02 16:49:03 +02:00 |
|
jonspacz
|
9efad498f7
|
changed Interactable, Collidable, Npc, Entity
|
2020-04-02 16:22:17 +02:00 |
|
|
|
5e33e55396
|
initialized pygame
|
2020-04-02 15:50:47 +02:00 |
|
jonspacz
|
ef798b02e7
|
Added method to collidable to check if a collision occurred. Added = None to each attribute in Entity to stop errors from showing
|
2020-04-02 13:38:14 +02:00 |
|
