Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
270 Commits 151 Branches 18 Tags
Commit Graph

149 Commits

Author SHA1 Message Date
jshipsey
b57d0061a9 tidying up code 
Former-commit-id: 43981525316728a182d41ecc107f31e2eb2583f9
 2019-04-20 19:20:49 -04:00
jshipsey
d6981f8f54 animation minor fixes 
Former-commit-id: 38d2da587d647b7f0c08994bc9fe41cc2d7ab675
 2019-04-20 19:20:48 -04:00
jshipsey
0b7a843c84 animattion tweaks 
Former-commit-id: ea560ba0f06432d2d4f9d4f1906f77451a7f5ef7
 2019-04-20 19:18:42 -04:00
jshipsey
a72f590ca2 animation adjustments 
Former-commit-id: d396ddadf4293212f9f6f7142de0d8a519e127d6
 2019-04-20 19:18:42 -04:00
jshipsey
763e9c3c77 merge fix 
Former-commit-id: 15da549d36774bb3713297d2b9f3799b1d7eb5f4
 2019-04-20 19:13:38 -04:00
jshipsey
400bfd27d6 adding test assets 
Former-commit-id: 7d8f9b19d8ec1b31a67d3d650a9e64aa23fc741c
 2019-04-20 19:13:38 -04:00
jshipsey
8877037f4d quadruped testing 
Former-commit-id: 07f4fb4484f26dae0e8503ddec32a17f2fa312b5
 2019-04-20 19:13:38 -04:00
Joshua Barretto
9b8fe8c1ab Merge branch 'ui_improvements' into 'master' 
Ui improvements

Closes #23

See merge request veloren/veloren!54

Former-commit-id: 227b25c971c2576e5121d884a5e102307dd471c3
 2019-04-20 23:06:59 +00:00
Imbris
6b396aa80c update asset loading to not use env 
Former-commit-id: 1858f3e06a26502c8bb6a3237e216d551377f6c6
 2019-04-20 18:02:48 -04:00
Piotr
052c798d1f make 11.0 a const 
Former-commit-id: 4602f3147b434e93256d48938b813325e74ad551
 2019-04-20 20:35:45 +02:00
Imbris
ee087babfa rearrange hud event handling slighlty 
Former-commit-id: 8043d6c6197112123c371258407ea886a5ae3595
 2019-04-20 14:08:39 -04:00
Imbris
a28f086c2d hide chat input when not typing 
Former-commit-id: a1982ef2edf991c94cea359a2892cbf13ef8e980
 2019-04-20 11:43:38 -04:00
Imbris
3184882288 go back to main menu when logging out 
Former-commit-id: 95956f916adb0afb47e489defa197f2b8e99b775
 2019-04-20 11:34:45 -04:00
Imbris
e2d95bdc62 hide entire hud when toggling interface 
Former-commit-id: 969564ecfd85df0477db4216cd8974adf2df1921
 2019-04-20 11:34:45 -04:00
Imbris
83f406caae Stop sending empty messages 
Former-commit-id: 0f2ed6d0adbbf07566ae1cee1cb0c0498c0c15d8
 2019-04-20 11:34:45 -04:00
Imbris
af130c35d6 Fix chat spacing 
Former-commit-id: 2e823a1deb51e2fc77a1662b291ed1b5d01b3e70
 2019-04-20 10:46:36 -04:00
Imbris
119d3ebf7b fix scaling artifacts 
Former-commit-id: 7b90e7d033438a0c83e254ea7bcc791ad83808b3
 2019-04-20 08:59:26 -04:00
Imbris
ae1eb3f1f5 add graphic cache clearing on resize 
Former-commit-id: 49b3a52036171fd8b66d9fae73bebb15fbf83a0b
 2019-04-19 21:35:12 -04:00
Imbris
43aaef75b4 rearrange ui graphic code 
Former-commit-id: d0ea7feee59a1daf4ad93e9b9224750deb75ee45
 2019-04-19 15:06:58 -04:00
Imbris
3f6855d12d add blank graphic, ao for voxel graphics in the ui 
Former-commit-id: ceaba13fdd47707a8804886b5db2260a8cbba2f1
 2019-04-19 15:06:58 -04:00
Imbris
9250136ff6 initial setup for .vox rendering 
Former-commit-id: bc3d2432c41d9dc3e1f57e569f3aecb9be3fe79a
 2019-04-19 15:00:13 -04:00
yeet
2811cff712 Fix Singleplayer 
After a certains person's MR has been merged, for some reason all traces of working Singleplayer have disappeared

Former-commit-id: 4119e4609cd39bb1896c7f28d45f5c1a7ec9c129
 2019-04-18 15:53:03 +02:00
Joshua Barretto
c46669bad5 Minor fixes 
Former-commit-id: 54c2b050fd9be82916d66c872fa9ab5f5354f9dd
 2019-04-18 14:21:25 +01:00
Pfauenauge90
72371fa2a1 Error Window, Alpha Version Display 
Former-commit-id: 0cdf4980eacf57db6dc275aabc26f49a0db274a6
 2019-04-17 23:12:15 +02:00
Pfauenauge90
35f1404dd6 Rebase and Login Error 
Former-commit-id: 1b7736d80dde1a10ba04936c2cfe3df4d64ec57f
 2019-04-17 23:11:29 +02:00
