Commit Graph

125 Commits

Author SHA1 Message Date
timokoesters
841a2bbd6d clean up old states, lower gravity 2020-03-10 19:12:16 +01:00
timokoesters
0ce451a8b1 fix: deny gliding/jumping/rolling under water 2020-03-10 19:00:49 +01:00
timokoesters
70027da9aa feat: hitting enemies with basic_attack gives energy 2020-03-10 18:54:59 +01:00
timokoesters
c88c4687f3 fix: stop switching quickly between climbing and idle at low energy 2020-03-10 17:33:36 +01:00
Adam Whitehurst
344bb955a2 rename get_tool_data to unwrap_tool_data 2020-03-08 21:28:45 -07:00
jshipsey
bce9d4c24f animation corrections 2020-03-08 17:02:25 -04:00
Adam Whitehurst
5f8751e2d3 Begin implementing triple attack 2020-03-08 12:37:17 -07:00
Adam Whitehurst
698fe9f451 More util fn's, add comments 2020-03-08 10:38:18 -07:00
Adam Whitehurst
f769c74bf4 Add charging back 2020-03-08 10:04:26 -07:00
Adam Whitehurst
adf34d4f0f User constants, faster characters 2020-03-08 08:38:53 -07:00
Adam Whitehurst
5a9a8323f2 Update utils/handle_move fn's 2020-03-07 15:45:10 -08:00
Adam Whitehurst
54a7112ad9 resolve conflicts merging master -> clientstates 2020-03-07 12:49:48 -08:00
Adam Whitehurst
cb9e3859da Rename character behavior sys 2020-03-07 11:02:54 -08:00
Adam Whitehurst
b1d1299fe6 Clean up character states 2020-03-07 10:15:02 -08:00
timokoesters
4cc998f92b fix: non-humanoid npcs can attack again 2020-02-24 22:20:50 +01:00
timokoesters
d0439fdd84 Merge remote-tracking branch 'origin/master' into clientstates 2020-02-24 21:34:17 +01:00
timokoesters
ac611f4618 fix: sync characterstates, better energy management 2020-02-24 20:57:33 +01:00
timokoesters
2fa902270e fix: block 2020-02-24 18:10:42 +01:00
timokoesters
1f4065ae32 fix: attacking 2020-02-24 14:32:12 +01:00
Adam Whitehurst
d383abf950 Re add combat 2020-02-11 07:42:17 -08:00
timokoesters
aeb37a1f33 improvement: char speed 2020-02-03 20:43:36 +01:00
timokoesters
aa52c6fd4f fix: jumping and attacking 2020-02-03 17:03:52 +01:00
timokoesters
6515daddce fixes 2020-01-24 16:57:24 +01:00
timokoesters
7b558b4542 refactor: combine actionstate and movestate 2020-01-21 23:54:59 +01:00
AdamWhitehurst
1816d4b805 Move states/ to common/src/ 2020-01-12 15:06:52 -08:00