Commit graph

282 commits

Author SHA1 Message Date
b2bdfa3e27 clean 2018-09-22 00:59:19 +02:00
nek0
3c64098157 Merge branch 'master' of github.com:nek0/tracer 2018-09-21 22:25:39 +02:00
nek0
e0a272fb4e restart on escape 2018-09-21 22:25:23 +02:00
80860264a3 shrink playarea 2018-09-19 23:44:27 +02:00
nek0
086302be5e fix indentation 2018-09-19 20:19:01 +02:00
nek0
8f2cfd2871 fix bounds 2018-09-19 20:17:47 +02:00
nek0
7aa691bf87 some more keyboard interaction 2018-09-18 05:35:40 +02:00
nek0
aed0732d3e more optimization 2018-09-18 03:13:53 +02:00
a68b186fd0 würg in progress 2018-09-16 23:55:22 +02:00
nek0
99318f8919 adjust size 2018-09-16 23:29:02 +02:00
687d5f5b58 smoother game start 2018-09-15 19:22:04 +02:00
nek0
17bc05ad5e optimization in logic and performance 2018-09-14 09:29:13 +02:00
nek0
51cb19aaac small optimization and renames 2018-09-08 21:40:05 +02:00
nek0
e6f95e9c42 NPCs now have agent system/petri net 2018-09-08 14:05:07 +02:00
nek0
d687eb9ae5 starting agent system/petri net 2018-09-07 23:39:53 +02:00
nek0
f10b5d7d52 workplace defined 2018-09-07 19:49:16 +02:00
nek0
9774f5a9c9 better loading 2018-09-07 19:12:04 +02:00
nek0
5916f302a6 linting in progress 2018-09-02 10:44:33 +02:00
nek0
8d2aba5f7b make hacking not abortable by NPCs 2018-09-01 18:27:18 +02:00
nek0
6c54aabc94 cleaning debug output 2018-09-01 18:26:55 +02:00
nek0
c0b3acd647 fix map for MindMap 2018-08-19 18:08:13 +02:00
nek0
b276219e07 removing some warnings 2018-08-18 05:12:58 +02:00
nek0
1f63e15582 computer has now an "on" state 2018-08-12 06:28:37 +02:00
nek0
b14d9a6d76 prepare hackable computers 2018-08-11 11:51:20 +02:00
nek0
35337651a0 make copying not abortable 2018-08-11 09:11:54 +02:00
nek0
d8437759fc some little stuff 2018-08-11 02:00:13 +02:00
nek0
0e5486f048 fix and optimization 2018-08-11 01:12:07 +02:00
nek0
2911514578 initial state 2018-08-10 22:45:32 +02:00
nek0
56eac65266 NPCs now interact with objects! 2018-08-10 14:09:07 +02:00
nek0
289579470f draw only progress for player activated actions 2018-08-10 11:35:08 +02:00
nek0
84cd30d8e5 cleaning 2018-08-10 11:34:46 +02:00
nek0
c8b81e90e5 add progress bar 2018-08-10 10:29:12 +02:00
nek0
bcdd04e7d5 reworking interactions 2018-08-10 08:58:26 +02:00
nek0
a0f198a18d fixing range limit of interaction 2018-08-07 14:05:08 +02:00
nek0
1a058d5c2f new asset: watercooler 2018-08-07 14:04:49 +02:00
nek0
fff7dfbbce fix drawing order again 2018-08-07 14:04:12 +02:00
nek0
e6c0c1ad70 limit click distance for activating actions 2018-08-05 04:05:35 +02:00
nek0
8fb71181c6 don't place anything in Halls 2018-08-03 02:22:30 +02:00
nek0
5e8df5a022 a little optimization 2018-08-01 17:54:49 +02:00
nek0
b89fe75a39 collision boundaries for table corners 2018-07-31 23:07:23 +02:00
nek0
9d4205a939 new plants and now: toilets 2018-07-31 22:59:25 +02:00
nek0
8a474f6edd added plant and reworked clusters 2018-07-31 13:30:17 +02:00
nek0
14549d8533 incorporate new assets 2018-07-30 21:10:42 +02:00
nek0
f025b92ef4 blubb 2018-07-30 15:34:45 +02:00
nek0
afca12ebc0 added computer 2018-07-30 14:34:46 +02:00
nek0
731e3d2744 off by one error 2018-07-30 14:34:26 +02:00
nek0
33d808b240 fix draw ordering 2018-07-30 01:17:19 +02:00
nek0
744850d3f0 move this out 2018-07-25 01:10:21 +02:00
nek0
08dbb9326c first interactable object ever: a copier 2018-07-22 22:30:17 +02:00
nek0
f64aae86f0 take obstacles from ECS into account 2018-07-21 21:10:32 +02:00
nek0
81d6fd1180 copiers are placed properly 2018-07-21 20:37:01 +02:00
nek0
b70b50e513 I present: copiers 2018-07-21 06:43:26 +02:00
nek0
2f8a267b09 some refinement in messages 2018-07-19 04:56:31 +02:00
nek0
2b86eaf230 detailed loading output 2018-07-19 04:51:07 +02:00
nek0
b04ae8759b removing unneeded code 2018-07-08 07:56:13 +02:00
nek0
bfccf32451 optimizing MindMap generation 2018-07-08 07:55:44 +02:00
nek0
4913b054d8 smaller things 2018-07-06 17:18:12 +02:00
nek0
19476e3fbb deduplicate direction function 2018-07-06 17:17:57 +02:00
nek0
0f3c33b243 don't duplicate main context 2018-07-06 17:17:12 +02:00
nek0
c2a3bb3536 unneccessary 2018-07-03 16:49:27 +02:00
nek0
690179e4ec linting and de-warning 2018-07-03 16:19:27 +02:00
nek0
f74ce66e2f removing old code 2018-07-03 02:20:30 +02:00
nek0
9d5b3d62a0 new Typeclasses for Collision and drawing 2018-07-03 02:20:17 +02:00
nek0
a1abb9f379 alignment 2018-07-02 18:42:59 +02:00
nek0
d5b2729b2a todo 2018-07-02 18:22:00 +02:00
nek0
6dc6074a5a code deduplication 2018-07-02 18:18:27 +02:00
nek0
850e9d7a07 integrate mind map into game 2018-06-28 21:07:58 +02:00
nek0
39749a8afe renaming module 2018-06-25 23:59:12 +02:00
nek0
daaadca17b adjusting small things 2018-06-25 23:46:17 +02:00
nek0
5e0c634b61 removing clutter 2018-06-25 23:45:53 +02:00
nek0
7a4248671e cleaning 2018-06-24 12:59:24 +02:00
nek0
0fff278fdb higher mass 2018-06-24 00:51:21 +02:00
nek0
368d679356 *flushing sounds* 2018-06-24 00:43:27 +02:00
nek0
6189b3bcb8 smaller aesthetics 2018-06-24 00:43:09 +02:00
nek0
3bc1b5e5c7 preparing for keyboard input 2018-06-24 00:42:39 +02:00
nek0
21461ade1f building maps of the mind 2018-06-24 00:41:51 +02:00
nek0
373daaa2c0 fix broken textures and load NPC graphics 2018-06-16 19:34:17 +02:00
nek0
5b911ab3ec fix draw ordering 2018-06-16 11:40:51 +02:00
nek0
bfeb8a6fde I need to create more contexts to be threadsafe. 2018-06-15 15:39:08 +02:00
nek0
ce48dd505e nanovg is not threadsafe... 2018-06-10 04:21:00 +02:00
nek0
ee62010d7f more loading screens, but breaking things... 2018-06-09 01:17:03 +02:00
nek0
fd8d5d81f0 loading screen 2018-06-08 00:29:46 +02:00
nek0
0a740334c5 restructuring and adding final rotation after walking 2018-06-04 05:29:20 +02:00
nek0
88c988ddbf a little lint 2018-06-03 20:24:33 +02:00
nek0
bf0cd44f56 fix drawing order 2018-06-03 20:14:29 +02:00
nek0
03b84b02db hunting again 2018-06-03 04:28:39 +02:00
nek0
9c812f10d3 stop walking animation when colliding 2018-06-02 22:04:05 +02:00
nek0
98d7e610cb draw ordering 2018-05-31 05:25:08 +02:00
nek0
d3e00e13ca more movement 2018-05-31 03:07:41 +02:00
nek0
fbcc1b0e45 walking animation 2018-05-30 22:15:49 +02:00
nek0
f6db4f5e5c hunting warnings in Test 2018-05-30 17:32:00 +02:00
nek0
5c70976678 removing old code 2018-05-30 17:03:29 +02:00
nek0
e83482e8ea drawing animation properly 2018-05-30 16:20:58 +02:00
nek0
81abbaf91e trying to prepare animations 2018-05-27 16:03:31 +02:00
nek0
2761777ff9 finishing up: rotation 2018-05-26 08:34:49 +02:00
nek0
9c3e607d2b fix direction 2018-05-21 05:56:15 +02:00
nek0
b72f2f744b adding player sprite and handling 2018-05-21 00:40:40 +02:00
nek0
e8847f2aa0 foo 2018-05-18 20:05:21 +02:00
nek0
53d2ce4cf6 update ecstasy 2018-05-17 13:06:13 +02:00
nek0
b59b566905 fork pathseeking off into seperate thread 2018-05-16 16:23:23 +02:00
nek0
1f1bdd216a reduce liftIO calls 2018-05-15 19:27:54 +02:00
nek0
8a620f742e nonuniform movement speeds for NPCs 2018-05-15 19:27:40 +02:00
nek0
1c9076c838 refine pathfinding 2018-05-14 19:34:07 +02:00
nek0
72c8adb4f5 cleaning 2018-05-14 18:12:37 +02:00
nek0
cc3480c0c0 nonsticky walls 2018-05-14 18:00:18 +02:00
nek0
4226265030 herkulesbug found. sticky walls 2018-05-14 17:54:55 +02:00
nek0
165baa179c more entomology 2018-05-13 22:01:05 +02:00
nek0
c14c652360 cyber entomology 2018-05-13 14:05:15 +02:00
nek0
4a8826b256 collision check still not working 2018-05-05 19:23:24 +02:00
nek0
a8beb8fca5 more fix 2018-05-05 13:41:55 +02:00
nek0
38218fa50c slightly better collision detection 2018-05-05 11:24:54 +02:00
nek0
d4d6e5bd83 fixing stuff up and make collision raycast 2018-05-01 23:52:40 +02:00
nek0
db5e368a61 hmmmm... 2018-05-01 23:00:20 +02:00
nek0
e444c03c33 simplify collision detection 2018-04-30 20:34:45 +02:00
nek0
f6860c1332 declutter output 2018-04-27 23:34:57 +02:00
nek0
6308a110b8 tell the number of workers 2018-04-26 15:38:49 +02:00
nek0
755350ba9f don't draw NPCs outside of visible area 2018-04-26 15:25:38 +02:00
nek0
b6deacbf14 enable parallel walk of NPCs 2018-04-25 14:44:28 +02:00
nek0
366b79ecef only draw visible tiles 2018-04-22 11:59:14 +02:00
nek0
a05799cc9f reduce number of npcs 2018-04-14 19:00:21 +02:00
nek0
a0e6ab5013 npc now walk 2018-04-14 18:43:05 +02:00
nek0
5fe266ca9c place npcs only in reachable areas 2018-04-14 13:34:28 +02:00
nek0
52c976c7f0 *cough* 2018-04-14 11:18:53 +02:00
nek0
9fdb8a5e15 starting NPCs 2018-04-14 11:18:37 +02:00
nek0
a4c3202f4d more tables 2018-04-11 20:01:41 +02:00
nek0
3cb70b53d5 hooray for even more tables 2018-04-03 22:27:41 +02:00
nek0
092fbe6ab9 yay for more tables! 2018-04-03 22:21:07 +02:00
nek0
f28f06adf3 validate placement of interior through wayfinding 2018-04-02 16:29:35 +02:00
nek0
e150be9e77 make room at office entrance 2018-04-01 19:40:54 +02:00
nek0
173494c568 add a group of tables 2018-04-01 04:51:15 +02:00
nek0
d57e502c74 add tables 2018-03-31 23:22:10 +02:00
nek0
d1e130b5a9 draw floor half a tile more inwards 2018-03-30 21:30:27 +02:00
nek0
c25de466fb alter hall placement 2018-03-25 20:35:07 +02:00
nek0
045659caf3 reorganizing code 2018-03-12 00:21:16 +01:00
nek0
ec2572f9e6 still working on collision 2018-03-10 14:02:14 +01:00
nek0
eee9343313 tinkering with collision 2018-03-10 10:07:37 +01:00
nek0
68c8464c9e readjusting bounding boxes and collision behaviour 2018-03-08 20:19:53 +01:00
nek0
b79c50b491 fix it! 2018-03-08 17:23:14 +01:00
nek0
ad18d241aa fixing draw order again 2018-03-07 21:56:15 +01:00
nek0
146d65ce3b fixing ghost boundaries 2018-03-07 16:09:16 +01:00
nek0
4405539bd8 more fix 2018-03-06 23:04:52 +01:00
nek0
8023f93ce7 hunted down warnings 2018-03-06 21:58:55 +01:00
nek0
d91f4bf9c1 switch to circle based collision 2018-03-06 21:29:17 +01:00
nek0
92569c2345 fix wallslide 2018-03-06 16:37:30 +01:00
nek0
ccfc7aaac6 fix ghosting 2018-03-06 16:37:21 +01:00
nek0
70e6df88ca adlusting wallslide to subtile collision
There is still ghosting through walls
2018-03-06 07:59:31 +01:00
nek0
876fc1462d subtile collision for walls 2018-03-05 21:11:38 +01:00
nek0
22c0c87284 subtile collision for boxes 2018-03-04 22:24:30 +01:00
nek0
38db226cc7 adjusting wallslide 2018-03-03 20:03:41 +01:00
nek0
6518695a9e proper placement now 2018-03-03 17:42:24 +01:00