Pfauenauge90
512f5084a3 Help window Closing button fixed 
Former-commit-id: 75c539985527e38b13bf7aa382d3b9491ef19fed
 2019-04-17 23:06:21 +02:00
Pfauenauge90
64ea55e781 Error Window, Alpha Version Display 
Former-commit-id: 59ee7e42ca522cdcdbec7b07dbee4d3249213aab
 2019-04-17 23:06:21 +02:00
Pfauenauge90
e4c5df2412 Rebase and Login Error 
Former-commit-id: 226fca5f37aa9c94fdd3e1a030c7de4703deba4c
 2019-04-17 23:06:21 +02:00
Pfauenauge90
8f17a89435 Error Window 
Former-commit-id: 0f4f92c39632f8cbd1750036d19eb1cfbf39f374
 2019-04-17 23:06:21 +02:00
timokoesters
a389b86f13 Rename animationHistory to animation_history 
Former-commit-id: bb2c882332fa9c3fd7f2c7fbd6143cd5f85153d8
 2019-04-17 22:32:36 +02:00
timokoesters
abe207cbba Fix #21 by checking animation history 
Former-commit-id: 5272d1d7aee73fc07edeb31d9f29238d19b7d229
 2019-04-17 19:39:12 +02:00
Joshua Barretto
8bd043117e Merge branch 'singleplayer' into 'master' 
Start Singleplayer server when singleplayer is selected

See merge request veloren/veloren!39

Former-commit-id: ac8c9f3f52871d89847fdecc74ac58bb593e762b
 2019-04-17 15:31:02 +00:00
Louis Pearson
7963fab232 Stop singleplayer thread whenever a session is left 
Former-commit-id: 16fcf35cbc856bebc12944781c2ac1a4daab5550
 2019-04-17 09:22:26 -06:00
Joshua Barretto
d4f247d77d Changed default server address to 'server.veloren.net' 
Former-commit-id: 660083d3d7ca341428b8c3cd8d54dd3ac1f453ab
 2019-04-17 16:08:25 +01:00
Louis Pearson
2fcc07365d Add method to drop singleplayer thread 
Former-commit-id: b62a90728d4e83a005687538e134cee427491052
 2019-04-17 08:57:23 -06:00
Louis Pearson
f4e0cf4ac3 Add basic singleplayer support 
Former-commit-id: 929b05faca5d2b95a96349dfc17a62b3165289a1
 2019-04-17 07:41:34 -06:00
Imbris
bf221522bb Fix most spacing issues in chat 
Former-commit-id: 90a4080123b77630888967423b030153b9f81709
 2019-04-16 20:17:15 -04:00
Joshua Barretto
52272499b1 Improved camera attributes and focus 
Former-commit-id: 223f85c884c063c5cbb7d6c9f9f5c4a8c62a7ffd
 2019-04-16 20:22:04 +01:00
timokoesters
4b4fe5aa79 Handle bone orientation and scale as well 
Former-commit-id: 80c80342ae3458b98c2520359bc0a0705b22dbc1
 2019-04-16 20:55:04 +02:00
timokoesters
b364a4963d Implement animation smoothing 
Former-commit-id: e89caca7d273934533c57c4324365a126d02e5df
 2019-04-16 20:26:24 +02:00
Louis Pearson
5d9d994e21 Add better defaults support 
Former-commit-id: fa77acae3ee2b99cbf37a8fec71ee1913e889d82
 2019-04-16 11:41:39 -06:00
Louis Pearson
2af6443393 Add auto generation of settings.toml if it does not already exist 
Former-commit-id: 941b81a8faeff89096256666c56ae472d9b569d5
 2019-04-16 10:06:23 -06:00
Louis Pearson
5acd975f69 Add default keybindings 
Former-commit-id: c8886a2eb3326ba62e31ef84b93a29ee59f378b3
 2019-04-16 08:57:31 -06:00
Louis Pearson
d6420dfa35 Add support for keybinding 
Former-commit-id: 1edbf3bebb8d1651a1b912cedcd3513dfb287fa1
 2019-04-16 08:57:31 -06:00
Piotr
c30af3f4f8 Animation States 
Former-commit-id: 769f09dc44143b5e54623ea819db2d6149429184
 2019-04-16 14:29:44 +00:00
Joshua Barretto
ea6cf2780b Merge branch 'master' into 'master' 
Solve physics fighting problem

See merge request veloren/veloren!27

Former-commit-id: 010af4fb0f31b854dd1f8c42f6a65711cc9d84cd
 2019-04-15 16:43:41 +00:00
Imbris
eceef5714b make zooming always work if cursor is grabbed 
Former-commit-id: e07bb0746fa117f045d62919a4ca55a8eb0c6cf7
 2019-04-14 20:53:42 -04:00
Imbris
3365cf08c8 simplify chat keybaord capture 
Former-commit-id: 3c5c5c241fe0c0d97059c7b87c0c08104eb5c5fe
 2019-04-14 20:45:54 -04:00
Imbris
b6598c84c0 ignore tx.send() result 
Former-commit-id: 2d4b2d258f8fd3b030bb7f1e9596ccb6750d50ff
 2019-04-14 20:23:26 -04:00
Imbris
8677b84084 stop zooming when scrolling chat 
Former-commit-id: a94f26e30029ef4cff1807c2347cbd2490c4afd7
 2019-04-14 20:15:12 -04:00