Commit Graph

558 Commits

Author SHA1 Message Date
Song Minjae
b7372134b3 forgot gitattributes
Former-commit-id: 3283e9aa0f0cbb450a325f743033150b5b031c80
Former-commit-id: 0a4113e9280e66194ee627dedf6432a23cdf470b
2017-03-03 04:34:21 +09:00
Song Minjae
018008ab57 removing old test sounds
Former-commit-id: 916a2b8fb5f290451cfb604fe4b2b3b2abd5bc81
Former-commit-id: 2be333efeff82648db00057975d7c02bd7dfddda
2017-03-03 04:31:34 +09:00
Song Minjae
bb0500a5ce updating old copyright notice
Former-commit-id: 49f0ae772e48f122919220accaffd4ebf73ed3e3
Former-commit-id: b2b7ad7cf731f5c51938e84714f354bd8ffd6e6e
2017-03-03 04:15:44 +09:00
Song Minjae
7bd1ed1bcf still working on vt, still buggy :/
Former-commit-id: 9164ca8ef33917f7254c65f3947903b8a17dd654
Former-commit-id: 3ebf64f00a0b86d11a449c1d399e149f2714839c
2017-03-03 04:05:00 +09:00
Song Minjae
122305cad4 some UI suggestion
Former-commit-id: 4526bc289a05ddd0fd205c8c9986785196bdd487
Former-commit-id: ce0bf7a3ce0f083e698cddf708419341f4a73fa9
2017-03-03 03:56:07 +09:00
Song Minjae
55f7a4ed46 working io.read from STDIN
Former-commit-id: b1168a53fd5fbd09c6a5a76506402560fc4e0fd7
Former-commit-id: a0d455da14a6eb7bf0127e136949273ec5a28628
2017-03-02 22:35:13 +09:00
Song Minjae
74250150de bunch of codes:
- Test InputStream() on VirtualComputer (blocking/unblocking using simple semaphore) -- no more dirty lua impl of io.read
- Typealias Kotlin 1.1
- Primitive box drawing on VideoCard
- Removing unnecessary fonts


Former-commit-id: cece88af3a3430678e685856eec78b4a9d598b4f
Former-commit-id: 22eed3a7beb9b4cb34636cbab2ff0e94989bdb31
2017-03-02 02:11:50 +09:00
Song Minjae
5bc3999237 Update to Kotlin 1.1
Former-commit-id: bd35f4973ce672c9fa4b36a1c8655bd719df5148
Former-commit-id: 010bb8907f6afa453de6a678cf97cc6c72483dd4
2017-03-01 21:33:46 +09:00
Song Minjae
a744cdf92f vc ppu: some updates for Lua
Former-commit-id: 3d99a6788d05eaf3e90bffe8d412f0ab92e7f9bb
Former-commit-id: 306ed39d09f2b0b5461cb71d0cef96d7d5793769
2017-02-26 03:08:58 +09:00
Song Minjae
aa229dfd71 fixed lantern colour not update
Former-commit-id: 153d3f4fbdae65f71c7c63a3b0a87fee08677186
Former-commit-id: 732f527d49dc31bbc669bbfed4624018c471dbe0
2017-02-26 03:08:21 +09:00
Song Minjae
5861161261 actor hit ceiling and now properly bounce back (again, gah!)
Former-commit-id: 05ce5bbae52337a92e26bd6937d610bd2c14cefb
Former-commit-id: 810db52f9f9f1756d2d667229487fb653f87898e
2017-02-26 03:07:54 +09:00
Song Minjae
6c2a411ee2 working real-time software blur
Former-commit-id: a545802b19188fb9d3b6168885f40d46e3376195
Former-commit-id: f71dbfa2521888cc847937f549e627f87625ea17
2017-02-25 02:50:48 +09:00
Song Minjae
fed45d9fe6 no memory leak on ImageBuffer rendering
Turns out, <ImageBuffer>.image creates new Image instance which will NEVER be reclaimed (which causes OutOfMemoryError) unless manually destroy()ed.


