 Dorian
|
18bb30c971
|
Merge remote-tracking branch 'remotes/amy/llfkj'
# Conflicts:
# hexmap.py
# main.py
|
2016-07-16 23:59:28 -04:00 |
|
Dorian
|
a71edbe29b
|
Merge remote-tracking branch 'remotes/amy/llfkj'
# Conflicts:
# hexmap.py
# main.py
|
2016-07-16 23:59:13 -04:00 |
|
Dorian
|
17b56caa55
|
Extract hexmap cell into standalone module.
|
2016-07-16 23:41:44 -04:00 |
|
Dorian
|
083e20c41f
|
Extract terrain handling into a separate module.
|
2016-07-16 23:33:51 -04:00 |
|
Dorian
|
7fab78fa8a
|
Add basic terrain to map.
|
2016-07-16 22:17:23 -04:00 |
|
Dorian
|
dd2864186e
|
Improve the bounding box detection behaviour.
|
2016-07-16 21:24:45 -04:00 |
|
Dorian
|
21a5431071
|
Attempt to add better bounding detection.
|
2016-07-16 20:46:30 -04:00 |
|
Dorian
|
4ca9a39256
|
Add ability to update the status part of the map.
|
2016-07-16 20:09:28 -04:00 |
|
Dorian
|
8308abba13
|
Remove dispatch and simplify the selected cell.
|
2016-07-16 19:40:30 -04:00 |
|
Dorian
|
fb829f28e4
|
Dispatch event from a selected HexMapCell up to the parent game to update the status.
|
2016-07-16 19:35:29 -04:00 |
Amy Wooding
|
21b993de08
|
Added missing import statements.
|
2016-07-16 19:32:57 -04:00 |
|
Amy Wooding
|
e367ee54e4
|
Merge branch 'llfkj' of https://github.com/llf-amy/gamecamp into llfkj
|
2016-07-16 19:24:30 -04:00 |
|
Amy Wooding
|
032f6db266
|
Started setting things up to test the hexmap coordinate logic separately from the game.
|
2016-07-16 19:16:41 -04:00 |
llf-amy
|
0aaf1f8a11
|
Merge pull request #3 from dorianpula/master
getting latest from dorian
|
2016-07-16 19:13:12 -04:00 |
|
Dorian
|
6ba611e539
|
Clean up left and right selection of hexes.
|
2016-07-16 18:54:27 -04:00 |
|
Dorian
|
d28e9b33ad
|
Add ability to detect various button presses.
|
2016-07-16 18:16:08 -04:00 |
|
Dorian
|
1ab95bbf6a
|
Add ability to select and deselect a hex.
|
2016-07-16 17:52:11 -04:00 |
|
Amy Wooding
|
acf52537a2
|
Moved HexMapCell out of main.py into its own module.
|
2016-07-16 17:49:58 -04:00 |
|
Amy Wooding
|
cf6ef569a5
|
Added setter to make sure that the even-r and cube coordinates never get out of sync.
|
2016-07-16 17:45:02 -04:00 |
|
Amy Wooding
|
2b9f4dba36
|
Added even_r_coords and cube_coords to HexMapCell. That is, hexagons now know they're coordinates.
|
2016-07-16 17:39:03 -04:00 |
|
Amy Wooding
|
6e4c3a0b0b
|
Merge branch 'llfkj' of https://github.com/llf-amy/gamecamp into llfkj
|
2016-07-16 16:26:41 -04:00 |
|
llf-amy
|
531f309330
|
Merge pull request #2 from dorianpula/master
coordinate system added
|
2016-07-16 16:23:30 -04:00 |
|
Dorian
|
f806453bf6
|
Add a basic map coordinate system.
|
2016-07-16 16:11:26 -04:00 |
|
Dorian
|
2ad77a17d2
|
Change the number of hexes drawn overall.
|
2016-07-16 15:56:12 -04:00 |
|
Dorian
|
53d6a6c7ba
|
Avoid displaying cells cut off on the left.
|
2016-07-16 15:52:01 -04:00 |
|
Amy Wooding
|
6a41aaaa01
|
Merge branch 'llfkj' of https://github.com/llf-amy/gamecamp into llfkj
|
2016-07-16 15:43:58 -04:00 |
|
llf-amy
|
2f51f25fc3
|
Merge pull request #1 from dorianpula/master
update to latest version from dorian.
|
2016-07-16 15:43:08 -04:00 |
|
Dorian
|
5b1161f2f3
|
Add coordinate labels to hexes.
|
2016-07-16 15:11:41 -04:00 |
|
Dorian
|
9a1fd04b75
|
Add better documentation around hex positioning and resizing code.
|
2016-07-16 14:12:56 -04:00 |
|
Dorian
|
8fa61f942d
|
Add documentation around the hex positioning and updating code.
|
2016-07-16 14:00:48 -04:00 |
|
Dorian
|
c57c01464d
|
Minor code clean up.
|
2016-07-16 13:51:50 -04:00 |
Dorian Pula
|
0bdf4f126d
|
Merge pull request #3 from llfkj/master
drawing hexagons! including filling them with colours.
|
2016-07-16 13:24:38 -04:00 |
|
Amy Wooding
|
54dbdfad94
|
Add missing hexagon.kv file from repo.
|
2016-07-15 11:48:18 -04:00 |
Kjell Wooding
|
cacc894302
|
Merge branch 'llf-amy-llfkj'
|
2016-06-04 23:14:13 -07:00 |
|
Amy Wooding
|
8b5b258be7
|
added random colours to the hexagons
|
2016-06-04 23:04:53 -07:00 |
|
Amy Wooding
|
f5aaa50433
|
hexagons work!! hurray!
|
2016-06-04 22:20:00 -07:00 |
|
Amy Wooding
|
865e27ed82
|
Merge branch 'dorian' of https://github.com/llfkj/gamecamp into llfkj
|
2016-06-04 21:08:32 -07:00 |
|
Amy Wooding
|
e3b32ca4fa
|
up to adding an overlay
|
2016-06-04 21:01:21 -07:00 |
|
Dorian
|
02c84566cd
|
Attempt to create multiple control points.
|
2016-06-04 17:57:52 -07:00 |
|
Dorian
|
7eb4b343a5
|
Add in way to add in a single and multiple boxes for handling control of units.
|
2016-06-04 17:37:39 -07:00 |
|
Dorian
|
bbf851d467
|
Switch to labels and added two ways to colour backgrounds.
|
2016-06-04 15:43:40 -07:00 |
|
Amy Wooding
|
a7fd74e3d3
|
Merge branch 'dorian' of https://github.com/llfkj/gamecamp into llfkj
|
2016-06-04 15:10:39 -07:00 |
|
Dorian Pula
|
b464c015f5
|
Merge pull request #2 from llfkj/dorian
Fix aspect ratio for hex grid on resize
|
2016-06-04 15:10:25 -07:00 |
|
Amy Wooding
|
4bde100b4c
|
drawing hexagons!
|
2016-06-04 15:10:18 -07:00 |
|
Kjell Wooding
|
cc1604fe36
|
fix aspect ratio of hex grid
|
2016-06-04 15:08:18 -07:00 |
|
Kjell Wooding
|
3d77ab264b
|
first try at fixing the aspect ratio
|
2016-06-04 14:55:11 -07:00 |
|
Kjell Wooding
|
248c6ece0c
|
latest notes
|
2016-06-04 14:49:11 -07:00 |
|
Dorian Pula
|
f8d816e069
|
Merge pull request #1 from llfkj/dorian
add hex grid
|
2016-06-04 14:47:52 -07:00 |
|
Kjell Wooding
|
7536075103
|
add notes
|
2016-06-04 14:42:55 -07:00 |
|
Kjell Wooding
|
dbc704226a
|
Draw the hex grid
|
2016-06-04 14:41:13 -07:00 |