Commit Graph

330 Commits

Author SHA1 Message Date
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
Song Minjae
a3d762843c fixed bad light calc from 92cc8ff94b [formerly d900c0733a6d1dcbd9aaed8e9f7f1671c3866624] [formerly 5611e2d89f4601e57d014c45f0479600778217f6]
Former-commit-id: 7906df081a965ba70224fce4890ec3e067ea1636
Former-commit-id: f63552ac04de18ebc4b3283b87cf803eca5ae347
2017-01-25 17:53:06 +09:00
Song Minjae
582ff61101 removed red tinge on t=52100+
Former-commit-id: 34c03b14a4103bf64c88fdceb82c5ed13e82858d
Former-commit-id: ad8f050b4906c5582ae895bb9e5032b1e180394c
2017-01-24 14:20:38 +09:00
Song Minjae
acc94ad718 more like real MT-32
Former-commit-id: c6af2f7dbf8745488e508127c13a0f5ef3132be9
Former-commit-id: 1df1334644896d4790b42cf2448ef4e902f34bca
2017-01-24 03:36:05 +09:00
Song Minjae
c1a22a7151 actor draw issue fixed for real this time
Former-commit-id: 16d315a8df6477748bdb78b567ee1c97ffc2f455
Former-commit-id: 96c8efc59b69c78ae7c861ebd371fc315d3be058
2017-01-24 03:35:37 +09:00
Song Minjae
f46991ffbb VT redraw on request
Former-commit-id: 3ada71215d9291760704a982cc3952061dbc7afe
Former-commit-id: ca1495e668e88bc7214429472ad918621a650189
2017-01-24 00:50:12 +09:00
Song Minjae
92cc8ff94b tiles with light level <= 1 will be rendered as black square, phys support for non-self-moving bodies (e.g. balls)
Former-commit-id: 5611e2d89f4601e57d014c45f0479600778217f6
Former-commit-id: d900c0733a6d1dcbd9aaed8e9f7f1671c3866624
2017-01-23 19:06:12 +09:00
Song Minjae
ba3e1fe8fc replaced quick and dirty fix into proper fix
Former-commit-id: ee305ad1bb84716a0bb8c17e9aa873eafb0baa6e
Former-commit-id: a9d7e6495bbfdea42b253070f66a0978463a8814
2017-01-23 19:04:42 +09:00
Song Minjae
daaba242ce README update
Former-commit-id: 425ceb7e5fec5ce0cbcc28bd657e7c6360d9d47f
Former-commit-id: e2e348bc8425861f4263ffba483f04a2837c5c51
2017-01-23 19:03:08 +09:00
Song Minjae
cd0f0740a8 iterative circular array for slightly better performance (test might be wrong tho)
Former-commit-id: 95c4e576efca6e12af68c184ed5effa4b115d8c4
Former-commit-id: bbd74994f90f582d0643ebbbca58f40d097e2f82
2017-01-22 14:20:24 +09:00
Song Minjae
2131e86e76 more efficient particles
Former-commit-id: 56dad88ecd715ad6e357e33b903851a47a358dcd
Former-commit-id: c85c0b759a447c0461563d98156f59879fa95db2
2017-01-22 04:13:45 +09:00
Song Minjae
56a012d843 actorwithbody splitted in favour of new particle type
Former-commit-id: 121bd069d0a9eeef60f5ecb085a11a93c4b4a84d
Former-commit-id: 539b4b6916e808c01298190cf347e928f61fe62e
2017-01-21 16:52:16 +09:00
Song Minjae
c9d83455a9 ai won't jump if it sees tall ledge that can't jump over
Former-commit-id: c74b12206547838c72301d3d2223a98c9098687d
Former-commit-id: a1f7c29cc42758f92c202d20d28e47820546c900
2017-01-20 01:56:29 +09:00
Song Minjae
9950b63a67 actor jump slowdown in water
Former-commit-id: 45fdd22f084ec4e9a9017bd617393c9e6acd56e8
Former-commit-id: bf1bbc9210bd2232381116312447724976aaf1f8
2017-01-19 13:43:38 +09:00
Song Minjae
b0b6f3ba52 fixme: fixed
Former-commit-id: a8beadca625c0714d687784c95a39e1ddbf7559c
Former-commit-id: 936a978f2d50e313611f3417f0e5a7cee716896e
2017-01-19 04:10:31 +09:00
Song Minjae
190c596f7d correct actor walk velo/accel control even when submerged; new tileprop Viscosity
Former-commit-id: 164238c9e5e0b33f9291cb09d804e2ce2f2e1721
Former-commit-id: ec07a206dd980b9ee73530f0beab876393030656
2017-01-19 04:05:57 +09:00
Song Minjae
9efcb1684f proper impl of walk friction control (WIP submerged case)
Former-commit-id: cf8c11dee3eed491893bbfa61167e47863524366
Former-commit-id: 30a8fbedcc05cb6aee5f131708152d4db1fd9415
2017-01-19 03:25:22 +09:00
Song Minjae
50d594446c skybox
Former-commit-id: 839fda074d5cf6a3fe1a0a16e10da67908bc4f03
Former-commit-id: 4ed8324110eafc434fd00f09fe48f3858ad5fd3a
2017-01-18 21:24:59 +09:00
Song Minjae
bc2c15daa8 new sunlight and skybox colouring collected from real world measurements (reports TBA)
Former-commit-id: 6abaa1e16d0fd7a71f95bd0265809aad9e34a425
Former-commit-id: bb871bd87072f27b9cc29594f9eed615351df5f8
2017-01-17 23:42:25 +09:00
Song Minjae
47e3ffb6ce PNG -> TGA
Former-commit-id: 394d3af24b5f1a125c40197a09f47867cc6fc566
Former-commit-id: 5428b1d2d7370b5a912851d5f5aa9f6b036f64f5
2017-01-16 18:24:19 +09:00
Song Minjae
9fdee8c5ad colorutil update, some code cleanup
Former-commit-id: 47b13e7e899dc9151f7a1ae71977ed8d4b403345
Former-commit-id: 136f9c787b76aec75d76535891cf264170bd3b04
2017-01-15 20:51:42 +09:00
Song Minjae
cb1198bd30 new hair finished
Former-commit-id: bed636531552e3c6e6f2abf80d1e2550f22075d2
Former-commit-id: ced0e4dc213a6f711b7f450458ec745fff5d91e1
2017-01-14 16:00:43 +09:00
Song Minjae
3130e0eb63 working tapestry decoder and fixture object
Former-commit-id: dd61b61e6061cfb3dc2ad9d9f65fd1b272475718
Former-commit-id: 7acc72a0e59203c0ea56c355eadaeed1474e3ac1
2017-01-14 16:00:07 +09:00
Song Minjae
2549a21bd2 corrected candlelight colour (using Yxy instead of Lab)
Former-commit-id: 7d784a840c2339a49f1dfc5a739bf8ce306ec2e4
Former-commit-id: d3b18605dd51ceb779841835c88802b8cf3afaa4
2017-01-13 12:33:02 +09:00
Song Minjae
36cbb0512e Parallel: wait for all ths to die
Former-commit-id: d95a5fc60c424cb1722d70ced610a81237ddb681
Former-commit-id: 64d1177a164a2a53e9beabe634a6f5997cfa8d7b
2017-01-12 21:05:23 +09:00
Song Minjae
4be06fa510 StateBlurTest from blur test (gah)
Former-commit-id: ea7d2b3cd9c5f072846aea102b43f09226f73a57
Former-commit-id: 3d716699cbf6ed344c5e7b2ab5a2f8b121f828a8
2017-01-12 21:04:29 +09:00
Song Minjae
8622281021 new hair (wip?)
Former-commit-id: 31cd1b402be82b34487b92c3fd3f05da15d5e2f6
Former-commit-id: 826df0dfc7e8a885ba681dc9ba0c05fa610eb44f
2017-01-12 21:03:44 +09:00
Song Minjae
e7e6cfedd7 test image from blur test
Former-commit-id: 6f4ebae0f8fe170567082f1e9973763d5c0e3654
Former-commit-id: 48712cd1144ab3718e568945b9dd39d8db710708
2017-01-12 21:03:31 +09:00
Song Minjae
8e586c6289 now torch colour from colourimeter mesurement
Former-commit-id: 8bd0eb9ef67e2a5c259137ea779b857daac792bc
Former-commit-id: 5aa153a8cd3e94fc663d071f033fe3d5cdafed1b
2017-01-12 21:02:59 +09:00