Former-commit-id: 34840cf63e52e5635ec8acd5fb1bb78923c61063
Former-commit-id: aca4388320fae022a4744f75c1b0f66b544bdafb
2017-02-25 02:39:02 +09:00
Song Minjae
30b82acb4b graphics computer -- working sprite system
Former-commit-id: eedad5c99d0d8fa1d74a7a5b4e6250017d55163b
Former-commit-id: 0dc08e778cca3300ffc6f696ba395eb8ca2b154b
2017-02-24 17:35:32 +09:00
Song Minjae
1b079524f4 yet another font update
Former-commit-id: 332bdbd2e55d148f42f3e3635dbc94a71f152f01
Former-commit-id: 27308c98fe0fe858bcbb42301dd714a49d92c81c
2017-02-20 23:27:00 +09:00
Song Minjae
6c867efd40 font upd, added ext-b
Former-commit-id: f8f324ea45e12608017c9a09c4a8994d341d91a1
Former-commit-id: 37fff79ddb4eec7bd5f3006ff0db1e1e3abd3653
2017-02-20 20:28:54 +09:00
Song Minjae
c78c1b132a font upd
Former-commit-id: bf42a690c7cd199d4f2ec00855213b83aecb144b
Former-commit-id: b992aac69b93c5d1632e96c4985cf61a6419b6a8
2017-02-20 01:43:26 +09:00
Song Minjae
96da189891 terrain tex upd
Former-commit-id: 19fe7efbde3db7d5655c8470489da1c5a5a188ec
Former-commit-id: 94c984500c0f8ef3b323e953c91306b525bd4623
2017-02-20 01:41:37 +09:00
Song Minjae
0a3e878482 New RNG for the game and Joise
Former-commit-id: 4a5b7f7ef6546d04be106d881e7d3f9dd6dc1b57
Former-commit-id: 90c15fa64cde39e33206ff7be645db9bceda1161
2017-02-20 01:41:01 +09:00
Song Minjae
d05afff5b8 resolving issue #12
Former-commit-id: eee32f1d3b74a431626888ab32166e0cad14f522
Former-commit-id: e58fecf50f193d695f7a7852117183486a12cc62
2017-02-14 23:25:18 +09:00
Song Minjae
7a8dbf3021 ActorWithSprite: correct offsetting on X axis
Former-commit-id: 7c981241889cff139b3523d751e85885af04f867
Former-commit-id: 33b93c99c94813afa2a7ce272f59e7b28faf9da1
2017-02-14 18:56:55 +09:00
Song Minjae
3f0ad0e563 finalising fonts
Former-commit-id: e85038e433c9e451761a25ce93fa976b847c9e1e
Former-commit-id: 0f59fe3a1b5a174ff63f5a79f11007f0e9d4a204
2017-02-14 18:51:55 +09:00
Song Minjae
b1b13b6f9c unhelpful git comment about the font
Former-commit-id: 272cb1b56834c4796d4db9c9ba3d5ead69084513
Former-commit-id: 0395adeefc72aa618d5a422c99db2932a05fe2c4
2017-02-13 14:13:40 +09:00
Song Minjae
adeb6b5c0f fixing mistakes
Former-commit-id: 2bb63bc0616d42937372781a5f7c779a2b1fb984
Former-commit-id: 80746e41232f5170b807ff54efa3b1e477ee9467
2017-02-13 02:29:39 +09:00
Song Minjae
99ff219ad9 more changes on greek
Former-commit-id: cfde7383844a9a183bf57edad3a772ae74f19af8
Former-commit-id: 178d7b4b788ffe43db64eb453543ea1e20d94acf
2017-02-12 16:45:03 +09:00
Song Minjae
c05c4de192 new greek and more tweaks
Former-commit-id: 0c480dd7ce173a37f2f48b5b5d711c2641cbda00
Former-commit-id: 18492d01862bdeecb9c0eba825a3b25da76211b0
2017-02-12 04:12:26 +09:00
Song Minjae
eb8fad0c30 cyrillic
Former-commit-id: b5b4c8495b387dbc6516829f3ddf0124f87d8500
Former-commit-id: 2c78b2fb6112199bc7bf4d55b3df01da10f14958
2017-02-11 23:57:42 +09:00
Song Minjae
3d20e8424a Basic Latin, Ext-A
Former-commit-id: 82df422b6a9b9e9c0fba0d11762cbdf2ca5b6f40
Former-commit-id: ff29dc32eb21b9626c78eb53518f5eff12439832
2017-02-11 23:22:35 +09:00
Song Minjae
71f2aa0e53 newfontsystem branch init commit
Former-commit-id: 5f03cdbec6058f90ef1354db5ee1c6dac9755feb
Former-commit-id: f132b6c4e1a51146fb7522686e24008640e88c45
2017-02-11 16:45:47 +09:00
Minjae Song
880d1b7692 citation needed
Former-commit-id: 92b35f459de0ce84064bc44a2ff54be07f06e711
Former-commit-id: 682ed520288e1144c15ac998d7a1b53971f7482d
2017-02-09 16:45:28 +00:00
Song Minjae
daa667f5f3 video card wip for virtual computer
Former-commit-id: 3c71eb0e8614e92e63fd3b29906a3cfd311c916f
Former-commit-id: 3472d6eb7d03a29bfd859e9207f76aeb23cef89b
2017-02-09 22:18:27 +09:00
Song Minjae
e30a830607 data format docs
Former-commit-id: 5da80ac39d23d518bec0ed4e838fd0a4ae19bd11
Former-commit-id: f7ec7a4cd2c1d7a795aa19352065ee1ea1550fe4
2017-02-07 04:50:26 +09:00
Song Minjae
9e5dcb7b3f reading text from JInputField to support multilingual input
Former-commit-id: 4dc1228ba000f88d3af29569aa3954cb8acc4d90
Former-commit-id: 7fd7f8bd4f35e3be30cd9fa0da96684a48eedad3
2017-02-05 22:04:33 +09:00
Song Minjae
ee3b72949e HumanoidNPC: explicit initialiser call no longer required
Former-commit-id: ecc822302182bc55f9a11ede39f74bfaf8fe6c87
Former-commit-id: 92f49eb574cb4f7bbf93dae8bf0ff32fa33a74ae
2017-02-05 03:05:18 +09:00
Song Minjae
1909a02d85 assets update
Former-commit-id: 2988c67408159e5b17dd40a10b3eca4ea187d10f
Former-commit-id: b255a9c812f71f13d17922e11257afde59648ada
2017-02-04 22:55:55 +09:00
Song Minjae
1f0f22a4b4 Combined ItemProp to InventoryItem and introduced Material
Former-commit-id: d73882505cb26a99a5cc70ef5dc2b7e2d087823c
Former-commit-id: cf061fd2edb6fbe765ac812507cb5b0d7b77ee7b
2017-02-04 22:55:06 +09:00
Song Minjae
5daf424554 Actually utilising ActorAI interface to support AIs written in Kotlin as well as in Lua
Former-commit-id: 53901f5a5d53b33c4254091ec507be82289d57fd
Former-commit-id: 86ce8d2a646a1564ee5e33ef07c5affb338c028e
2017-02-04 22:53:36 +09:00
Song Minjae
2fd7487248 killactor command
Former-commit-id: 9f5b3014c3023988e3d86317f8684d8fc7b714c5
Former-commit-id: 637d39819470a6b8c9d88c9805e49ef7cd4f5fb0
2017-01-31 19:07:06 +09:00
Song Minjae
8ef3c282ce bringing other memory info back
Former-commit-id: a189dc26e906a6cfd85ca68b4db849426c48ce52
Former-commit-id: 267e95f7d52c126b5d3787358477fc29fb50ad8e
2017-01-31 01:10:18 +09:00
Song Minjae
dff0120905 Merge branch 'newworldgen'
# Conflicts:
#	.idea/workspace.xml
#	src/net/torvald/terrarum/gameactors/Actor.kt


Former-commit-id: 533aeed3cd26565478a3b8c602c9e9aa7e15b43f
Former-commit-id: e7e851ed9734b47cc05144df1c6187ea50f7ecab
2017-01-31 01:05:38 +09:00
Song Minjae
ad148a05f4 somehow fixed a phys bug where heavier objects accelerate more by gravity
Former-commit-id: 5a39d6495c861f9abe32b09db4bba8f26667de95
Former-commit-id: f9b8307b6371d553174f268f812a2edc71324a34
2017-01-31 01:01:51 +09:00
Song Minjae
6ccc964d05 caves and stuff
Former-commit-id: 248077312d8561ad01819a43a4c4a5205c122ff4
Former-commit-id: f4dc915a66bd26338376b9d6008f136fb36b3060
2017-01-30 22:39:34 +09:00
Song Minjae
af688a0004 new terrain gen
Former-commit-id: ef5db466ae4170c6054df806bc4018ed223fc87f
Former-commit-id: 1ea0525c992dd72532589bed963ea2f0804a0a2c
2017-01-30 03:57:03 +09:00
Song Minjae
5c644f0789 more renaming things
Former-commit-id: 80e29fc17e431e350d8d4860273ec42bc4ad67df
Former-commit-id: d70546a097d66ade94de93b4be157b7c9637e98f
2017-01-29 20:48:55 +09:00
Song Minjae
5d18d09404 more world settings
Former-commit-id: 5b9f7717ed2a4ad2f054e8db75b404b5c974539b
Former-commit-id: bc5d18446028a734a3a9707c928f069bcd1d5a7f
2017-01-29 02:04:19 +09:00
Song Minjae
2203f74429 just updating things so that I can have a backup point...
Former-commit-id: 0a5a6d7f68ee1a96562532572c8d45fe102d3c25
Former-commit-id: a1a78f61f2fe2a8707e47633caa6cd67a829b35e
2017-01-26 16:58:06 +09:00
Song Minjae
9b8f82cb63 not going to be easy; just renaming and changing things
Former-commit-id: 5cb93ffbd1b545e4a346fa3edc6bb874ec5b508e
Former-commit-id: 194e2ea1e057415bbc2a516346dc1d8d216d64cb
2017-01-26 16:57:16 +09:00
Song Minjae
06296983b5 more update
Former-commit-id: f64d9a30057d587ef0410ae692800795c29ccdb9
Former-commit-id: 8359b51c881035b3ef822bae1ca2c82e0cd83e93
2017-01-26 01:30:06 +09:00
Song Minjae
1ec1b63436 adding/removing actors in game won't go wrong now (perhaps...)
Former-commit-id: c66db4b652e2fae34e66200aca4b101c16bab5d9
Former-commit-id: 5bafa85cabf7ead6db5f48475164d0694f66f15d
2017-01-26 01:29:17 +09:00
Song Minjae
59349f8b65 space saving by converting tga back to png on large matte images
Former-commit-id: 8f3289355692b3e73d383522ce037e1233651efc
Former-commit-id: 3710b500b5184c500eb67f44ff0373b7cf00012d
2017-01-25 17:54:05 +09:00